From: Vasiliy Tolstov <v.tolstov@selfip.ru>
Date: Sat, 22 Aug 2015 15:33:15 +0000 (+0000)
Subject: Eliminate incorrect and unnecessary check for changed IP address
X-Git-Tag: v1.2.19-rc1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbc705d1309b8ec2eb4cdae011dc702802c96d11;p=thirdparty%2Flibvirt.git

Eliminate incorrect and unnecessary check for changed IP address

Commit aa2cc7 modified a previously unnecessary but innocuous check
for interface IP address during interface update incorrectly, causing
all attempted updates (e.g. changing link state) to interfaces of
type='ethernet' for QEMU to fail.

This patch fixes the issue by completely removing the check for IP
address, which is pointless since QEMU doesn't support setting
interface IP addresses from the domain interface XML anyway.

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
Signed-off-by: Laine Stump <laine@laine.org>
---

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index aabdb789c5..db4fddac57 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2394,10 +2394,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
 
         case VIR_DOMAIN_NET_TYPE_ETHERNET:
             if (STRNEQ_NULLABLE(olddev->data.ethernet.dev,
-                                newdev->data.ethernet.dev) ||
-                olddev->nips == 0 || newdev->nips == 0 ||
-                !virSocketAddrEqual(&olddev->ips[0]->address,
-                                    &newdev->ips[0]->address)) {
+                                newdev->data.ethernet.dev)) {
                 needReconnect = true;
             }
         break;