From: zhang bo <oscar.zhangbo@huawei.com>
Date: Mon, 8 Jun 2015 08:25:10 +0000 (+0800)
Subject: qemu: update netdevs of the same mac addrs correctly
X-Git-Tag: v1.2.17-rc1~198
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=798461a1a3e547c3f0dcd9d6aca25d474015946e;p=thirdparty%2Flibvirt.git

qemu: update netdevs of the same mac addrs correctly

If a guest has multiple network devices with the same MAC address,
when we online update the second device, libvirtd always updates
the first one.

commit def31e4c forgot to fix the online updating scenario. We need to
use virDomainNetFindIdx() to find the correct network device.

Signed-off-by: Zhou Yimin <zhouyimin@huawei.com>
Signed-off-by: Zhang Bo <oscar.zhangbo@huawei.com>
---

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 3562de6e1d..cc86a3bc5e 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2052,20 +2052,6 @@ int qemuDomainAttachHostDevice(virConnectPtr conn,
     return -1;
 }
 
-static virDomainNetDefPtr *qemuDomainFindNet(virDomainObjPtr vm,
-                                             virDomainNetDefPtr dev)
-{
-    size_t i;
-
-    for (i = 0; i < vm->def->nnets; i++) {
-        if (virMacAddrCmp(&vm->def->nets[i]->mac, &dev->mac) == 0)
-            return &vm->def->nets[i];
-    }
-
-    return NULL;
-}
-
-
 static int
 qemuDomainChangeNetBridge(virDomainObjPtr vm,
                           virDomainNetDefPtr olddev,
@@ -2195,7 +2181,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
                     virDomainDeviceDefPtr dev)
 {
     virDomainNetDefPtr newdev = dev->data.net;
-    virDomainNetDefPtr *devslot = qemuDomainFindNet(vm, newdev);
+    virDomainNetDefPtr *devslot = NULL;
     virDomainNetDefPtr olddev;
     int oldType, newType;
     bool needReconnect = false;
@@ -2205,8 +2191,13 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
     bool needReplaceDevDef = false;
     bool needBandwidthSet = false;
     int ret = -1;
+    int changeidx = -1;
+
+    if ((changeidx = virDomainNetFindIdx(vm->def, newdev)) < 0)
+        goto cleanup;
+    devslot = &vm->def->nets[changeidx];
 
-    if (!devslot || !(olddev = *devslot)) {
+    if (!(olddev = *devslot)) {
         virReportError(VIR_ERR_OPERATION_FAILED, "%s",
                        _("cannot find existing network device to modify"));
         goto cleanup;