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/ioapic_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'hw/ioapic_common.c') diff --git a/hw/ioapic_common.c b/hw/ioapic_common.c index 3aa9a1cf57..4a7624c085 100644 --- a/hw/ioapic_common.c +++ b/hw/ioapic_common.c @@ -40,7 +40,7 @@ static void ioapic_dispatch_pre_save(void *opaque) { IOAPICCommonState *s = opaque; IOAPICCommonInfo *info = - DO_UPCAST(IOAPICCommonInfo, busdev.qdev, s->busdev.qdev.info); + DO_UPCAST(IOAPICCommonInfo, busdev.qdev, qdev_get_info(&s->busdev.qdev)); if (info->pre_save) { info->pre_save(s); @@ -51,7 +51,7 @@ static int ioapic_dispatch_post_load(void *opaque, int version_id) { IOAPICCommonState *s = opaque; IOAPICCommonInfo *info = - DO_UPCAST(IOAPICCommonInfo, busdev.qdev, s->busdev.qdev.info); + DO_UPCAST(IOAPICCommonInfo, busdev.qdev, qdev_get_info(&s->busdev.qdev)); if (info->post_load) { info->post_load(s); @@ -69,7 +69,7 @@ static int ioapic_init_common(SysBusDevice *dev) return -1; } - info = DO_UPCAST(IOAPICCommonInfo, busdev.qdev, s->busdev.qdev.info); + info = DO_UPCAST(IOAPICCommonInfo, busdev.qdev, qdev_get_info(&s->busdev.qdev)); info->init(s, ioapic_no); sysbus_init_mmio(&s->busdev, &s->io_memory); -- cgit 1.4.1