diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-03 11:20:07 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-03 11:20:07 -0500 |
| commit | a612925b4184fa7aa37092db4fef816030640922 (patch) | |
| tree | 82e8aaa8575caba5750468fe6b28e400f5add008 | |
| parent | 25565e8595322b04902a09ebf877d80532f22fd1 (diff) | |
| parent | 7873df408dd44eb92840b108211d5aa5db7db526 (diff) | |
| download | focaccia-qemu-a612925b4184fa7aa37092db4fef816030640922.tar.gz focaccia-qemu-a612925b4184fa7aa37092db4fef816030640922.zip | |
Merge remote-tracking branch 'stefanha/net' into staging
# By Amos Kong (1) and Jason Wang (1) # Via Stefan Hajnoczi * stefanha/net: tap: properly initialize vhostfds net: make network client name unique Message-id: 1367582254-15060-1-git-send-email-stefanha@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | net/net.c | 7 | ||||
| -rw-r--r-- | net/tap.c | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/net/net.c b/net/net.c index 7869161d8d..43a74e43ae 100644 --- a/net/net.c +++ b/net/net.c @@ -157,8 +157,7 @@ void qemu_macaddr_default_if_unset(MACAddr *macaddr) /** * Generate a name for net client * - * Only net clients created with the legacy -net option need this. Naming is - * mandatory for net clients created with -netdev. + * Only net clients created with the legacy -net option and NICs need this. */ static char *assign_name(NetClientState *nc1, const char *model) { @@ -170,9 +169,7 @@ static char *assign_name(NetClientState *nc1, const char *model) if (nc == nc1) { continue; } - /* For compatibility only bump id for net clients on a vlan */ - if (strcmp(nc->model, model) == 0 && - net_hub_id_for_client(nc, NULL) == 0) { + if (strcmp(nc->model, model) == 0) { id++; } } diff --git a/net/tap.c b/net/tap.c index 17bdf014a9..e0b7a2a5a0 100644 --- a/net/tap.c +++ b/net/tap.c @@ -623,7 +623,7 @@ static int net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer, vhostfdname || (tap->has_vhostforce && tap->vhostforce)) { int vhostfd; - if (tap->has_vhostfd) { + if (tap->has_vhostfd || tap->has_vhostfds) { vhostfd = monitor_handle_fd_param(cur_mon, vhostfdname); if (vhostfd == -1) { return -1; |