Index: src/qemu_driver.c
===================================================================
RCS file: /data/cvs/libvirt/src/qemu_driver.c,v
retrieving revision 1.112
diff -u -r1.112 qemu_driver.c
--- src/qemu_driver.c	27 Aug 2008 11:42:52 -0000	1.112
+++ src/qemu_driver.c	29 Aug 2008 05:07:01 -0000
@@ -76,7 +76,8 @@
 
 #define qemudLog(level, msg...) fprintf(stderr, msg)
 
-static int qemudSetCloseExec(int fd) {
+static int qemudSetCloseExec(int fd)
+{
     int flags;
     if ((flags = fcntl(fd, F_GETFD)) < 0)
         goto error;
@@ -91,7 +92,8 @@
 }
 
 
-static int qemudSetNonBlock(int fd) {
+static int qemudSetNonBlock(int fd)
+{
     int flags;
     if ((flags = fcntl(fd, F_GETFL)) < 0)
         goto error;
@@ -133,8 +135,9 @@
 static struct qemud_driver *qemu_driver = NULL;
 
 
-static
-void qemudAutostartConfigs(struct qemud_driver *driver) {
+static void
+qemudAutostartConfigs(struct qemud_driver *driver)
+{
     virNetworkObjPtr network;
     virDomainObjPtr vm;
 
@@ -176,7 +179,8 @@
  * Initialization function for the QEmu daemon
  */
 static int
-qemudStartup(void) {
+qemudStartup(void)
+{
     uid_t uid = geteuid();
     struct passwd *pw;
     char *base = NULL;
@@ -277,7 +281,8 @@
  * files and update its state and the networking
  */
 static int
-qemudReload(void) {
+qemudReload(void)
+{
     virDomainLoadAllConfigs(NULL,
                             qemu_driver->caps,
                             &qemu_driver->domains,
@@ -309,7 +314,8 @@
  * Returns 1 if active, 0 otherwise
  */
 static int
-qemudActive(void) {
+qemudActive(void)
+{
     virDomainObjPtr dom = qemu_driver->domains;
     virNetworkObjPtr net = qemu_driver->networks;
     while (dom) {
@@ -334,7 +340,8 @@
  * Shutdown the QEmu daemon, it will stop all active domains and networks
  */
 static int
-qemudShutdown(void) {
+qemudShutdown(void)
+{
     virDomainObjPtr vm;
     virNetworkObjPtr network;
 
@@ -498,7 +505,8 @@
 static int qemudOpenMonitor(virConnectPtr conn,
                             struct qemud_driver *driver,
                             virDomainObjPtr vm,
-                            const char *monitor) {
+                            const char *monitor)
+{
     int monfd;
     char buf[1024];
     int ret = -1;
@@ -537,7 +545,8 @@
 static int qemudExtractMonitorPath(virConnectPtr conn,
                                    const char *haystack,
                                    size_t *offset,
-                                   char **path) {
+                                   char **path)
+{
     static const char needle[] = "char device redirected to";
     char *tmp, *dev;
 
@@ -631,7 +640,8 @@
 
 static int qemudWaitForMonitor(virConnectPtr conn,
                                struct qemud_driver *driver,
-                               virDomainObjPtr vm) {
+                               virDomainObjPtr vm)
+{
     char buf[1024]; /* Plenty of space to get startup greeting */
     int ret = qemudReadMonitorOutput(conn,
                                      driver, vm, vm->stderr_fd,
@@ -652,7 +662,8 @@
 static int
 qemudDetectVcpuPIDs(virConnectPtr conn,
                     struct qemud_driver *driver,
-                    virDomainObjPtr vm) {
+                    virDomainObjPtr vm)
+{
     char *qemucpus = NULL;
     char *line;
     int lastVcpu = -1;
@@ -752,7 +763,8 @@
 static int
 qemudInitCpus(virConnectPtr conn,
               struct qemud_driver *driver,
-              virDomainObjPtr vm) {
+              virDomainObjPtr vm)
+{
     char *info = NULL;
 #if HAVE_SCHED_GETAFFINITY
     cpu_set_t mask;
@@ -800,7 +812,8 @@
 }
 
 
-static int qemudNextFreeVNCPort(struct qemud_driver *driver ATTRIBUTE_UNUSED) {
+static int qemudNextFreeVNCPort(struct qemud_driver *driver ATTRIBUTE_UNUSED)
+{
     int i;
 
     for (i = 5900 ; i < 6000 ; i++) {
@@ -839,7 +852,8 @@
 static int qemudStartVMDaemon(virConnectPtr conn,
                               struct qemud_driver *driver,
                               virDomainObjPtr vm,
-                              const char *migrateFrom) {
+                              const char *migrateFrom)
+{
     const char **argv = NULL, **tmp;
     int i, ret;
     char logfile[PATH_MAX];
@@ -996,7 +1010,8 @@
 }
 
 static int qemudVMData(struct qemud_driver *driver ATTRIBUTE_UNUSED,
-                       virDomainObjPtr vm, int fd) {
+                       virDomainObjPtr vm, int fd)
+{
     char buf[4096];
     if (vm->pid < 0)
         return 0;
@@ -1025,7 +1040,8 @@
 
 
 static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED,
-                                  struct qemud_driver *driver, virDomainObjPtr vm) {
+                                  struct qemud_driver *driver, virDomainObjPtr vm)
+{
     if (!virDomainIsActive(vm))
         return;
 
@@ -1073,7 +1089,8 @@
     }
 }
 
-static int qemudDispatchVMLog(struct qemud_driver *driver, virDomainObjPtr vm, int fd) {
+static int qemudDispatchVMLog(struct qemud_driver *driver, virDomainObjPtr vm, int fd)
+{
     if (qemudVMData(driver, vm, fd) < 0) {
         qemudShutdownVMDaemon(NULL, driver, vm);
         if (!vm->persistent)
@@ -1084,7 +1101,8 @@
 }
 
 static int qemudDispatchVMFailure(struct qemud_driver *driver, virDomainObjPtr vm,
-                                  int fd ATTRIBUTE_UNUSED) {
+                                  int fd ATTRIBUTE_UNUSED)
+{
     qemudShutdownVMDaemon(NULL, driver, vm);
     if (!vm->persistent)
         virDomainRemoveInactive(&driver->domains,
@@ -1095,7 +1113,8 @@
 static int
 qemudBuildDnsmasqArgv(virConnectPtr conn,
                       virNetworkObjPtr network,
-                      const char ***argv) {
+                      const char ***argv)
+{
     int i, len, r;
     char buf[PATH_MAX];
 
@@ -1238,7 +1257,8 @@
 static int
 qemudAddMasqueradingIptablesRules(virConnectPtr conn,
                       struct qemud_driver *driver,
-                      virNetworkObjPtr network) {
+                      virNetworkObjPtr network)
+{
     int err;
     /* allow forwarding packets from the bridge interface */
     if ((err = iptablesAddForwardAllowOut(driver->iptables,
@@ -1291,7 +1311,8 @@
 static int
 qemudAddRoutingIptablesRules(virConnectPtr conn,
                       struct qemud_driver *driver,
-                      virNetworkObjPtr network) {
+                      virNetworkObjPtr network)
+{
     int err;
     /* allow routing packets from the bridge interface */
     if ((err = iptablesAddForwardAllowOut(driver->iptables,
@@ -1330,7 +1351,8 @@
 static int
 qemudAddIptablesRules(virConnectPtr conn,
                       struct qemud_driver *driver,
-                      virNetworkObjPtr network) {
+                      virNetworkObjPtr network)
+{
     int err;
 
     if (!driver->iptables && !(driver->iptables = iptablesContextNew())) {
@@ -1432,7 +1454,8 @@
 
 static void
 qemudRemoveIptablesRules(struct qemud_driver *driver,
-                         virNetworkObjPtr network) {
+                         virNetworkObjPtr network)
+{
     if (network->def->forwardType != VIR_NETWORK_FORWARD_NONE) {
         iptablesRemoveForwardMasquerade(driver->iptables,
                                         network->def->network,
@@ -1486,7 +1509,8 @@
 
 static int qemudStartNetworkDaemon(virConnectPtr conn,
                                    struct qemud_driver *driver,
-                                   virNetworkObjPtr network) {
+                                   virNetworkObjPtr network)
+{
     int err;
 
     if (virNetworkIsActive(network)) {
@@ -1587,7 +1611,8 @@
 
 static int qemudShutdownNetworkDaemon(virConnectPtr conn ATTRIBUTE_UNUSED,
                                       struct qemud_driver *driver,
-                                      virNetworkObjPtr network) {
+                                      virNetworkObjPtr network)
+{
     int err;
 
     qemudLog(QEMUD_INFO, _("Shutting down network '%s'\n"), network->def->name);
@@ -1636,7 +1661,8 @@
 }
 
 
-static void qemudDispatchVMEvent(int fd, int events, void *opaque) {
+static void qemudDispatchVMEvent(int fd, int events, void *opaque)
+{
     struct qemud_driver *driver = (struct qemud_driver *)opaque;
     virDomainObjPtr vm = driver->domains;
 
@@ -1662,7 +1688,8 @@
 qemudMonitorCommand (const struct qemud_driver *driver ATTRIBUTE_UNUSED,
                      const virDomainObjPtr vm,
                      const char *cmd,
-                     char **reply) {
+                     char **reply)
+{
     int size = 0;
     char *buf = NULL;
     size_t cmdlen = strlen(cmd);
@@ -1756,7 +1783,8 @@
 static virDrvOpenStatus qemudOpen(virConnectPtr conn,
                                   xmlURIPtr uri,
                                   virConnectAuthPtr auth ATTRIBUTE_UNUSED,
-                                  int flags ATTRIBUTE_UNUSED) {
+                                  int flags ATTRIBUTE_UNUSED)
+{
     uid_t uid = getuid();
 
     if (qemu_driver == NULL)
@@ -1785,7 +1813,8 @@
     return VIR_DRV_OPEN_DECLINED;
 }
 
-static int qemudClose(virConnectPtr conn) {
+static int qemudClose(virConnectPtr conn)
+{
     /*struct qemud_driver *driver = (struct qemud_driver *)conn->privateData;*/
 
     conn->privateData = NULL;
@@ -1793,11 +1822,13 @@
     return 0;
 }
 
-static const char *qemudGetType(virConnectPtr conn ATTRIBUTE_UNUSED) {
+static const char *qemudGetType(virConnectPtr conn ATTRIBUTE_UNUSED)
+{
     return "QEMU";
 }
 
-static int qemudGetMaxVCPUs(virConnectPtr conn, const char *type) {
+static int qemudGetMaxVCPUs(virConnectPtr conn, const char *type)
+{
     if (!type)
         return 16;
 
@@ -1818,12 +1849,14 @@
 }
 
 static int qemudGetNodeInfo(virConnectPtr conn,
-                            virNodeInfoPtr nodeinfo) {
+                            virNodeInfoPtr nodeinfo)
+{
     return virNodeInfoPopulate(conn, nodeinfo);
 }
 
 
-static char *qemudGetCapabilities(virConnectPtr conn) {
+static char *qemudGetCapabilities(virConnectPtr conn)
+{
     struct qemud_driver *driver = (struct qemud_driver *)conn->privateData;
     char *xml;
 
@@ -1893,7 +1926,8 @@
 
 #endif
 
-static int qemudGetProcessInfo(unsigned long long *cpuTime, int pid) {
+static int qemudGetProcessInfo(unsigned long long *cpuTime, int pid)
+{
     char proc[PATH_MAX];
     FILE *pidinfo;
     unsigned long long usertime, systime;
@@ -1930,7 +1964,8 @@
 
 
 static virDomainPtr qemudDomainLookupByID(virConnectPtr conn,
-                                          int id) {
+                                          int id)
+{
     struct qemud_driver *driver = (struct qemud_driver *)conn->privateData;
     virDomainObjPtr vm = virDomainFindByID(driver->domains, id);
     virDomainPtr dom;
@@ -1944,8 +1979,10 @@
     if (dom) dom->id = vm->def->id;
     return dom;
 }
+
 static virDomainPtr qemudDomainLookupByUUID(virConnectPtr conn,
-                                            const unsigned char *uuid) {
+                                            const unsigned char *uuid)
+{
     struct qemud_driver *driver = (struct qemud_driver *)conn->privateData;
     virDomainObjPtr vm = virDomainFindByUUID(driver->domains, uuid);
     virDomainPtr dom;
@@ -1959,8 +1996,10 @@
     if (dom) dom->id = vm->def->id;
     return dom;
 }
+
 static virDomainPtr qemudDomainLookupByName(virConnectPtr conn,
-                                            const char *name) {
+                                            const char *name)
+{
     struct qemud_driver *driver = (struct qemud_driver *)conn->privateData;
     virDomainObjPtr vm = virDomainFindByName(driver->domains, name);
     virDomainPtr dom;
@@ -1975,7 +2014,8 @@
     return dom;
 }
 
-static int qemudGetVersion(virConnectPtr conn, unsigned long *version) {
+static int qemudGetVersion(virConnectPtr conn, unsigned long *version)
+{
     struct qemud_driver *driver = (struct qemud_driver *)conn->privateData;
     if (qemudExtractVersion(conn, driver) < 0)
         return -1;
@@ -2006,7 +2046,8 @@
     return str;
 }
 
-static int qemudListDomains(virConnectPtr conn, int *ids, int nids) {
+static int qemudListDomains(virConnectPtr conn, int *ids, int nids)
+{
     struct qemud_driver *driver = (struct qemud_driver *)conn->privateData;
     virDomainObjPtr vm = driver->domains;
     int got = 0;
@@ -2019,7 +2060,9 @@
     }
     return got;
 }
-static int qemudNumDomains(virConnectPtr conn) {
+
+static int qemudNumDomains(virConnectPtr conn)
+{
     struct qemud_driver *driver = (struct qemud_driver *)conn->privateData;
     int n = 0;
     virDomainObjPtr dom = driver->domains;
@@ -2030,8 +2073,10 @@
     }
     return n;
 }
+
 static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml,
-                                      unsigned int flags ATTRIBUTE_UNUSED) {
+                                      unsigned int flags ATTRIBUTE_UNUSED)
+{
     virDomainDefPtr def;
     virDomainObjPtr vm;
     virDomainPtr dom;
@@ -2079,7 +2124,8 @@
 }
 
 
-static int qemudDomainSuspend(virDomainPtr dom) {
+static int qemudDomainSuspend(virDomainPtr dom)
+{
     struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
     char *info;
     virDomainObjPtr vm = virDomainFindByID(driver->domains, dom->id);
@@ -2107,7 +2153,8 @@
 }
 
 
-static int qemudDomainResume(virDomainPtr dom) {
+static int qemudDomainResume(virDomainPtr dom)
+{
     struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
     char *info;
     virDomainObjPtr vm = virDomainFindByID(driver->domains, dom->id);
@@ -2135,7 +2182,8 @@
 }
 
 
-static int qemudDomainShutdown(virDomainPtr dom) {
+static int qemudDomainShutdown(virDomainPtr dom)
+{
     struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
     virDomainObjPtr vm = virDomainFindByID(driver->domains, dom->id);
     char* info;
@@ -2156,7 +2204,8 @@
 }
 
 
-static int qemudDomainDestroy(virDomainPtr dom) {
+static int qemudDomainDestroy(virDomainPtr dom)
+{
     struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
     virDomainObjPtr vm = virDomainFindByID(driver->domains, dom->id);
 
@@ -2175,7 +2224,8 @@
 }
 
 
-static char *qemudDomainGetOSType(virDomainPtr dom) {
+static char *qemudDomainGetOSType(virDomainPtr dom)
+{
     struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
     virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
     char *type;
@@ -2195,7 +2245,8 @@
 }
 
 /* Returns max memory in kb, 0 if error */
-static unsigned long qemudDomainGetMaxMemory(virDomainPtr dom) {
+static unsigned long qemudDomainGetMaxMemory(virDomainPtr dom)
+{
     struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
     virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
 
@@ -2211,7 +2262,8 @@
     return vm->def->maxmem;
 }
 
-static int qemudDomainSetMaxMemory(virDomainPtr dom, unsigned long newmax) {
+static int qemudDomainSetMaxMemory(virDomainPtr dom, unsigned long newmax)
+{
     struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
     virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
 
@@ -2234,7 +2286,8 @@
     return 0;
 }
 
-static int qemudDomainSetMemory(virDomainPtr dom, unsigned long newmem) {
+static int qemudDomainSetMemory(virDomainPtr dom, unsigned long newmem)
+{
     struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
     virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
 
@@ -2264,7 +2317,8 @@
 }
 
 static int qemudDomainGetInfo(virDomainPtr dom,
-                              virDomainInfoPtr info) {
+                              virDomainInfoPtr info)
+{
     struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
     virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
     if (!vm) {
@@ -2385,7 +2439,8 @@
 };
 
 static int qemudDomainSave(virDomainPtr dom,
-                           const char *path) {
+                           const char *path)
+{
     struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
     virDomainObjPtr vm = virDomainFindByID(driver->domains, dom->id);
     char *command, *info;
@@ -2506,7 +2561,8 @@
 }
 
 
-static int qemudDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) {
+static int qemudDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus)
+{
     const struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
     virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
     int max;
@@ -2549,7 +2605,8 @@
 qemudDomainPinVcpu(virDomainPtr dom,
                    unsigned int vcpu,
                    unsigned char *cpumap,
-                   int maplen) {
+                   int maplen)
+{
     struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
     virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
     cpu_set_t mask;
@@ -2602,7 +2659,8 @@
                     virVcpuInfoPtr info,
                     int maxinfo,
                     unsigned char *cpumaps,
-                    int maplen) {
+                    int maplen)
+{
     struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
     virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
     virNodeInfo nodeinfo;
@@ -2667,7 +2725,8 @@
 #endif /* HAVE_SCHED_GETAFFINITY */
 
 
-static int qemudDomainGetMaxVcpus(virDomainPtr dom) {
+static int qemudDomainGetMaxVcpus(virDomainPtr dom)
+{
     struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
     virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
     const char *type;
@@ -2698,7 +2757,8 @@
 
 
 static int qemudDomainRestore(virConnectPtr conn,
-                       const char *path) {
+                       const char *path)
+{
     struct qemud_driver *driver = (struct qemud_driver *)conn->privateData;
     virDomainDefPtr def;
     virDomainObjPtr vm;
@@ -2813,7 +2873,8 @@
 
 
 static char *qemudDomainDumpXML(virDomainPtr dom,
-                                int flags ATTRIBUTE_UNUSED) {
+                                int flags ATTRIBUTE_UNUSED)
+{
     struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
     virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
     if (!vm) {
@@ -2830,7 +2891,8 @@
 
 
 static int qemudListDefinedDomains(virConnectPtr conn,
-                            char **const names, int nnames) {
+                            char **const names, int nnames)
+{
     struct qemud_driver *driver = (struct qemud_driver *)conn->privateData;
     virDomainObjPtr vm = driver->domains;
     int got = 0, i;
@@ -2854,7 +2916,8 @@
 }
 
 
-static int qemudNumDefinedDomains(virConnectPtr conn) {
+static int qemudNumDefinedDomains(virConnectPtr conn)
+{
     struct qemud_driver *driver = (struct qemud_driver *)conn->privateData;
     int n = 0;
     virDomainObjPtr dom = driver->domains;
@@ -2867,7 +2930,8 @@
 }
 
 
-static int qemudDomainStart(virDomainPtr dom) {
+static int qemudDomainStart(virDomainPtr dom)
+{
     struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
     virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
 
@@ -2881,7 +2945,8 @@
 }
 
 
-static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char *xml) {
+static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char *xml)
+{
     struct qemud_driver *driver = (struct qemud_driver *)conn->privateData;
     virDomainDefPtr def;
     virDomainObjPtr vm;
@@ -2911,7 +2976,8 @@
     return dom;
 }
 
-static int qemudDomainUndefine(virDomainPtr dom) {
+static int qemudDomainUndefine(virDomainPtr dom)
+{
     struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
     virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
 
@@ -2945,7 +3011,8 @@
 static int qemudDomainChangeCDROM(virDomainPtr dom,
                                   virDomainObjPtr vm,
                                   virDomainDiskDefPtr olddisk,
-                                  virDomainDiskDefPtr newdisk) {
+                                  virDomainDiskDefPtr newdisk)
+{
     struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
     char *cmd, *reply, *safe_path;
 
@@ -3112,7 +3179,8 @@
 }
 
 static int qemudDomainAttachDevice(virDomainPtr dom,
-                                   const char *xml) {
+                                   const char *xml)
+{
     struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
     virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
     virDomainDeviceDefPtr dev;
@@ -3157,7 +3225,8 @@
 }
 
 static int qemudDomainGetAutostart(virDomainPtr dom,
-                            int *autostart) {
+                            int *autostart)
+{
     struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
     virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
 
@@ -3173,7 +3242,8 @@
 }
 
 static int qemudDomainSetAutostart(virDomainPtr dom,
-                                   int autostart) {
+                                   int autostart)
+{
     struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
     virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
     char *configFile = NULL, *autostartLink = NULL;
@@ -3525,7 +3595,7 @@
     snprintf (cmd, sizeof cmd, "memsave %llu %zi \"%s\"", offset, size, tmp);
     if (qemudMonitorCommand (driver, vm, cmd, &info) < 0) {
         qemudReportError (dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
-                          "%s", _("'info blockstats' command failed"));
+                          "%s", _("'memsave' command failed"));
         goto done;
     }
 
@@ -3547,7 +3617,8 @@
 }
 
 static virNetworkPtr qemudNetworkLookupByUUID(virConnectPtr conn ATTRIBUTE_UNUSED,
-                                              const unsigned char *uuid) {
+                                              const unsigned char *uuid)
+{
     struct qemud_driver *driver = (struct qemud_driver *)conn->networkPrivateData;
     virNetworkObjPtr network = virNetworkFindByUUID(driver->networks, uuid);
     virNetworkPtr net;
@@ -3561,8 +3632,10 @@
     net = virGetNetwork(conn, network->def->name, network->def->uuid);
     return net;
 }
+
 static virNetworkPtr qemudNetworkLookupByName(virConnectPtr conn ATTRIBUTE_UNUSED,
-                                              const char *name) {
+                                              const char *name)
+{
     struct qemud_driver *driver = (struct qemud_driver *)conn->networkPrivateData;
     virNetworkObjPtr network = virNetworkFindByName(driver->networks, name);
     virNetworkPtr net;
@@ -3580,7 +3653,8 @@
 static virDrvOpenStatus qemudOpenNetwork(virConnectPtr conn,
                                          xmlURIPtr uri ATTRIBUTE_UNUSED,
                                          virConnectAuthPtr auth ATTRIBUTE_UNUSED,
-                                         int flags ATTRIBUTE_UNUSED) {
+                                         int flags ATTRIBUTE_UNUSED)
+{
     if (!qemu_driver)
         return VIR_DRV_OPEN_DECLINED;
 
@@ -3588,12 +3662,14 @@
     return VIR_DRV_OPEN_SUCCESS;
 }
 
-static int qemudCloseNetwork(virConnectPtr conn) {
+static int qemudCloseNetwork(virConnectPtr conn)
+{
     conn->networkPrivateData = NULL;
     return 0;
 }
 
-static int qemudNumNetworks(virConnectPtr conn) {
+static int qemudNumNetworks(virConnectPtr conn)
+{
     int nactive = 0;
     struct qemud_driver *driver = (struct qemud_driver *)conn->networkPrivateData;
     virNetworkObjPtr net = driver->networks;
@@ -3605,7 +3681,8 @@
     return nactive;
 }
 
-static int qemudListNetworks(virConnectPtr conn, char **const names, int nnames) {
+static int qemudListNetworks(virConnectPtr conn, char **const names, int nnames)
+{
     struct qemud_driver *driver = (struct qemud_driver *)conn->networkPrivateData;
     virNetworkObjPtr network = driver->networks;
     int got = 0, i;
@@ -3628,7 +3705,8 @@
     return -1;
 }
 
-static int qemudNumDefinedNetworks(virConnectPtr conn) {
+static int qemudNumDefinedNetworks(virConnectPtr conn)
+{
     int ninactive = 0;
     struct qemud_driver *driver = (struct qemud_driver *)conn->networkPrivateData;
     virNetworkObjPtr net = driver->networks;
@@ -3640,7 +3718,8 @@
     return ninactive;
 }
 
-static int qemudListDefinedNetworks(virConnectPtr conn, char **const names, int nnames) {
+static int qemudListDefinedNetworks(virConnectPtr conn, char **const names, int nnames)
+{
     struct qemud_driver *driver = (struct qemud_driver *)conn->networkPrivateData;
     virNetworkObjPtr network = driver->networks;
     int got = 0, i;
@@ -3663,7 +3742,8 @@
     return -1;
 }
 
-static virNetworkPtr qemudNetworkCreate(virConnectPtr conn, const char *xml) {
+static virNetworkPtr qemudNetworkCreate(virConnectPtr conn, const char *xml)
+{
  struct qemud_driver *driver = (struct qemud_driver *)conn->networkPrivateData;
     virNetworkDefPtr def;
     virNetworkObjPtr network;
@@ -3689,7 +3769,8 @@
     return net;
 }
 
-static virNetworkPtr qemudNetworkDefine(virConnectPtr conn, const char *xml) {
+static virNetworkPtr qemudNetworkDefine(virConnectPtr conn, const char *xml)
+{
     struct qemud_driver *driver = (struct qemud_driver *)conn->networkPrivateData;
     virNetworkDefPtr def;
     virNetworkObjPtr network;
@@ -3716,7 +3797,8 @@
     return virGetNetwork(conn, network->def->name, network->def->uuid);
 }
 
-static int qemudNetworkUndefine(virNetworkPtr net) {
+static int qemudNetworkUndefine(virNetworkPtr net)
+{
     struct qemud_driver *driver = (struct qemud_driver *)net->conn->networkPrivateData;
     virNetworkObjPtr network = virNetworkFindByUUID(driver->networks, net->uuid);
 
@@ -3741,7 +3823,8 @@
     return 0;
 }
 
-static int qemudNetworkStart(virNetworkPtr net) {
+static int qemudNetworkStart(virNetworkPtr net)
+{
     struct qemud_driver *driver = (struct qemud_driver *)net->conn->networkPrivateData;
     virNetworkObjPtr network = virNetworkFindByUUID(driver->networks, net->uuid);
 
@@ -3754,7 +3837,8 @@
     return qemudStartNetworkDaemon(net->conn, driver, network);
 }
 
-static int qemudNetworkDestroy(virNetworkPtr net) {
+static int qemudNetworkDestroy(virNetworkPtr net)
+{
     struct qemud_driver *driver = (struct qemud_driver *)net->conn->networkPrivateData;
     virNetworkObjPtr network = virNetworkFindByUUID(driver->networks, net->uuid);
     int ret;
@@ -3770,7 +3854,8 @@
     return ret;
 }
 
-static char *qemudNetworkDumpXML(virNetworkPtr net, int flags ATTRIBUTE_UNUSED) {
+static char *qemudNetworkDumpXML(virNetworkPtr net, int flags ATTRIBUTE_UNUSED)
+{
     struct qemud_driver *driver = (struct qemud_driver *)net->conn->networkPrivateData;
     virNetworkObjPtr network = virNetworkFindByUUID(driver->networks, net->uuid);
 
@@ -3783,7 +3868,8 @@
     return virNetworkDefFormat(net->conn, network->def);
 }
 
-static char *qemudNetworkGetBridgeName(virNetworkPtr net) {
+static char *qemudNetworkGetBridgeName(virNetworkPtr net)
+{
     struct qemud_driver *driver = (struct qemud_driver *)net->conn->networkPrivateData;
     virNetworkObjPtr network = virNetworkFindByUUID(driver->networks, net->uuid);
     char *bridge;
@@ -3803,7 +3889,8 @@
 }
 
 static int qemudNetworkGetAutostart(virNetworkPtr net,
-                             int *autostart) {
+                             int *autostart)
+{
     struct qemud_driver *driver = (struct qemud_driver *)net->conn->networkPrivateData;
     virNetworkObjPtr network = virNetworkFindByUUID(driver->networks, net->uuid);
 
@@ -3819,7 +3906,8 @@
 }
 
 static int qemudNetworkSetAutostart(virNetworkPtr net,
-                             int autostart) {
+                             int autostart)
+{
     struct qemud_driver *driver = (struct qemud_driver *)net->conn->networkPrivateData;
     virNetworkObjPtr network = virNetworkFindByUUID(driver->networks, net->uuid);
 
@@ -3967,7 +4055,8 @@
 };
 #endif
 
-int qemudRegister(void) {
+int qemudRegister(void)
+{
     virRegisterDriver(&qemuDriver);
     virRegisterNetworkDriver(&qemuNetworkDriver);
 #ifdef WITH_LIBVIRTD