OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

net: Look up 'vlan' net clients using hubs

Browse Source 
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2012-07-24 16:35:06 +01:00
parent d33d93b2c4
commit 90d87a33c7
4 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
net.c
View File

@ -315,32 +315,6 @@ void qemu_del_vlan_client(VLANClientState *vc)
qemu_free_vlan_client(vc);
}
VLANClientState *
qemu_find_vlan_client_by_name(Monitor *mon, int vlan_id,
const char *client_str)
{
VLANState *vlan;
VLANClientState *vc;
vlan = qemu_find_vlan(vlan_id, 0);
if (!vlan) {
monitor_printf(mon, "unknown VLAN %d\n", vlan_id);
return NULL;
}
QTAILQ_FOREACH(vc, &vlan->clients, next) {
if (!strcmp(vc->name, client_str)) {
break;
}
}
if (!vc) {
monitor_printf(mon, "can't find device %s on VLAN %d\n",
client_str, vlan_id);
}
return vc;
}
void qemu_foreach_nic(qemu_nic_foreach func, void *opaque)
{
VLANClientState *nc;
@ -994,7 +968,7 @@ void net_host_device_remove(Monitor *mon, const QDict *qdict)
int vlan_id = qdict_get_int(qdict, "vlan_id");
const char *device = qdict_get_str(qdict, "device");
vc = qemu_find_vlan_client_by_name(mon, vlan_id, device);
vc = net_hub_find_client_by_name(vlan_id, device);
if (!vc) {
return;
}

23
net/hub.c
View File

@ -164,6 +164,29 @@ VLANClientState *net_hub_add_port(int hub_id, const char *name)
return &port->nc;
}
/**
* Find a specific client on a hub
*/
VLANClientState *net_hub_find_client_by_name(int hub_id, const char *name)
{
NetHub *hub;
NetHubPort *port;
VLANClientState *peer;
QLIST_FOREACH(hub, &hubs, next) {
if (hub->id == hub_id) {
QLIST_FOREACH(port, &hub->ports, next) {
peer = port->nc.peer;
if (peer && strcmp(peer->name, name) == 0) {
return peer;
}
}
}
}
return NULL;
}
/**
* Print hub configuration
*/

1
net/hub.h
View File

@ -20,6 +20,7 @@
int net_init_hubport(const NetClientOptions *opts, const char *name,
VLANClientState *peer);
VLANClientState *net_hub_add_port(int hub_id, const char *name);
VLANClientState *net_hub_find_client_by_name(int hub_id, const char *name);
void net_hub_info(Monitor *mon);
int net_hub_id_for_client(VLANClientState *nc, int *id);

7
net/slirp.c
View File

@ -30,6 +30,7 @@
#include <sys/wait.h>
#endif
#include "net.h"
#include "net/hub.h"
#include "monitor.h"
#include "qemu_socket.h"
#include "slirp/libslirp.h"
@ -284,7 +285,7 @@ static SlirpState *slirp_lookup(Monitor *mon, const char *vlan,
if (vlan) {
VLANClientState *nc;
nc = qemu_find_vlan_client_by_name(mon, strtol(vlan, NULL, 0), stack);
nc = net_hub_find_client_by_name(strtol(vlan, NULL, 0), stack);
if (!nc) {
return NULL;
}
@ -679,8 +680,10 @@ void do_info_usernet(Monitor *mon)
SlirpState *s;
QTAILQ_FOREACH(s, &slirp_stacks, entry) {
int id;
bool got_vlan_id = net_hub_id_for_client(&s->nc, &id) == 0;
monitor_printf(mon, "VLAN %d (%s):\n",
s->nc.vlan ? s->nc.vlan->id : -1,
got_vlan_id ? id : -1,
s->nc.name);
slirp_connection_info(s->slirp, mon);
}