From: Laine Stump <laine@laine.org>
Date: Thu, 11 Jul 2013 03:06:43 +0000 (-0400)
Subject: util: add rebase fix that was accidentally omitted from previous patch
X-Git-Tag: CVE-2013-4154~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a04e60b21f64afc8d38cb53956d03a322777389a;p=thirdparty%2Flibvirt.git

util: add rebase fix that was accidentally omitted from previous patch

I had made the change locally, so make check and make syntax-check
were successful, but forgot to add/commit. Unfortunately, git allows a
push when the local directory is dirty, so it didn't catch my mistake.
---

diff --git a/src/util/virpci.c b/src/util/virpci.c
index ed55b80f31..3fa4a35938 100644
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -1669,7 +1669,7 @@ virPCIDeviceListAdd(virPCIDeviceListPtr list,
                        _("Device %s is already in use"), dev->name);
         return -1;
     }
-    return VIR_APPEND_ELEMENT(list->devs, list->count, dev, true);
+    return VIR_APPEND_ELEMENT(list->devs, list->count, dev);
 }
 
 
diff --git a/src/util/virusb.c b/src/util/virusb.c
index 60222f4f97..e901618dbc 100644
--- a/src/util/virusb.c
+++ b/src/util/virusb.c
@@ -450,7 +450,7 @@ virUSBDeviceListAdd(virUSBDeviceListPtr list,
                        dev->name);
         return -1;
     }
-    return VIR_APPEND_ELEMENT(list->devs, list->count, dev, true);
+    return VIR_APPEND_ELEMENT(list->devs, list->count, dev);
 }
 
 virUSBDevicePtr