[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH v2 16/22] Remove unnecessary curly brackets in rest of src/



Signed-off-by: Martin Kletzander <mkletzan redhat com>
---
 src/vmware/vmware_conf.c   |  3 +--
 src/vmware/vmware_driver.c |  6 ++----
 src/xen/block_stats.c      |  3 +--
 src/xen/xen_driver.c       |  6 ++----
 src/xen/xen_hypervisor.c   |  6 ++----
 src/xen/xend_internal.c    | 18 ++++++------------
 src/xen/xm_internal.c      |  6 ++----
 src/xenapi/xenapi_driver.c | 12 ++++--------
 src/xenapi/xenapi_utils.c  |  9 +++------
 src/xenconfig/xen_common.c |  6 ++----
 src/xenconfig/xen_sxpr.c   |  6 ++----
 11 files changed, 27 insertions(+), 54 deletions(-)

diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
index 81ac4ae..5c8a7be 100644
--- a/src/vmware/vmware_conf.c
+++ b/src/vmware/vmware_conf.c
@@ -432,9 +432,8 @@ vmwareVmxPath(virDomainDefPtr vmdef, char **vmxPath)
         goto cleanup;
     }

-    if (vmwareParsePath(src, &directoryName, &fileName) < 0) {
+    if (vmwareParsePath(src, &directoryName, &fileName) < 0)
         goto cleanup;
-    }

     if (!virFileHasSuffix(fileName, ".vmdk")) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index c3fa2dc..5379876 100644
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -313,9 +313,8 @@ vmwareStopVM(struct vmware_driver *driver,
     vmwareSetSentinal(cmd, vmwareDriverTypeToString(driver->type));
     vmwareSetSentinal(cmd, ((vmwareDomainPtr) vm->privateData)->vmxPath);

-    if (virRun(cmd, NULL) < 0) {
+    if (virRun(cmd, NULL) < 0)
         return -1;
-    }

     vm->def->id = -1;
     virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, reason);
@@ -345,9 +344,8 @@ vmwareStartVM(struct vmware_driver *driver, virDomainObjPtr vm)
     else
         vmwareSetSentinal(cmd, NULL);

-    if (virRun(cmd, NULL) < 0) {
+    if (virRun(cmd, NULL) < 0)
         return -1;
-    }

     if ((vm->def->id = vmwareExtractPid(vmxPath)) < 0) {
         vmwareStopVM(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED);
diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c
index 58e796d..e1e10a2 100644
--- a/src/xen/block_stats.c
+++ b/src/xen/block_stats.c
@@ -107,9 +107,8 @@ read_bd_stat(int device, int domid, const char *str)

         VIR_FREE(path);

-        if (r >= 0) {
+        if (r >= 0)
             return r;
-        }
     }

     return -1;
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 5f7c98f..7334142 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -2550,15 +2550,13 @@ xenUnifiedNodeDeviceAssignedDomainId(virNodeDevicePtr dev)

     /* Get active domains */
     numdomains = xenUnifiedConnectNumOfDomains(conn);
-    if (numdomains < 0) {
+    if (numdomains < 0)
         return ret;
-    }
     if (numdomains > 0) {
         if (VIR_ALLOC_N(ids, numdomains) < 0)
             goto out;
-        if ((numdomains = xenUnifiedConnectListDomains(conn, &ids[0], numdomains)) < 0) {
+        if ((numdomains = xenUnifiedConnectListDomains(conn, &ids[0], numdomains)) < 0)
             goto out;
-        }
     }

     /* Get pci bdf */
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 4be8891..2473532 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -2258,9 +2258,8 @@ get_cpu_flags(virConnectPtr conn, const char **hvm, int *pae, int *longmode)
     if (STREQLEN((const char *)&regs.r_ebx, "AuthcAMDenti", 12)) {
         if (pread(fd, &regs, sizeof(regs), 0x80000001) == sizeof(regs)) {
             /* Read secure virtual machine bit (bit 2 of ECX feature ID) */
-            if ((regs.r_ecx >> 2) & 1) {
+            if ((regs.r_ecx >> 2) & 1)
                 *hvm = "svm";
-            }
             if ((regs.r_edx >> 6) & 1)
                 *pae = 1;
         }
@@ -2935,9 +2934,8 @@ xenHypervisorNodeGetCellsFreeMemory(virConnectPtr conn,
         else
             op_sys.u.availheap.node = cell;
         ret = xenHypervisorDoV2Sys(priv->handle, &op_sys);
-        if (ret < 0) {
+        if (ret < 0)
             return -1;
-        }
         if (hv_versions.sys_interface >= 5)
             freeMems[i] = op_sys.u.availheap5.avail_bytes;
         else
diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index f1322c4..b233b6b 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -147,14 +147,12 @@ wr_sync(int fd, void *buffer, size_t size, int do_read)
         }

         /* recoverable error, retry  */
-        if ((len == -1) && ((errno == EAGAIN) || (errno == EINTR))) {
+        if ((len == -1) && ((errno == EAGAIN) || (errno == EINTR)))
             continue;
-        }

         /* eof */
-        if (len == 0) {
+        if (len == 0)
             break;
-        }

         /* unrecoverable error */
         if (len == -1) {
@@ -1759,9 +1757,8 @@ xenDaemonNodeGetTopology(virConnectPtr conn, virCapsPtr caps)
     struct sexpr *root;

     root = sexpr_get(conn, "/xend/node/");
-    if (root == NULL) {
+    if (root == NULL)
         return -1;
-    }

     ret = sexpr_to_xend_topology(root, caps);
     sexpr_free(root);
@@ -2078,9 +2075,8 @@ xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
         names = xenDaemonListDomainsOld(conn);
         tmp = names;

-        if (names == NULL) {
+        if (names == NULL)
             return NULL;
-        }
         while (*tmp != NULL) {
             id = xenDaemonDomainLookupByName_ids(conn, *tmp, &ident[0]);
             if (id >= 0) {
@@ -2160,9 +2156,8 @@ xenDaemonCreateXML(virConnectPtr conn, virDomainDefPtr def)

     ret = xenDaemonDomainCreateXML(conn, sexpr);
     VIR_FREE(sexpr);
-    if (ret != 0) {
+    if (ret != 0)
         goto error;
-    }

     /* This comes before wait_for_devices, to ensure that latter
        cleanup will destroy the domain upon failure */
@@ -2562,9 +2557,8 @@ xenDaemonDomainGetAutostart(virConnectPtr conn,
     *autostart = 0;

     tmp = sexpr_node(root, "domain/on_xend_start");
-    if (tmp && STREQ(tmp, "start")) {
+    if (tmp && STREQ(tmp, "start"))
         *autostart = 1;
-    }

     sexpr_free(root);
     return 0;
diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index 30985d8..293b2ab 100644
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -121,9 +121,8 @@ xenXMConfigReaper(const void *payload,
     if (entry->refreshedAt != args->now) {
         const char *olddomname = entry->def->name;
         char *nameowner = (char *)virHashLookup(args->priv->nameConfigMap, olddomname);
-        if (nameowner && STREQ(nameowner, key)) {
+        if (nameowner && STREQ(nameowner, key))
             virHashRemoveEntry(args->priv->nameConfigMap, olddomname);
-        }
         return 1;
     }
     return 0;
@@ -231,9 +230,8 @@ xenXMConfigCacheAddFile(virConnectPtr conn, const char *filename)
         /* If we currently own the name, then release it and
             re-acquire it later - just in case it was renamed */
         nameowner = (char *)virHashLookup(priv->nameConfigMap, entry->def->name);
-        if (nameowner && STREQ(nameowner, filename)) {
+        if (nameowner && STREQ(nameowner, filename))
             virHashRemoveEntry(priv->nameConfigMap, entry->def->name);
-        }

         /* Clear existing config entry which needs refresh */
         virDomainDefFree(entry->def);
diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index ed4f7e8..7048556 100644
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -1493,16 +1493,13 @@ xenapiDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
     }
     defPtr->maxvcpus = defPtr->vcpus = xenapiDomainGetMaxVcpus(dom);
     enum xen_on_normal_exit action;
-    if (xen_vm_get_actions_after_shutdown(session, &action, vm)) {
+    if (xen_vm_get_actions_after_shutdown(session, &action, vm))
         defPtr->onPoweroff = xenapiNormalExitEnum2virDomainLifecycle(action);
-    }
-    if (xen_vm_get_actions_after_reboot(session, &action, vm)) {
+    if (xen_vm_get_actions_after_reboot(session, &action, vm))
         defPtr->onReboot = xenapiNormalExitEnum2virDomainLifecycle(action);
-    }
     enum xen_on_crash_behaviour crash;
-    if (xen_vm_get_actions_after_crash(session, &crash, vm)) {
+    if (xen_vm_get_actions_after_crash(session, &crash, vm))
         defPtr->onCrash = xenapiCrashExitEnum2virDomainLifecycle(action);
-    }
     xen_vm_get_platform(session, &result, vm);
     if (result != NULL) {
         size_t i;
@@ -2060,9 +2057,8 @@ call_func(const void *data, size_t len, void *user_handle,
     fflush(stdout);
 #endif
     CURL *curl = curl_easy_init();
-    if (!curl) {
+    if (!curl)
       return -1;
-    }
     xen_comms comms = {
      .func = result_func,
      .handle = result_handle
diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c
index c71dd15..91bc649 100644
--- a/src/xenapi/xenapi_utils.c
+++ b/src/xenapi/xenapi_utils.c
@@ -84,9 +84,8 @@ xenapiUtil_RequestPassword(virConnectAuthPtr auth, const char *username,
         cred.result = NULL;
         cred.resultlen = 0;

-        if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0) {
+        if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0)
             VIR_FREE(cred.result);
-        }

         break;
     }
@@ -105,9 +104,8 @@ xenapiUtil_ParseQuery(virConnectPtr conn, virURIPtr uri, int *noVerify)
     for (i = 0; i < uri->paramsCount; i++) {
         virURIParamPtr queryParam = &uri->params[i];
         if (STRCASEEQ(queryParam->name, "no_verify")) {
-            if (noVerify == NULL) {
+            if (noVerify == NULL)
                 continue;
-            }
             if (virStrToLong_i(queryParam->value, NULL, 10, noVerify) < 0 ||
                 (*noVerify != 0 && *noVerify != 1)) {
                 xenapiSessionErrorHandler(conn, VIR_ERR_INVALID_ARG,
@@ -282,9 +280,8 @@ mapDomainPinVcpu(unsigned char *cpumap, int maplen)
     size_t i, j;
     for (i = 0; i < maplen; i++) {
         for (j = 0; j < 8; j++) {
-            if (cpumap[i] & (1 << j)) {
+            if (cpumap[i] & (1 << j))
                 virBufferAsprintf(&buf, "%zu,", (8*i)+j);
-            }
         }
     }
     if (virBufferCheckError(&buf) < 0)
diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c
index 32954f3..29c6c34 100644
--- a/src/xenconfig/xen_common.c
+++ b/src/xenconfig/xen_common.c
@@ -729,9 +729,8 @@ xenParseCharDev(virConfPtr conf, virDomainDefPtr def)
             !(chr = xenParseSxprChar(str, NULL)))
             goto cleanup;
         if (chr) {
-            if (VIR_ALLOC_N(def->parallels, 1) < 0) {
+            if (VIR_ALLOC_N(def->parallels, 1) < 0)
                 goto cleanup;
-            }

             chr->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL;
             chr->target.port = 0;
@@ -762,9 +761,8 @@ xenParseCharDev(virConfPtr conf, virDomainDefPtr def)
                     goto cleanup;
                 chr->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL;
                 chr->target.port = portnum;
-                if (VIR_APPEND_ELEMENT(def->serials, def->nserials, chr) < 0) {
+                if (VIR_APPEND_ELEMENT(def->serials, def->nserials, chr) < 0)
                     goto cleanup;
-                }

                 value = value->next;
             }
diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index 6623ea8..a667814 100644
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -1959,16 +1959,14 @@ xenFormatSxprNet(virConnectPtr conn,
         if (def->model != NULL && STREQ(def->model, "netfront")) {
             virBufferAddLit(buf, "(type netfront)");
         } else {
-            if (def->model != NULL) {
+            if (def->model != NULL)
                 virBufferEscapeSexpr(buf, "(model '%s')", def->model);
-            }
             /*
              * apparently (type ioemu) breaks paravirt drivers on HVM so skip
              * this from XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU
              */
-            if (xendConfigVersion <= XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU) {
+            if (xendConfigVersion <= XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU)
                 virBufferAddLit(buf, "(type ioemu)");
-            }
         }
     }

-- 
2.1.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]