From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkwFU-0000yJ-1K for qemu-devel@nongnu.org; Fri, 07 Jun 2013 08:58:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UkwFQ-00085d-DE for qemu-devel@nongnu.org; Fri, 07 Jun 2013 08:58:31 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53802 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkwFQ-00084w-4N for qemu-devel@nongnu.org; Fri, 07 Jun 2013 08:58:28 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 7 Jun 2013 14:58:17 +0200 Message-Id: <1370609900-21998-10-git-send-email-afaerber@suse.de> In-Reply-To: <1370609900-21998-1-git-send-email-afaerber@suse.de> References: <1370609900-21998-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 09/12] i8259: Convert PICCommonState to use QOM realizefn List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , anthony@codemonkey.ws Instead of having the parent provide PICCommonClass::init, let the children override DeviceClass::realize themselves. This pushes the responsibility of saving and calling the parent's realizefn to the children. Signed-off-by: Andreas F=C3=A4rber --- hw/i386/kvm/i8259.c | 26 ++++++++++++++++++++++++-- hw/intc/i8259.c | 25 +++++++++++++++++++++---- hw/intc/i8259_common.c | 3 --- include/hw/isa/i8259_internal.h | 2 +- 4 files changed, 46 insertions(+), 10 deletions(-) diff --git a/hw/i386/kvm/i8259.c b/hw/i386/kvm/i8259.c index 0bfbe34..1250224 100644 --- a/hw/i386/kvm/i8259.c +++ b/hw/i386/kvm/i8259.c @@ -14,6 +14,20 @@ #include "sysemu/kvm.h" =20 #define TYPE_KVM_I8259 "kvm-i8259" +#define KVM_PIC_CLASS(class) \ + OBJECT_CLASS_CHECK(KVMPICClass, (class), TYPE_KVM_I8259) +#define KVM_PIC_GET_CLASS(obj) \ + OBJECT_GET_CLASS(KVMPICClass, (obj), TYPE_KVM_I8259) + +/** + * KVMPICClass: + * @parent_realize: The parent's realizefn. + */ +typedef struct KVMPICClass { + PICCommonClass parent_class; + + DeviceRealize parent_realize; +} KVMPICClass; =20 static void kvm_pic_get(PICCommonState *s) { @@ -100,10 +114,15 @@ static void kvm_pic_set_irq(void *opaque, int irq, = int level) apic_report_irq_delivered(delivered); } =20 -static void kvm_pic_init(PICCommonState *s) +static void kvm_pic_realize(DeviceState *dev, Error **errp) { + PICCommonState *s =3D PIC_COMMON(dev); + KVMPICClass *kpc =3D KVM_PIC_GET_CLASS(dev); + memory_region_init_reservation(&s->base_io, "kvm-pic", 2); memory_region_init_reservation(&s->elcr_io, "kvm-elcr", 1); + + kpc->parent_realize(dev, errp); } =20 qemu_irq *kvm_i8259_init(ISABus *bus) @@ -116,11 +135,13 @@ qemu_irq *kvm_i8259_init(ISABus *bus) =20 static void kvm_i8259_class_init(ObjectClass *klass, void *data) { + KVMPICClass *kpc =3D KVM_PIC_CLASS(klass); PICCommonClass *k =3D PIC_COMMON_CLASS(klass); DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->reset =3D kvm_pic_reset; - k->init =3D kvm_pic_init; + kpc->parent_realize =3D dc->realize; + dc->realize =3D kvm_pic_realize; k->pre_save =3D kvm_pic_get; k->post_load =3D kvm_pic_put; } @@ -130,6 +151,7 @@ static const TypeInfo kvm_i8259_info =3D { .parent =3D TYPE_PIC_COMMON, .instance_size =3D sizeof(PICCommonState), .class_init =3D kvm_i8259_class_init, + .class_size =3D sizeof(KVMPICClass), }; =20 static void kvm_pic_register_types(void) diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c index 1b513ff..192a0ba 100644 --- a/hw/intc/i8259.c +++ b/hw/intc/i8259.c @@ -42,6 +42,18 @@ //#define DEBUG_IRQ_COUNT =20 #define TYPE_I8259 "isa-i8259" +#define PIC_CLASS(class) OBJECT_CLASS_CHECK(PICClass, (class), TYPE_I825= 9) +#define PIC_GET_CLASS(obj) OBJECT_GET_CLASS(PICClass, (obj), TYPE_I8259) + +/** + * PICClass: + * @parent_realize: The parent's realizefn. + */ +typedef struct PICClass { + PICCommonClass parent_class; + + DeviceRealize parent_realize; +} PICClass; =20 #if defined(DEBUG_PIC) || defined(DEBUG_IRQ_COUNT) static int irq_level[16]; @@ -400,15 +412,18 @@ static const MemoryRegionOps pic_elcr_ioport_ops =3D= { }, }; =20 -static void pic_init(PICCommonState *s) +static void pic_realize(DeviceState *dev, Error **err) { - DeviceState *dev =3D DEVICE(s); + PICCommonState *s =3D PIC_COMMON(dev); + PICClass *pc =3D PIC_GET_CLASS(dev); =20 memory_region_init_io(&s->base_io, &pic_base_ioport_ops, s, "pic", 2= ); memory_region_init_io(&s->elcr_io, &pic_elcr_ioport_ops, s, "elcr", = 1); =20 qdev_init_gpio_out(dev, s->int_out, ARRAY_SIZE(s->int_out)); qdev_init_gpio_in(dev, pic_set_irq, 8); + + pc->parent_realize(dev, err); } =20 void pic_info(Monitor *mon, const QDict *qdict) @@ -481,10 +496,11 @@ qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_i= rq) =20 static void i8259_class_init(ObjectClass *klass, void *data) { - PICCommonClass *k =3D PIC_COMMON_CLASS(klass); + PICClass *k =3D PIC_CLASS(klass); DeviceClass *dc =3D DEVICE_CLASS(klass); =20 - k->init =3D pic_init; + k->parent_realize =3D dc->realize; + dc->realize =3D pic_realize; dc->reset =3D pic_reset; } =20 @@ -493,6 +509,7 @@ static const TypeInfo i8259_info =3D { .instance_size =3D sizeof(PICCommonState), .parent =3D TYPE_PIC_COMMON, .class_init =3D i8259_class_init, + .class_size =3D sizeof(PICClass), }; =20 static void pic_register_types(void) diff --git a/hw/intc/i8259_common.c b/hw/intc/i8259_common.c index a3dee38..7613547 100644 --- a/hw/intc/i8259_common.c +++ b/hw/intc/i8259_common.c @@ -69,9 +69,6 @@ static int pic_dispatch_post_load(void *opaque, int ver= sion_id) static void pic_common_realize(DeviceState *dev, Error **errp) { PICCommonState *s =3D PIC_COMMON(dev); - PICCommonClass *info =3D PIC_COMMON_GET_CLASS(s); - - info->init(s); =20 isa_register_ioport(NULL, &s->base_io, s->iobase); if (s->elcr_addr !=3D -1) { diff --git a/include/hw/isa/i8259_internal.h b/include/hw/isa/i8259_inter= nal.h index b4e757a..cded509 100644 --- a/include/hw/isa/i8259_internal.h +++ b/include/hw/isa/i8259_internal.h @@ -42,7 +42,7 @@ typedef struct PICCommonState PICCommonState; typedef struct PICCommonClass { ISADeviceClass parent_class; - void (*init)(PICCommonState *s); + void (*pre_save)(PICCommonState *s); void (*post_load)(PICCommonState *s); } PICCommonClass; --=20 1.8.1.4