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

zap DeviceState->nd 

No users left.
Also cleanup obsolete helper functions.

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:41 +02:00 committed by Anthony Liguori
parent 4c91cd2810
commit 1cc33683c8
4 changed files with 1 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/pci.c
View File

@ -859,14 +859,7 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,
dev = &pci_dev->qdev;
if (nd->name)
dev->id = qemu_strdup(nd->name);
if (qdev_prop_exists(dev, "mac")) {
/* qdev-ified */
qdev_set_nic_properties(dev, nd);
} else {
/* legacy */
dev->nd = nd;
nd->private = dev;
}
qdev_set_nic_properties(dev, nd);
if (qdev_init(dev) < 0)
return NULL;
return pci_dev;

22
hw/qdev.c
View File

@ -361,28 +361,6 @@ void qdev_connect_gpio_out(DeviceState * dev, int n, qemu_irq pin)
dev->gpio_out[n] = pin;
}
VLANClientState *qdev_get_vlan_client(DeviceState *dev,
NetCanReceive *can_receive,
NetReceive *receive,
NetReceiveIOV *receive_iov,
NetCleanup *cleanup,
void *opaque)
{
NICInfo *nd = dev->nd;
assert(nd);
nd->vc = qemu_new_vlan_client(nd->vlan, nd->netdev,
nd->model, nd->name,
can_receive, receive, receive_iov,
cleanup, opaque);
return nd->vc;
}
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);

1
hw/qdev.h
View File

@ -39,7 +39,6 @@ struct DeviceState {
qemu_irq *gpio_in;
QLIST_HEAD(, BusState) child_bus;
int num_child_bus;
NICInfo *nd;
QLIST_ENTRY(DeviceState) sibling;
};

7
net.h
View File

@ -164,13 +164,6 @@ void net_host_device_remove(Monitor *mon, const QDict *qdict);
#define SMBD_COMMAND "/usr/sbin/smbd"
#endif
void qdev_get_macaddr(DeviceState *dev, uint8_t *macaddr);
VLANClientState *qdev_get_vlan_client(DeviceState *dev,
NetCanReceive *can_receive,
NetReceive *receive,
NetReceiveIOV *receive_iov,
NetCleanup *cleanup,
void *opaque);
void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd);
#endif