]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: silence coverity warnings
authorEric Blake <eblake@redhat.com>
Mon, 4 Jul 2011 02:23:46 +0000 (10:23 +0800)
committerDaniel Veillard <veillard@redhat.com>
Mon, 4 Jul 2011 02:23:46 +0000 (10:23 +0800)
Coverity warns if the majority of callers check a function for
errors, but a few don't; but in qemu_audit and qemu_domain, the
choice to not check for failures was safe.  In qemu_command, the
failure to generate a uuid can only occur on a bad pointer.

* src/qemu/qemu_audit.c (qemuAuditCgroup): Ignore failure to get
  cgroup controller.
* src/qemu/qemu_domain.c (qemuDomainObjEnterMonitor)
  (qemuDomainObjEnterMonitorWithDriver): Ignore failure to get
  timestamp.
* src/qemu/qemu_command.c (qemuParseCommandLine): Check for error.

src/qemu/qemu_audit.c
src/qemu/qemu_command.c
src/qemu/qemu_domain.c

index 1da07738d6d0ef3663ea6da92a1103b773f3b74a..1baef402fead0ffc6bd64f1829105c492cbdd62b 100644 (file)
@@ -31,6 +31,7 @@
 #include "uuid.h"
 #include "logging.h"
 #include "memory.h"
+#include "ignore-value.h"
 
 /* Return nn:mm in hex for block and character devices, and NULL
  * for other file types, stat failure, or allocation failure.  */
@@ -264,8 +265,9 @@ qemuAuditCgroup(virDomainObjPtr vm, virCgroupPtr cgroup,
         return;
     }
 
-    virCgroupPathOfController(cgroup, VIR_CGROUP_CONTROLLER_DEVICES,
-                              NULL, &controller);
+    ignore_value(virCgroupPathOfController(cgroup,
+                                           VIR_CGROUP_CONTROLLER_DEVICES,
+                                           NULL, &controller));
     detail = virAuditEncode("cgroup", VIR_AUDIT_STR(controller));
 
     VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success,
index 90a6653d6f5b08e21af72ea8eaa863bf76333037..fc15f87e4ce61e07f5afc26bff310a1ac5c17835 100644 (file)
@@ -5842,7 +5842,11 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps,
     if (VIR_ALLOC(cmd) < 0)
         goto no_memory;
 
-    virUUIDGenerate(def->uuid);
+    if (virUUIDGenerate(def->uuid) < 0) {
+        qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                        _("failed to generate uuid"));
+        goto error;
+    }
 
     def->id = -1;
     def->mem.cur_balloon = def->mem.max_balloon = 64 * 1024;
index 3af1c869342c695220a76a543e87d82cf2bfbad2..4b65d87fd05d8261f1f5bc7410a8c9384c7caee1 100644 (file)
@@ -608,7 +608,7 @@ void qemuDomainObjEnterMonitor(virDomainObjPtr obj)
 
     qemuMonitorLock(priv->mon);
     qemuMonitorRef(priv->mon);
-    virTimeMs(&priv->monStart);
+    ignore_value(virTimeMs(&priv->monStart));
     virDomainObjUnlock(obj);
 }
 
@@ -651,7 +651,7 @@ void qemuDomainObjEnterMonitorWithDriver(struct qemud_driver *driver,
 
     qemuMonitorLock(priv->mon);
     qemuMonitorRef(priv->mon);
-    virTimeMs(&priv->monStart);
+    ignore_value(virTimeMs(&priv->monStart));
     virDomainObjUnlock(obj);
     qemuDriverUnlock(driver);
 }