From: Anthony Liguori <aliguori@us.ibm.com>
Date: Sat, 2 Feb 2013 00:02:50 +0000 (-0600)
Subject: tap: unbreak -netdev tap,fd=X
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=02cd809099322d6bdbd3fb232e9dd1018b125866;p=qemu.git

tap: unbreak -netdev tap,fd=X

The multiqueue patch series broke -netdev tap,fd=X which manifests
as libvirt not being able to start a guest.  This was because it
passed NULL for the netdev name which results in an anonymous netdev
device regardless of what the user specified.

Cc: Jason Wang <jasowang@redhat.com>
Cc: Bruce Rogers <brogers@suse.com>
Reported-by: Bruce Rogers <brogers@suse.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/net/tap.c b/net/tap.c
index 1bf760995d..48c254ed85 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -711,7 +711,7 @@ int net_init_tap(const NetClientOptions *opts, const char *name,
 
         vnet_hdr = tap_probe_vnet_hdr(fd);
 
-        if (net_init_tap_one(tap, peer, "tap", NULL, NULL,
+        if (net_init_tap_one(tap, peer, "tap", name, NULL,
                              script, downscript,
                              vhostfdname, vnet_hdr, fd)) {
             return -1;