diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-04 11:08:36 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-27 10:50:34 -0600 |
| commit | 30fbb9fc7cd73abc32ff71ceb59e9a3be37ac128 (patch) | |
| tree | 25aa7ff76f8db648bff269cf169c00d28260ec1f /hw/ioapic_common.c | |
| parent | 32fea4025bfb80f2dbc5c3ce415703af28d85f63 (diff) | |
| download | focaccia-qemu-30fbb9fc7cd73abc32ff71ceb59e9a3be37ac128.tar.gz focaccia-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/ioapic_common.c')
| -rw-r--r-- | hw/ioapic_common.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |