External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Remove extraneous space in function prototypes

Browse Source 
During review of the iSCSI hostdev series, eblake noted that the
prototypes shouldn't have the extranenous space between the "*" and
the function name:

http://www.redhat.com/archives/libvir-list/2014-July/msg01227.html

Since it was more invasive than 1 or 2 lines - I said I'd send a
patch covering this once committed.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2014-07-24 09:23:40 -04:00
parent 54ac483e68
commit 2e194e5bcc
3 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_capabilities.h
View File

@ -311,7 +311,7 @@ bool virQEMUCapsSupportsChardev(virDomainDefPtr def,
bool virQEMUCapsIsMachineSupported(virQEMUCapsPtr qemuCaps, bool virQEMUCapsIsMachineSupported(virQEMUCapsPtr qemuCaps,
const char *canonical_machine); const char *canonical_machine);
const char * virQEMUCapsGetDefaultMachine(virQEMUCapsPtr qemuCaps); const char *virQEMUCapsGetDefaultMachine(virQEMUCapsPtr qemuCaps);
int virQEMUCapsInitGuestFromBinary(virCapsPtr caps, int virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
const char *binary, const char *binary,

136
src/qemu/qemu_command.h
View File

@ -58,11 +58,11 @@
typedef struct _qemuBuildCommandLineCallbacks qemuBuildCommandLineCallbacks; typedef struct _qemuBuildCommandLineCallbacks qemuBuildCommandLineCallbacks;
typedef qemuBuildCommandLineCallbacks *qemuBuildCommandLineCallbacksPtr; typedef qemuBuildCommandLineCallbacks *qemuBuildCommandLineCallbacksPtr;
struct _qemuBuildCommandLineCallbacks { struct _qemuBuildCommandLineCallbacks {
char * (*qemuGetSCSIDeviceSgName) (const char *sysfs_prefix, char *(*qemuGetSCSIDeviceSgName) (const char *sysfs_prefix,
const char *adapter, const char *adapter,
unsigned int bus, unsigned int bus,
unsigned int target, unsigned int target,
unsigned int unit); unsigned int unit);
}; };
extern qemuBuildCommandLineCallbacks buildCommandLineCallbacks; extern qemuBuildCommandLineCallbacks buildCommandLineCallbacks;
@ -89,27 +89,27 @@ qemuBuildChrDeviceStr(char **deviceStr,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
/* With vlan == -1, use netdev syntax, else old hostnet */ /* With vlan == -1, use netdev syntax, else old hostnet */
char * qemuBuildHostNetStr(virDomainNetDefPtr net, char *qemuBuildHostNetStr(virDomainNetDefPtr net,
virQEMUDriverPtr driver, virQEMUDriverPtr driver,
char type_sep, char type_sep,
int vlan, int vlan,
char **tapfd, char **tapfd,
int tapfdSize, int tapfdSize,
char **vhostfd, char **vhostfd,
int vhostfdSize); int vhostfdSize);
/* Legacy, pre device support */ /* Legacy, pre device support */
char * qemuBuildNicStr(virDomainNetDefPtr net, char *qemuBuildNicStr(virDomainNetDefPtr net,
const char *prefix, const char *prefix,
int vlan); int vlan);
/* Current, best practice */ /* Current, best practice */
char * qemuBuildNicDevStr(virDomainDefPtr def, char *qemuBuildNicDevStr(virDomainDefPtr def,
virDomainNetDefPtr net, virDomainNetDefPtr net,
int vlan, int vlan,
int bootindex, int bootindex,
int vhostfdSize, int vhostfdSize,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk, char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
@ -123,68 +123,68 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
/* Current, best practice */ /* Current, best practice */
char * qemuBuildDriveDevStr(virDomainDefPtr def, char *qemuBuildDriveDevStr(virDomainDefPtr def,
virDomainDiskDefPtr disk, virDomainDiskDefPtr disk,
int bootindex, int bootindex,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
char * qemuBuildFSDevStr(virDomainDefPtr domainDef, char *qemuBuildFSDevStr(virDomainDefPtr domainDef,
virDomainFSDefPtr fs, virDomainFSDefPtr fs,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
/* Current, best practice */ /* Current, best practice */
char * qemuBuildControllerDevStr(virDomainDefPtr domainDef, char *qemuBuildControllerDevStr(virDomainDefPtr domainDef,
virDomainControllerDefPtr def, virDomainControllerDefPtr def,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
int *nusbcontroller); int *nusbcontroller);
char * qemuBuildWatchdogDevStr(virDomainDefPtr domainDef, char *qemuBuildWatchdogDevStr(virDomainDefPtr domainDef,
virDomainWatchdogDefPtr dev, virDomainWatchdogDefPtr dev,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
char * qemuBuildMemballoonDevStr(virDomainDefPtr domainDef, char *qemuBuildMemballoonDevStr(virDomainDefPtr domainDef,
virDomainMemballoonDefPtr dev, virDomainMemballoonDefPtr dev,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
char * qemuBuildUSBInputDevStr(virDomainDefPtr domainDef, char *qemuBuildUSBInputDevStr(virDomainDefPtr domainDef,
virDomainInputDefPtr dev, virDomainInputDefPtr dev,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
char * qemuBuildSoundDevStr(virDomainDefPtr domainDef, char *qemuBuildSoundDevStr(virDomainDefPtr domainDef,
virDomainSoundDefPtr sound, virDomainSoundDefPtr sound,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
/* Legacy, pre device support */ /* Legacy, pre device support */
char * qemuBuildPCIHostdevPCIDevStr(virDomainHostdevDefPtr dev, char *qemuBuildPCIHostdevPCIDevStr(virDomainHostdevDefPtr dev,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
/* Current, best practice */ /* Current, best practice */
char * qemuBuildPCIHostdevDevStr(virDomainDefPtr def, char *qemuBuildPCIHostdevDevStr(virDomainDefPtr def,
virDomainHostdevDefPtr dev, virDomainHostdevDefPtr dev,
const char *configfd, const char *configfd,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
int qemuOpenPCIConfig(virDomainHostdevDefPtr dev); int qemuOpenPCIConfig(virDomainHostdevDefPtr dev);
/* Legacy, pre device support */ /* Legacy, pre device support */
char * qemuBuildUSBHostdevUSBDevStr(virDomainHostdevDefPtr dev); char *qemuBuildUSBHostdevUSBDevStr(virDomainHostdevDefPtr dev);
/* Current, best practice */ /* Current, best practice */
char * qemuBuildUSBHostdevDevStr(virDomainDefPtr def, char *qemuBuildUSBHostdevDevStr(virDomainDefPtr def,
virDomainHostdevDefPtr dev,
virQEMUCapsPtr qemuCaps);
char *qemuBuildSCSIHostdevDrvStr(virConnectPtr conn,
virDomainHostdevDefPtr dev,
virQEMUCapsPtr qemuCaps,
qemuBuildCommandLineCallbacksPtr callbacks)
ATTRIBUTE_NONNULL(4);
char *qemuBuildSCSIHostdevDevStr(virDomainDefPtr def,
virDomainHostdevDefPtr dev, virDomainHostdevDefPtr dev,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
char * qemuBuildSCSIHostdevDrvStr(virConnectPtr conn, char *qemuBuildHubDevStr(virDomainDefPtr def,
virDomainHostdevDefPtr dev, virDomainHubDefPtr dev,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps);
qemuBuildCommandLineCallbacksPtr callbacks) char *qemuBuildRedirdevDevStr(virDomainDefPtr def,
ATTRIBUTE_NONNULL(4); virDomainRedirdevDefPtr dev,
char * qemuBuildSCSIHostdevDevStr(virDomainDefPtr def, virQEMUCapsPtr qemuCaps);
virDomainHostdevDefPtr dev,
virQEMUCapsPtr qemuCaps);
char * qemuBuildHubDevStr(virDomainDefPtr def,
virDomainHubDefPtr dev,
virQEMUCapsPtr qemuCaps);
char * qemuBuildRedirdevDevStr(virDomainDefPtr def,
virDomainRedirdevDefPtr dev,
virQEMUCapsPtr qemuCaps);
int qemuNetworkIfaceConnect(virDomainDefPtr def, int qemuNetworkIfaceConnect(virDomainDefPtr def,
virConnectPtr conn, virConnectPtr conn,
virQEMUDriverPtr driver, virQEMUDriverPtr driver,

2
src/qemu/qemu_conf.h
View File

@ -286,7 +286,7 @@ bool qemuSharedDeviceEntryDomainExists(qemuSharedDeviceEntryPtr entry,
int *index) int *index)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
char * qemuGetSharedDeviceKey(const char *disk_path) char *qemuGetSharedDeviceKey(const char *disk_path)
ATTRIBUTE_NONNULL(1); ATTRIBUTE_NONNULL(1);
void qemuSharedDeviceEntryFree(void *payload, const void *name) void qemuSharedDeviceEntryFree(void *payload, const void *name)