Avoid broken networking with new QEMU/KVM >= 86

diff --git a/ChangeLog b/ChangeLog
index bcf070dc1ed472448209df5fea04a9227d5d6b82..8ea0ffca66122eecb507ab87267795e2e09da0fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu May 28 14:13:30 BST 2009 Daniel P. Berrange <berrange@redhat.com>
+
+       Avoid broken networking with new QEMU/KVM >= 86
+       * src/qemu_conf.c: Remove ifname= and script= args to QEMU
+       when passing a TAP device file handle.
+
 Thu May 28 14:11:30 BST 2009 Daniel P. Berrange <berrange@redhat.com>
 
        Fix misc syntax check failures with OpenNebula driver

diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index 93dc0b720765905d33b54a5dafeb09eb642f715c..a04d2166ee8e791b59bc5180196fe72aa5712586 100644 (file)
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -662,8 +662,8 @@ qemudNetworkIfaceConnect(virConnectPtr conn,
     }
 
     snprintf(tapfdstr, sizeof(tapfdstr),
-             "tap,fd=%d,script=,vlan=%d,ifname=%s",
-             tapfd, vlan, net->ifname);
+             "tap,fd=%d,vlan=%d",
+             tapfd, vlan);
 
     if (!(retval = strdup(tapfdstr)))
         goto no_memory;