From: Laine Stump <laine@laine.org>
Date: Mon, 27 Feb 2012 17:22:22 +0000 (-0500)
Subject: qemu: use virDomainNetRemove instead of inline code
X-Git-Tag: v0.9.11-rc1~140
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16520d6555f2a9b37cad35f3e3cb6d1d067722e4;p=thirdparty%2Flibvirt.git

qemu: use virDomainNetRemove instead of inline code

The code being replaced is exactly identical to the newly global
function, right down to the comment.
---

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index cb41388289..6119108b0d 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2158,19 +2158,7 @@ qemuDomainDetachNetDevice(struct qemud_driver *driver,
                         detach->ifname));
 
     networkReleaseActualDevice(detach);
-    if (vm->def->nnets > 1) {
-        memmove(vm->def->nets + i,
-                vm->def->nets + i + 1,
-                sizeof(*vm->def->nets) *
-                (vm->def->nnets - (i + 1)));
-        vm->def->nnets--;
-        if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets) < 0) {
-            /* ignore, harmless */
-        }
-    } else {
-        VIR_FREE(vm->def->nets);
-        vm->def->nnets = 0;
-    }
+    virDomainNetRemove(vm->def, i);
     virDomainNetDefFree(detach);
 
     ret = 0;