diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2009-10-21 15:25:26 +0200 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-27 12:28:38 -0500 |
commit | ed16ab5afae7f5b1be58764d0e1eae20ce48d9ad (patch) | |
tree | 019408b4c2286cab3f6720394666b64f9cde2fb2 | |
parent | 851bec091d70b839f07a5e0615c2e17c8cd12b58 (diff) | |
download | qemu-ed16ab5afae7f5b1be58764d0e1eae20ce48d9ad.zip qemu-ed16ab5afae7f5b1be58764d0e1eae20ce48d9ad.tar.gz qemu-ed16ab5afae7f5b1be58764d0e1eae20ce48d9ad.tar.bz2 |
qdev/net: common nic property bits
Add a new type for properties common to all nics.
Add helper functions and macros to deal with it.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r-- | hw/qdev.c | 9 | ||||
-rw-r--r-- | net.h | 14 |
2 files changed, 23 insertions, 0 deletions
@@ -383,6 +383,15 @@ void qdev_get_macaddr(DeviceState *dev, uint8_t *macaddr) memcpy(macaddr, dev->nd->macaddr, 6); } +void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd) +{ + qdev_prop_set_macaddr(dev, "mac", nd->macaddr); + if (nd->vlan) + qdev_prop_set_vlan(dev, "vlan", nd->vlan); + if (nd->netdev) + qdev_prop_set_netdev(dev, "netdev", nd->netdev); +} + static int next_block_unit[IF_COUNT]; /* Get a block device. This should only be used for single-drive devices @@ -11,6 +11,19 @@ struct MACAddr { uint8_t a[6]; }; +/* qdev nic properties */ + +typedef struct NICConf { + MACAddr macaddr; + VLANState *vlan; + VLANClientState *peer; +} NICConf; + +#define DEFINE_NIC_PROPERTIES(_state, _conf) \ + DEFINE_PROP_MACADDR("mac", _state, _conf.macaddr), \ + DEFINE_PROP_VLAN("vlan", _state, _conf.vlan), \ + DEFINE_PROP_NETDEV("netdev", _state, _conf.peer) + /* VLANs support */ typedef int (NetCanReceive)(VLANClientState *); @@ -158,5 +171,6 @@ VLANClientState *qdev_get_vlan_client(DeviceState *dev, NetReceiveIOV *receive_iov, NetCleanup *cleanup, void *opaque); +void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd); #endif |