qemu: Remove extraneous space in function prototypes

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>

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index e80a37756f464f2d3484e623dde185d0c3b76ddc..1db84ab670f9ae67e73c78166725bcb84b135b39 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -311,7 +311,7 @@ bool virQEMUCapsSupportsChardev(virDomainDefPtr def,
 bool virQEMUCapsIsMachineSupported(virQEMUCapsPtr qemuCaps,
                                    const char *canonical_machine);
 
-const char * virQEMUCapsGetDefaultMachine(virQEMUCapsPtr qemuCaps);
+const char *virQEMUCapsGetDefaultMachine(virQEMUCapsPtr qemuCaps);
 
 int virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
                                    const char *binary,

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

diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index c3c9d6c5ae875e1c89666e02a6ccff1ef96f5339..90aebef8d1854dd2e15425ae9341d91d23068ec3 100644 (file)
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -286,7 +286,7 @@ bool qemuSharedDeviceEntryDomainExists(qemuSharedDeviceEntryPtr entry,
                                        int *index)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
-char * qemuGetSharedDeviceKey(const char *disk_path)
+char *qemuGetSharedDeviceKey(const char *disk_path)
     ATTRIBUTE_NONNULL(1);
 
 void qemuSharedDeviceEntryFree(void *payload, const void *name)