Received: from eggs.gnu.org ([2001:4830:134:3::10]:34005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ut6hc-0003cl-OJ for qemu-devel@nongnu.org; Sat, 29 Jun 2013 21:45:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ut6hX-0007bn-LN for qemu-devel@nongnu.org; Sat, 29 Jun 2013 21:45:20 -0400 From: Alexander Graf Date: Sun, 30 Jun 2013 03:44:48 +0200 Message-Id: <1372556709-23868-12-git-send-email-agraf@suse.de> In-Reply-To: <1372556709-23868-1-git-send-email-agraf@suse.de> References: <1372556709-23868-1-git-send-email-agraf@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 11/32] intc/openpic_kvm: Fix QOM and build issues List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-ppc@nongnu.org Cc: Blue Swirl , qemu-devel@nongnu.org, Aurelien Jarno , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Andreas F=C3=A4rber Signed-off-by: Andreas F=C3=A4rber Signed-off-by: Alexander Graf --- default-configs/ppcemb-softmmu.mak | 1 + hw/intc/openpic_kvm.c | 54 +++++++++++++++++++++++---------= ------ hw/ppc/e500.c | 2 +- include/hw/ppc/openpic.h | 1 + 4 files changed, 36 insertions(+), 22 deletions(-) diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-= softmmu.mak index 61920ff..e3b5e50 100644 --- a/default-configs/ppcemb-softmmu.mak +++ b/default-configs/ppcemb-softmmu.mak @@ -38,5 +38,6 @@ CONFIG_XILINX=3Dy CONFIG_XILINX_ETHLITE=3Dy CONFIG_OPENPIC=3Dy CONFIG_E500=3Dy +CONFIG_OPENPIC_KVM=3D$(and $(CONFIG_E500),$(CONFIG_KVM)) # For PReP CONFIG_MC146818RTC=3Dy diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c index 17d0a35..6775879 100644 --- a/hw/intc/openpic_kvm.c +++ b/hw/intc/openpic_kvm.c @@ -31,8 +31,14 @@ #include "sysemu/kvm.h" #include "qemu/log.h" =20 +#define KVM_OPENPIC(obj) \ + OBJECT_CHECK(KVMOpenPICState, (obj), TYPE_KVM_OPENPIC) + typedef struct KVMOpenPICState { - SysBusDevice busdev; + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + MemoryRegion mem; MemoryListener mem_listener; uint32_t fd; @@ -145,16 +151,26 @@ static void kvm_openpic_region_del(MemoryListener *= listener, } } =20 -static int kvm_openpic_init(SysBusDevice *dev) +static void kvm_openpic_init(Object *obj) +{ + KVMOpenPICState *opp =3D KVM_OPENPIC(obj); + + memory_region_init_io(&opp->mem, &kvm_openpic_mem_ops, opp, + "kvm-openpic", 0x40000); +} + +static void kvm_openpic_realize(DeviceState *dev, Error **errp) { + SysBusDevice *d =3D SYS_BUS_DEVICE(dev); + KVMOpenPICState *opp =3D KVM_OPENPIC(dev); KVMState *s =3D kvm_state; - KVMOpenPICState *opp =3D FROM_SYSBUS(typeof(*opp), dev); int kvm_openpic_model; struct kvm_create_device cd =3D {0}; int ret, i; =20 if (!kvm_check_extension(s, KVM_CAP_DEVICE_CTRL)) { - return -EINVAL; + error_setg(errp, "Kernel is lacking Device Control API"); + return; } =20 switch (opp->model) { @@ -167,23 +183,21 @@ static int kvm_openpic_init(SysBusDevice *dev) break; =20 default: - return -EINVAL; + error_setg(errp, "Unsupported OpenPIC model %" PRIu32, opp->mode= l); + return; } =20 cd.type =3D kvm_openpic_model; ret =3D kvm_vm_ioctl(s, KVM_CREATE_DEVICE, &cd); if (ret < 0) { - qemu_log_mask(LOG_UNIMP, "%s: can't create device %d: %s\n", - __func__, cd.type, strerror(errno)); - return -EINVAL; + error_setg(errp, "Can't create device %d: %s", + cd.type, strerror(errno)); + return; } opp->fd =3D cd.fd; =20 - memory_region_init_io(&opp->mem, &kvm_openpic_mem_ops, opp, - "kvm-openpic", 0x40000); - - sysbus_init_mmio(dev, &opp->mem); - qdev_init_gpio_in(&dev->qdev, kvm_openpic_set_irq, OPENPIC_MAX_IRQ); + sysbus_init_mmio(d, &opp->mem); + qdev_init_gpio_in(dev, kvm_openpic_set_irq, OPENPIC_MAX_IRQ); =20 opp->mem_listener.region_add =3D kvm_openpic_region_add; opp->mem_listener.region_add =3D kvm_openpic_region_del; @@ -205,13 +219,11 @@ static int kvm_openpic_init(SysBusDevice *dev) kvm_gsi_routing_allowed =3D true; =20 kvm_irqchip_commit_routes(s); - - return 0; } =20 int kvm_openpic_connect_vcpu(DeviceState *d, CPUState *cs) { - KVMOpenPICState *opp =3D FROM_SYSBUS(typeof(*opp), SYS_BUS_DEVICE(d)= ); + KVMOpenPICState *opp =3D KVM_OPENPIC(d); struct kvm_enable_cap encap =3D {}; =20 encap.cap =3D KVM_CAP_IRQ_MPIC; @@ -227,20 +239,20 @@ static Property kvm_openpic_properties[] =3D { DEFINE_PROP_END_OF_LIST(), }; =20 -static void kvm_openpic_class_init(ObjectClass *klass, void *data) +static void kvm_openpic_class_init(ObjectClass *oc, void *data) { - DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(oc); =20 - k->init =3D kvm_openpic_init; + dc->realize =3D kvm_openpic_realize; dc->props =3D kvm_openpic_properties; dc->reset =3D kvm_openpic_reset; } =20 static const TypeInfo kvm_openpic_info =3D { - .name =3D "kvm-openpic", + .name =3D TYPE_KVM_OPENPIC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(KVMOpenPICState), + .instance_init =3D kvm_openpic_init, .class_init =3D kvm_openpic_class_init, }; =20 diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 3797fbc..38f7990 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -504,7 +504,7 @@ static DeviceState *ppce500_init_mpic_kvm(PPCE500Para= ms *params, CPUState *cs; int r; =20 - dev =3D qdev_create(NULL, "kvm-openpic"); + dev =3D qdev_create(NULL, TYPE_KVM_OPENPIC); qdev_prop_set_uint32(dev, "model", params->mpic_version); =20 r =3D qdev_init(dev); diff --git a/include/hw/ppc/openpic.h b/include/hw/ppc/openpic.h index ef3f5c3..ee67098 100644 --- a/include/hw/ppc/openpic.h +++ b/include/hw/ppc/openpic.h @@ -26,6 +26,7 @@ enum { #define OPENPIC_MAX_IRQ (OPENPIC_MAX_SRC + OPENPIC_MAX_IPI + \ OPENPIC_MAX_TMR) =20 +#define TYPE_KVM_OPENPIC "kvm-openpic" int kvm_openpic_connect_vcpu(DeviceState *d, CPUState *cs); =20 #endif /* __OPENPIC_H__ */ --=20 1.8.1.4