From: John Ferlan <jferlan@redhat.com>
Date: Thu, 4 Sep 2014 20:50:15 +0000 (-0400)
Subject: qemu: Resolve Coverity NEGATIVE_RETURNS
X-Git-Tag: CVE-2014-3633~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35a50ea8c7918ec99724df73281c0d54129be231;p=thirdparty%2Flibvirt.git

qemu: Resolve Coverity NEGATIVE_RETURNS

In qemuProcessInitPCIAddresses() if qemuMonitorGetAllPCIAddresses()
returns a negative (or zero) value, then no need to call the
qemuProcessDetectPCIAddresses().

Signed-off-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index ac40ea8e44..07335a0060 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -2725,7 +2725,7 @@ qemuProcessInitPCIAddresses(virQEMUDriverPtr driver,
 {
     qemuDomainObjPrivatePtr priv = vm->privateData;
     int naddrs;
-    int ret;
+    int ret = -1;
     qemuMonitorPCIAddress *addrs = NULL;
 
     if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
@@ -2734,7 +2734,8 @@ qemuProcessInitPCIAddresses(virQEMUDriverPtr driver,
                                            &addrs);
     qemuDomainObjExitMonitor(driver, vm);
 
-    ret = qemuProcessDetectPCIAddresses(vm, addrs, naddrs);
+    if (naddrs > 0)
+        ret = qemuProcessDetectPCIAddresses(vm, addrs, naddrs);
 
     VIR_FREE(addrs);