]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: fix ethernet network type ip/route assign
authorVasiliy Tolstov <v.tolstov@selfip.ru>
Wed, 24 Aug 2016 16:09:22 +0000 (19:09 +0300)
committerLaine Stump <laine@laine.org>
Thu, 25 Aug 2016 22:51:12 +0000 (18:51 -0400)
The call to virNetDevIPInfoAddToDev() that sets up tap device IP
addresses and routes was somehow incorrectly placed in
qemuInterfaceStopDevice() instead of qemuInterfaceStartDevice() in
commit fe8567f6.  This fixes that error by moving the call to
virNetDevIPInfoAddToDev() to qemuInterfaceStartDevice().

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
src/qemu/qemu_interface.c

index e637d21fb77aaf400c5a351ba38868a944b037f1..e327133308785bfadac464a6cb4413e964c90189 100644 (file)
@@ -108,8 +108,13 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net)
         break;
     }
 
-    case VIR_DOMAIN_NET_TYPE_USER:
     case VIR_DOMAIN_NET_TYPE_ETHERNET:
+        if (virNetDevIPInfoAddToDev(net->ifname, &net->hostIP) < 0)
+            goto cleanup;
+
+        break;
+
+    case VIR_DOMAIN_NET_TYPE_USER:
     case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
     case VIR_DOMAIN_NET_TYPE_SERVER:
     case VIR_DOMAIN_NET_TYPE_CLIENT:
@@ -197,10 +202,6 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net)
     }
 
     case VIR_DOMAIN_NET_TYPE_ETHERNET:
-        if (virNetDevIPInfoAddToDev(net->ifname, &net->hostIP) < 0)
-            goto cleanup;
-        break;
-
     case VIR_DOMAIN_NET_TYPE_USER:
     case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
     case VIR_DOMAIN_NET_TYPE_SERVER: