From 2afc3bfd8b779ddba974da9d66d6ea337fc91c01 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Thu, 28 May 2009 13:15:57 +0000
Subject: [PATCH] Avoid broken networking with new QEMU/KVM >= 86

---
 ChangeLog       | 6 ++++++
 src/qemu_conf.c | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bcf070dc1e..8ea0ffca66 100644
--- 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 93dc0b7207..a04d2166ee 100644
--- 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;