mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-01-22 13:33:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: Convert qdev_prop_vlan to peer with hub

Browse Source 
Instead of using VLANState use net/hub.h to support the vlan qdev
property.  The vlan qdev property becomes an alias for the peer qdev
property but is represented as a VLAN ID number.  When a VLAN ID is
selected the device will really peer with a hub port.

Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Zhi Yong Wu 2012-07-24 16:35:09 +01:00 committed by Stefan Hajnoczi
parent ab5f3f84c4
commit 606c10e2bd
5 changed files with 54 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
hw/qdev-properties.c
View File

@ -3,6 +3,7 @@
#include "qerror.h"
#include "blockdev.h"
#include "hw/block-common.h"
#include "net/hub.h"
void *qdev_get_prop_ptr(DeviceState *dev, Property *prop)
{
@ -624,13 +625,16 @@ PropertyInfo qdev_prop_netdev = {
static int print_vlan(DeviceState *dev, Property *prop, char *dest, size_t len)
{
VLANState **ptr = qdev_get_prop_ptr(dev, prop);
VLANClientState **ptr = qdev_get_prop_ptr(dev, prop);
if (*ptr) {
return snprintf(dest, len, "%d", (*ptr)->id);
} else {
return snprintf(dest, len, "<null>");
int id;
if (!net_hub_id_for_client(*ptr, &id)) {
return snprintf(dest, len, "%d", id);
}
}
return snprintf(dest, len, "<null>");
}
static void get_vlan(Object *obj, Visitor *v, void *opaque,
@ -638,11 +642,17 @@ static void get_vlan(Object *obj, Visitor *v, void *opaque,
{
DeviceState *dev = DEVICE(obj);
Property *prop = opaque;
VLANState **ptr = qdev_get_prop_ptr(dev, prop);
int64_t id;
VLANClientState **ptr = qdev_get_prop_ptr(dev, prop);
int32_t id = -1;
id = *ptr ? (*ptr)->id : -1;
visit_type_int64(v, &id, name, errp);
if (*ptr) {
int hub_id;
if (!net_hub_id_for_client(*ptr, &hub_id)) {
id = hub_id;
}
}
visit_type_int32(v, &id, name, errp);
}
static void set_vlan(Object *obj, Visitor *v, void *opaque,
@ -650,17 +660,17 @@ static void set_vlan(Object *obj, Visitor *v, void *opaque,
{
DeviceState *dev = DEVICE(obj);
Property *prop = opaque;
VLANState **ptr = qdev_get_prop_ptr(dev, prop);
VLANClientState **ptr = qdev_get_prop_ptr(dev, prop);
Error *local_err = NULL;
int64_t id;
VLANState *vlan;
int32_t id;
VLANClientState *hubport;
if (dev->state != DEV_STATE_CREATED) {
error_set(errp, QERR_PERMISSION_DENIED);
return;
}
visit_type_int64(v, &id, name, &local_err);
visit_type_int32(v, &id, name, &local_err);
if (local_err) {
error_propagate(errp, local_err);
return;
@ -669,13 +679,14 @@ static void set_vlan(Object *obj, Visitor *v, void *opaque,
*ptr = NULL;
return;
}
vlan = qemu_find_vlan(id, 1);
if (!vlan) {
hubport = net_hub_port_find(id);
if (!hubport) {
error_set(errp, QERR_INVALID_PARAMETER_VALUE,
name, prop->info->name);
return;
}
*ptr = vlan;
*ptr = hubport;
}
PropertyInfo qdev_prop_vlan = {

2
hw/qdev.h
View File

@ -291,7 +291,7 @@ extern PropertyInfo qdev_prop_pci_host_devaddr;
#define DEFINE_PROP_NETDEV(_n, _s, _f) \
DEFINE_PROP(_n, _s, _f, qdev_prop_netdev, VLANClientState*)
#define DEFINE_PROP_VLAN(_n, _s, _f) \
DEFINE_PROP(_n, _s, _f, qdev_prop_vlan, VLANState*)
DEFINE_PROP(_n, _s, _f, qdev_prop_vlan, VLANClientState*)
#define DEFINE_PROP_DRIVE(_n, _s, _f) \
DEFINE_PROP(_n, _s, _f, qdev_prop_drive, BlockDriverState *)
#define DEFINE_PROP_MACADDR(_n, _s, _f) \

2
net.h
View File

@ -24,7 +24,7 @@ typedef struct NICConf {
#define DEFINE_NIC_PROPERTIES(_state, _conf) \
DEFINE_PROP_MACADDR("mac", _state, _conf.macaddr), \
DEFINE_PROP_VLAN("vlan", _state, _conf.vlan), \
DEFINE_PROP_VLAN("vlan", _state, _conf.peer), \
DEFINE_PROP_NETDEV("netdev", _state, _conf.peer), \
DEFINE_PROP_INT32("bootindex", _state, _conf.bootindex, -1)

25
net/hub.c
View File

@ -187,6 +187,31 @@ VLANClientState *net_hub_find_client_by_name(int hub_id, const char *name)
return NULL;
}
/**
* Find a available port on a hub; otherwise create one new port
*/
VLANClientState *net_hub_port_find(int hub_id)
{
NetHub *hub;
NetHubPort *port;
VLANClientState *nc;
QLIST_FOREACH(hub, &hubs, next) {
if (hub->id == hub_id) {
QLIST_FOREACH(port, &hub->ports, next) {
nc = port->nc.peer;
if (!nc) {
return &(port->nc);
}
}
break;
}
}
nc = net_hub_add_port(hub_id, NULL);
return nc;
}
/**
* Print hub configuration
*/

1
net/hub.h
View File

@ -24,5 +24,6 @@ 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);
void net_hub_check_clients(void);
VLANClientState *net_hub_port_find(int hub_id);
#endif /* NET_HUB_H */