From patchwork Tue Nov 5 10:16:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zhao xiao qiang X-Patchwork-Id: 288459 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 20ABB2C0091 for ; Tue, 5 Nov 2013 21:18:16 +1100 (EST) Received: from localhost ([::1]:54329 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vddi9-00043A-Ab for incoming@patchwork.ozlabs.org; Tue, 05 Nov 2013 05:18:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vddgc-0002If-Uk for qemu-devel@nongnu.org; Tue, 05 Nov 2013 05:16:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VddgS-0001n5-Nt for qemu-devel@nongnu.org; Tue, 05 Nov 2013 05:16:38 -0500 Received: from m50-133.163.com ([123.125.50.133]:42220) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VddgR-0001ic-SQ for qemu-devel@nongnu.org; Tue, 05 Nov 2013 05:16:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=Received:From:To:Cc:Subject:Date:Message-Id: In-Reply-To:References; bh=ZM04Gy9taI7YzWG7wc7GS73IKmSKKImvlExOv T32JwA=; b=LFppoZSWJ3MW24P61gxRiJObd534bhfjRp6B/BWadO2jiiyukvZ+8 A2yomzNL4vm96R0OZbeHE8ku7uH5W8igN//CLbByHs4/8REhBZRwMRhzeWPAd0XT yX/TdmyzSdvP+C64/gRwSLzMEDkv+oR7aSmJ3nICttGUV1xV+1UnaU= Received: from localhost.localdomain (unknown [121.5.20.50]) by smtp3 (Coremail) with SMTP id DdGowEBZY2hgxXhSqOJhCw--.4867S4; Tue, 05 Nov 2013 18:16:17 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Tue, 5 Nov 2013 18:16:03 +0800 Message-Id: <1383646565-13774-3-git-send-email-zxq_yx_007@163.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1383646565-13774-1-git-send-email-zxq_yx_007@163.com> References: <1383646565-13774-1-git-send-email-zxq_yx_007@163.com> X-CM-TRANSID: DdGowEBZY2hgxXhSqOJhCw--.4867S4 X-Coremail-Antispam: 1Uf129KBjvJXoW3AFWUJr1UWF4kXFyktFy7KFg_yoWxWr4fpF n5XF43AFWUGF48Xrs2yrnrXF4UC3Z7CF1xCF95Wrs7A3Z8Grn5J3ZIk3ySkFWUGrZ5AFn8 Z3ykK3y5Aw47Jw7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jspnQUUUUU= X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiFg3MxlEAHlr5agAAsX X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 123.125.50.133 Cc: xiaoqiang zhao , pbonzini@redhat.com, afaerber@suse.de, aliguori@amazon.com Subject: [Qemu-devel] [PATCH v3 2/4] apic: QOM'ify apic & icc_bus X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org changes includes: 1. use type constant for apic and kvm_apic 2. convert function 'init' to QOM's 'realize' for apic/kvm_apic 3. for consistency, also QOM'ify apic's parent bus 'icc_bus' Signed-off-by: xiaoqiang zhao --- hw/cpu/icc_bus.c | 14 ++++++-------- hw/i386/kvm/apic.c | 10 +++++++--- hw/intc/apic.c | 10 +++++++--- hw/intc/apic_common.c | 13 +++++++------ include/hw/cpu/icc_bus.h | 3 ++- include/hw/i386/apic_internal.h | 3 ++- 6 files changed, 31 insertions(+), 22 deletions(-) diff --git a/hw/cpu/icc_bus.c b/hw/cpu/icc_bus.c index 9a4ea7e..7f44c59 100644 --- a/hw/cpu/icc_bus.c +++ b/hw/cpu/icc_bus.c @@ -43,15 +43,13 @@ static const TypeInfo icc_bus_info = { static void icc_device_realize(DeviceState *dev, Error **errp) { - ICCDevice *id = ICC_DEVICE(dev); - ICCDeviceClass *idc = ICC_DEVICE_GET_CLASS(id); - - if (idc->init) { - if (idc->init(id) < 0) { - error_setg(errp, "%s initialization failed.", - object_get_typename(OBJECT(dev))); - } + ICCDeviceClass *idc = ICC_DEVICE_GET_CLASS(dev); + + /* convert to QOM */ + if (idc->realize) { + idc->realize(dev, errp); } + } static void icc_device_class_init(ObjectClass *oc, void *data) diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c index 84f6056..55f4a53 100644 --- a/hw/i386/kvm/apic.c +++ b/hw/i386/kvm/apic.c @@ -13,6 +13,8 @@ #include "hw/pci/msi.h" #include "sysemu/kvm.h" +#define TYPE_KVM_APIC "kvm-apic" + static inline void kvm_apic_set_reg(struct kvm_lapic_state *kapic, int reg_id, uint32_t val) { @@ -171,8 +173,10 @@ static const MemoryRegionOps kvm_apic_io_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static void kvm_apic_init(APICCommonState *s) +static void kvm_apic_realize(DeviceState *dev, Error **errp) { + APICCommonState *s = APIC_COMMON(dev); + memory_region_init_io(&s->io_memory, NULL, &kvm_apic_io_ops, s, "kvm-apic-msi", APIC_SPACE_SIZE); @@ -185,7 +189,7 @@ static void kvm_apic_class_init(ObjectClass *klass, void *data) { APICCommonClass *k = APIC_COMMON_CLASS(klass); - k->init = kvm_apic_init; + k->realize = kvm_apic_realize; k->set_base = kvm_apic_set_base; k->set_tpr = kvm_apic_set_tpr; k->get_tpr = kvm_apic_get_tpr; @@ -195,7 +199,7 @@ static void kvm_apic_class_init(ObjectClass *klass, void *data) } static const TypeInfo kvm_apic_info = { - .name = "kvm-apic", + .name = TYPE_KVM_APIC, .parent = TYPE_APIC_COMMON, .instance_size = sizeof(APICCommonState), .class_init = kvm_apic_class_init, diff --git a/hw/intc/apic.c b/hw/intc/apic.c index b542628..2d7891d 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -32,6 +32,8 @@ #define SYNC_TO_VAPIC 0x2 #define SYNC_ISR_IRR_TO_VAPIC 0x4 +#define TYPE_APIC "apic" + static APICCommonState *local_apics[MAX_APICS + 1]; static void apic_set_irq(APICCommonState *s, int vector_num, int trigger_mode); @@ -871,8 +873,10 @@ static const MemoryRegionOps apic_io_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static void apic_init(APICCommonState *s) +static void apic_realize(DeviceState *dev, Error **errp) { + APICCommonState *s = APIC_COMMON(dev); + memory_region_init_io(&s->io_memory, OBJECT(s), &apic_io_ops, s, "apic-msi", APIC_SPACE_SIZE); @@ -886,7 +890,7 @@ static void apic_class_init(ObjectClass *klass, void *data) { APICCommonClass *k = APIC_COMMON_CLASS(klass); - k->init = apic_init; + k->realize = apic_realize; k->set_base = apic_set_base; k->set_tpr = apic_set_tpr; k->get_tpr = apic_get_tpr; @@ -897,7 +901,7 @@ static void apic_class_init(ObjectClass *klass, void *data) } static const TypeInfo apic_info = { - .name = "apic", + .name = TYPE_APIC, .instance_size = sizeof(APICCommonState), .parent = TYPE_APIC_COMMON, .class_init = apic_class_init, diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index f3edf48..2ab1e12 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -284,7 +284,7 @@ static int apic_load_old(QEMUFile *f, void *opaque, int version_id) return 0; } -static int apic_init_common(ICCDevice *dev) +static void apic_common_realize(DeviceState *dev, Error **errp) { APICCommonState *s = APIC_COMMON(dev); APICCommonClass *info; @@ -293,14 +293,16 @@ static int apic_init_common(ICCDevice *dev) static bool mmio_registered; if (apic_no >= MAX_APICS) { - return -1; + error_setg(errp, "%s initialization failed.", + object_get_typename(OBJECT(dev))); + return; } s->idx = apic_no++; info = APIC_COMMON_GET_CLASS(s); - info->init(s); + info->realize(dev, errp); if (!mmio_registered) { - ICCBus *b = ICC_BUS(qdev_get_parent_bus(DEVICE(dev))); + ICCBus *b = ICC_BUS(qdev_get_parent_bus(dev)); memory_region_add_subregion(b->apic_address_space, 0, &s->io_memory); mmio_registered = true; } @@ -315,7 +317,6 @@ static int apic_init_common(ICCDevice *dev) info->enable_tpr_reporting(s, true); } - return 0; } static void apic_dispatch_pre_save(void *opaque) @@ -388,7 +389,7 @@ static void apic_common_class_init(ObjectClass *klass, void *data) dc->reset = apic_reset_common; dc->no_user = 1; dc->props = apic_properties_common; - idc->init = apic_init_common; + idc->realize = apic_common_realize; } static const TypeInfo apic_common_type = { diff --git a/include/hw/cpu/icc_bus.h b/include/hw/cpu/icc_bus.h index b550070..b32a549 100644 --- a/include/hw/cpu/icc_bus.h +++ b/include/hw/cpu/icc_bus.h @@ -66,7 +66,8 @@ typedef struct ICCDeviceClass { DeviceClass parent_class; /*< public >*/ - int (*init)(ICCDevice *dev); /* TODO replace with QOM realize */ + /* QOM realize */ + DeviceRealize realize; } ICCDeviceClass; #define TYPE_ICC_DEVICE "icc-device" diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h index 1b0a7fb..0cbe26b 100644 --- a/include/hw/i386/apic_internal.h +++ b/include/hw/i386/apic_internal.h @@ -80,7 +80,8 @@ typedef struct APICCommonClass { ICCDeviceClass parent_class; - void (*init)(APICCommonState *s); + /* QOM realize */ + DeviceRealize realize; void (*set_base)(APICCommonState *s, uint64_t val); void (*set_tpr)(APICCommonState *s, uint8_t val); uint8_t (*get_tpr)(APICCommonState *s);