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/i8259_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'hw/i8259_common.c') diff --git a/hw/i8259_common.c b/hw/i8259_common.c index e515876..7536897 100644 --- a/hw/i8259_common.c +++ b/hw/i8259_common.c @@ -49,7 +49,7 @@ static void pic_dispatch_pre_save(void *opaque) { PICCommonState *s = opaque; PICCommonInfo *info = - DO_UPCAST(PICCommonInfo, isadev.qdev, s->dev.qdev.info); + DO_UPCAST(PICCommonInfo, isadev.qdev, qdev_get_info(&s->dev.qdev)); if (info->pre_save) { info->pre_save(s); @@ -60,7 +60,7 @@ static int pic_dispatch_post_load(void *opaque, int version_id) { PICCommonState *s = opaque; PICCommonInfo *info = - DO_UPCAST(PICCommonInfo, isadev.qdev, s->dev.qdev.info); + DO_UPCAST(PICCommonInfo, isadev.qdev, qdev_get_info(&s->dev.qdev)); if (info->post_load) { info->post_load(s); @@ -72,7 +72,7 @@ static int pic_init_common(ISADevice *dev) { PICCommonState *s = DO_UPCAST(PICCommonState, dev, dev); PICCommonInfo *info = - DO_UPCAST(PICCommonInfo, isadev.qdev, dev->qdev.info); + DO_UPCAST(PICCommonInfo, isadev.qdev, qdev_get_info(&dev->qdev)); info->init(s); -- cgit v1.1