From: Erik Skultety <eskultet@redhat.com>
Date: Thu, 15 Jan 2015 13:14:18 +0000 (+0100)
Subject: Remove dead code in qemuDomainAssignPCIAddresses
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=419a22d5dbc5514a43ce8dab54f8382f6152e750;p=libvirt.git

Remove dead code in qemuDomainAssignPCIAddresses

We tested for positive return value from virDomainMaybeAddController,
but it returns 0 or -1 only resulting in a dead code.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 8091fb3d45..91be16c504 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1509,9 +1509,9 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
                          i, bus->model)) < 0)
                     goto cleanup;
                 /* If we added a new bridge, we will need one more address */
-                if (rv > 0 && virDomainPCIAddressReserveNextSlot(addrs, &info,
-                                                                 flags) < 0)
-                        goto cleanup;
+                if (rv == 0 &&
+                    virDomainPCIAddressReserveNextSlot(addrs, &info, flags) < 0)
+                    goto cleanup;
             }
             nbuses = addrs->nbuses;
             virDomainPCIAddressSetFree(addrs);