sim-card
/
qemu
Archived
10
0
Fork 0
Code Releases Activity

qdev: add netdev property 

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Gerd Hoffmann 2009-10-21 15:25:24 +02:00 committed by Anthony Liguori
parent 1503fff343
commit 2ef924b416
4 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hw/qdev-properties.c
View File

@ -279,6 +279,37 @@ PropertyInfo qdev_prop_chr = {
.print = print_chr,
};
/* --- netdev device --- */
static int parse_netdev(DeviceState *dev, Property *prop, const char *str)
{
VLANClientState **ptr = qdev_get_prop_ptr(dev, prop);
*ptr = qemu_find_netdev(str);
if (*ptr == NULL)
return -1;
return 0;
}
static int print_netdev(DeviceState *dev, Property *prop, char *dest, size_t len)
{
VLANClientState **ptr = qdev_get_prop_ptr(dev, prop);
if (*ptr && (*ptr)->name) {
return snprintf(dest, len, "%s", (*ptr)->name);
} else {
return snprintf(dest, len, "<null>");
}
}
PropertyInfo qdev_prop_netdev = {
.name = "netdev",
.type = PROP_TYPE_NETDEV,
.size = sizeof(VLANClientState*),
.parse = parse_netdev,
.print = print_netdev,
};
/* --- pointer --- */
static int print_ptr(DeviceState *dev, Property *prop, char *dest, size_t len)
@ -488,6 +519,11 @@ void qdev_prop_set_chr(DeviceState *dev, const char *name, CharDriverState *valu
qdev_prop_set(dev, name, &value, PROP_TYPE_CHR);
}
void qdev_prop_set_netdev(DeviceState *dev, const char *name, VLANClientState *value)
{
qdev_prop_set(dev, name, &value, PROP_TYPE_NETDEV);
}
void qdev_prop_set_macaddr(DeviceState *dev, const char *name, uint8_t *value)
{
qdev_prop_set(dev, name, value, PROP_TYPE_MACADDR);

4
hw/qdev.h
View File

@ -80,6 +80,7 @@ enum PropertyType {
PROP_TYPE_DRIVE,
PROP_TYPE_CHR,
PROP_TYPE_STRING,
PROP_TYPE_NETDEV,
PROP_TYPE_PTR,
};
@ -231,6 +232,8 @@ extern PropertyInfo qdev_prop_pci_devfn;
DEFINE_PROP(_n, _s, _f, qdev_prop_chr, CharDriverState*)
#define DEFINE_PROP_STRING(_n, _s, _f) \
DEFINE_PROP(_n, _s, _f, qdev_prop_string, char*)
#define DEFINE_PROP_NETDEV(_n, _s, _f) \
DEFINE_PROP(_n, _s, _f, qdev_prop_netdev, VLANClientState*)
#define DEFINE_PROP_DRIVE(_n, _s, _f) \
DEFINE_PROP(_n, _s, _f, qdev_prop_drive, DriveInfo*)
#define DEFINE_PROP_MACADDR(_n, _s, _f) \
@ -249,6 +252,7 @@ void qdev_prop_set_uint32(DeviceState *dev, const char *name, uint32_t value);
void qdev_prop_set_int32(DeviceState *dev, const char *name, int32_t value);
void qdev_prop_set_uint64(DeviceState *dev, const char *name, uint64_t value);
void qdev_prop_set_chr(DeviceState *dev, const char *name, CharDriverState *value);
void qdev_prop_set_netdev(DeviceState *dev, const char *name, VLANClientState *value);
void qdev_prop_set_drive(DeviceState *dev, const char *name, DriveInfo *value);
void qdev_prop_set_macaddr(DeviceState *dev, const char *name, uint8_t *value);
/* FIXME: Remove opaque pointer properties. */

2
net.c
View File

@ -2363,7 +2363,7 @@ VLANState *qemu_find_vlan(int id, int allocate)
return vlan;
}
static VLANClientState *qemu_find_netdev(const char *id)
VLANClientState *qemu_find_netdev(const char *id)
{
VLANClientState *vc;

1
net.h
View File

@ -47,6 +47,7 @@ struct VLANState {
};
VLANState *qemu_find_vlan(int id, int allocate);
VLANClientState *qemu_find_netdev(const char *id);
VLANClientState *qemu_new_vlan_client(VLANState *vlan,
VLANClientState *peer,
const char *model,