summaryrefslogtreecommitdiffstats
path: root/hw/eepro100.c
diff options
context:
space:
mode:
authorAnthony Liguori2011-12-04 18:08:36 +0100
committerAnthony Liguori2012-01-27 17:50:34 +0100
commit30fbb9fc7cd73abc32ff71ceb59e9a3be37ac128 (patch)
tree25aa7ff76f8db648bff269cf169c00d28260ec1f /hw/eepro100.c
parentqdev: integrate with QEMU Object Model (v2) (diff)
downloadqemu-30fbb9fc7cd73abc32ff71ceb59e9a3be37ac128.tar.gz
qemu-30fbb9fc7cd73abc32ff71ceb59e9a3be37ac128.tar.xz
qemu-30fbb9fc7cd73abc32ff71ceb59e9a3be37ac128.zip
qdev: move qdev->info to class
Right now, DeviceInfo acts as the class for qdev. In order to switch to a proper ObjectClass derivative, we need to ween all of the callers off of interacting directly with the info pointer. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/eepro100.c')
-rw-r--r--hw/eepro100.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/eepro100.c b/hw/eepro100.c
index 6a162f607f..81a32b8d7b 100644
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -1848,7 +1848,7 @@ static int e100_nic_init(PCIDevice *pci_dev)
{
EEPRO100State *s = DO_UPCAST(EEPRO100State, dev, pci_dev);
E100PCIDeviceInfo *e100_device = DO_UPCAST(E100PCIDeviceInfo, pci.qdev,
- pci_dev->qdev.info);
+ qdev_get_info(&pci_dev->qdev));
TRACE(OTHER, logout("\n"));
@@ -1878,7 +1878,7 @@ static int e100_nic_init(PCIDevice *pci_dev)
nic_reset(s);
s->nic = qemu_new_nic(&net_eepro100_info, &s->conf,
- pci_dev->qdev.info->name, pci_dev->qdev.id, s);
+ qdev_get_info(&pci_dev->qdev)->name, pci_dev->qdev.id, s);
qemu_format_nic_info_str(&s->nic->nc, s->conf.macaddr.a);
TRACE(OTHER, logout("%s\n", s->nic->nc.info_str));