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

[libvirt] [PATCH] 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.
---
Pushed under the build breaker rule.

git *was* very informative when I tried to switch branches - *then* it
complained about the uncommitted local changes. No problem to push
with outstanding local changes though. That seems like a bug to me; is
there any situation where that would be a desired thing?


 src/util/virpci.c | 2 +-
 src/util/virusb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/util/virpci.c b/src/util/virpci.c
index ed55b80..3fa4a35 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 60222f4..e901618 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
-- 
1.7.11.7


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