From 30fbb9fc7cd73abc32ff71ceb59e9a3be37ac128 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Sun, 4 Dec 2011 11:08:36 -0600 Subject: 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 --- hw/intel-hda.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'hw/intel-hda.c') diff --git a/hw/intel-hda.c b/hw/intel-hda.c index 10769e0f49..12dcc840ea 100644 --- a/hw/intel-hda.c +++ b/hw/intel-hda.c @@ -1116,8 +1116,8 @@ static void intel_hda_reset(DeviceState *dev) /* reset codecs */ QTAILQ_FOREACH(qdev, &d->codecs.qbus.children, sibling) { cdev = DO_UPCAST(HDACodecDevice, qdev, qdev); - if (qdev->info->reset) { - qdev->info->reset(qdev); + if (qdev_get_info(qdev)->reset) { + qdev_get_info(qdev)->reset(qdev); } d->state_sts |= (1 << cdev->cad); } @@ -1129,7 +1129,7 @@ static int intel_hda_init(PCIDevice *pci) IntelHDAState *d = DO_UPCAST(IntelHDAState, pci, pci); uint8_t *conf = d->pci.config; - d->name = d->pci.qdev.info->name; + d->name = qdev_get_info(&d->pci.qdev)->name; pci_config_set_interrupt_pin(conf, 1); -- cgit 1.4.1