From patchwork Wed Jan 14 07:44:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Guihua X-Patchwork-Id: 428820 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9D3641400EA for ; Wed, 14 Jan 2015 18:48:52 +1100 (AEDT) Received: from localhost ([::1]:43099 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBIh8-0001Mq-RF for incoming@patchwork.ozlabs.org; Wed, 14 Jan 2015 02:48:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53608) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBIer-0005sZ-1e for qemu-devel@nongnu.org; Wed, 14 Jan 2015 02:46:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YBIem-0003xT-Dq for qemu-devel@nongnu.org; Wed, 14 Jan 2015 02:46:28 -0500 Received: from [59.151.112.132] (port=14245 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBIel-0003w8-Gf for qemu-devel@nongnu.org; Wed, 14 Jan 2015 02:46:24 -0500 X-IronPort-AV: E=Sophos;i="5.04,848,1406563200"; d="scan'208";a="56036172" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 14 Jan 2015 15:42:54 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t0E7jjAK020518; Wed, 14 Jan 2015 15:45:45 +0800 Received: from G08FNSTD140041.g08.fujitsu.local (10.167.226.252) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Wed, 14 Jan 2015 15:46:25 +0800 From: Zhu Guihua To: Date: Wed, 14 Jan 2015 15:44:54 +0800 Message-ID: X-Mailer: git-send-email 1.9.3 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.167.226.252] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: Zhu Guihua , tangchen@cn.fujitsu.com, guz.fnst@cn.fujitsu.com, isimatu.yasuaki@jp.fujitsu.com, anshul.makkar@profitbricks.com, chen.fan.fnst@cn.fujitsu.com, imammedo@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH v2 01/11] x86: add x86_cpu_unrealizefn() for cpu apic remove 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 From: Chen Fan Implement x86_cpu_unrealizefn() for corresponding x86_cpu_realizefn(), which is mostly used to clean the apic related allocation and vmstates at here. Signed-off-by: Chen Fan Signed-off-by: Gu Zheng Signed-off-by: Zhu Guihua --- hw/cpu/icc_bus.c | 11 ++++++++++ hw/i386/kvm/apic.c | 8 +++++++ hw/intc/apic.c | 10 +++++++++ hw/intc/apic_common.c | 21 ++++++++++++------- include/hw/cpu/icc_bus.h | 1 + include/hw/i386/apic_internal.h | 1 + target-i386/cpu.c | 46 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 90 insertions(+), 8 deletions(-) diff --git a/hw/cpu/icc_bus.c b/hw/cpu/icc_bus.c index f455a20..3e7f62f 100644 --- a/hw/cpu/icc_bus.c +++ b/hw/cpu/icc_bus.c @@ -44,11 +44,22 @@ static void icc_device_realize(DeviceState *dev, Error **errp) } +static void icc_device_unrealize(DeviceState *dev, Error **errp) +{ + ICCDeviceClass *idc = ICC_DEVICE_GET_CLASS(dev); + + /* convert to QOM */ + if (idc->unrealize) { + idc->unrealize(dev, errp); + } +} + static void icc_device_class_init(ObjectClass *oc, void *data) { DeviceClass *dc = DEVICE_CLASS(oc); dc->realize = icc_device_realize; + dc->unrealize = icc_device_unrealize; dc->bus_type = TYPE_ICC_BUS; } diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c index 5b47056..781c296 100644 --- a/hw/i386/kvm/apic.c +++ b/hw/i386/kvm/apic.c @@ -189,11 +189,19 @@ static void kvm_apic_realize(DeviceState *dev, Error **errp) } } +static void kvm_apic_unrealize(DeviceState *dev, Error **errp) +{ + APICCommonState *s = APIC_COMMON(dev); + + object_unparent(OBJECT(&s->io_memory)); +} + static void kvm_apic_class_init(ObjectClass *klass, void *data) { APICCommonClass *k = APIC_COMMON_CLASS(klass); k->realize = kvm_apic_realize; + k->unrealize = kvm_apic_unrealize; k->reset = kvm_apic_reset; k->set_base = kvm_apic_set_base; k->set_tpr = kvm_apic_set_tpr; diff --git a/hw/intc/apic.c b/hw/intc/apic.c index 0f97b47..2f3a7a3 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -889,11 +889,21 @@ static void apic_realize(DeviceState *dev, Error **errp) msi_supported = true; } +static void apic_unrealize(DeviceState *dev, Error **errp) +{ + APICCommonState *s = APIC_COMMON(dev); + + object_unparent(OBJECT(&s->io_memory)); + timer_free(s->timer); + local_apics[s->idx] = NULL; +} + static void apic_class_init(ObjectClass *klass, void *data) { APICCommonClass *k = APIC_COMMON_CLASS(klass); k->realize = apic_realize; + k->unrealize = apic_unrealize; k->set_base = apic_set_base; k->set_tpr = apic_set_tpr; k->get_tpr = apic_get_tpr; diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 719f74d..912ba64 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -299,16 +299,8 @@ static void apic_common_realize(DeviceState *dev, Error **errp) APICCommonState *s = APIC_COMMON(dev); APICCommonClass *info; static DeviceState *vapic; - static int apic_no; static bool mmio_registered; - if (apic_no >= MAX_APICS) { - error_setg(errp, "%s initialization failed.", - object_get_typename(OBJECT(dev))); - return; - } - s->idx = apic_no++; - info = APIC_COMMON_GET_CLASS(s); info->realize(dev, errp); if (!mmio_registered) { @@ -329,6 +321,18 @@ static void apic_common_realize(DeviceState *dev, Error **errp) } +static void apic_common_unrealize(DeviceState *dev, Error **errp) +{ + APICCommonState *s = APIC_COMMON(dev); + APICCommonClass *info = APIC_COMMON_GET_CLASS(s); + + info->unrealize(dev, errp); + + if (apic_report_tpr_access && info->enable_tpr_reporting) { + info->enable_tpr_reporting(s, false); + } +} + static int apic_pre_load(void *opaque) { APICCommonState *s = APIC_COMMON(opaque); @@ -437,6 +441,7 @@ static void apic_common_class_init(ObjectClass *klass, void *data) dc->reset = apic_reset_common; dc->props = apic_properties_common; idc->realize = apic_common_realize; + idc->unrealize = apic_common_unrealize; /* * Reason: APIC and CPU need to be wired up by * x86_cpu_apic_create() diff --git a/include/hw/cpu/icc_bus.h b/include/hw/cpu/icc_bus.h index 7e53afb..0b2ddd5 100644 --- a/include/hw/cpu/icc_bus.h +++ b/include/hw/cpu/icc_bus.h @@ -69,6 +69,7 @@ typedef struct ICCDeviceClass { /*< public >*/ DeviceRealize realize; + DeviceUnrealize unrealize; } ICCDeviceClass; #define TYPE_ICC_DEVICE "icc-device" diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h index 00d29e2..b46a3af 100644 --- a/include/hw/i386/apic_internal.h +++ b/include/hw/i386/apic_internal.h @@ -82,6 +82,7 @@ typedef struct APICCommonClass ICCDeviceClass parent_class; DeviceRealize realize; + DeviceUnrealize unrealize; void (*set_base)(APICCommonState *s, uint64_t val); void (*set_tpr)(APICCommonState *s, uint8_t val); uint8_t (*get_tpr)(APICCommonState *s); diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 4746814..ca0c1f6 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2786,6 +2786,8 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error **errp) qdev_prop_set_uint8(cpu->apic_state, "id", apic_id); /* TODO: convert to link<> */ apic = APIC_COMMON(cpu->apic_state); + g_assert(apic_id < MAX_APICS); + apic->idx = apic_id; apic->cpu = cpu; } @@ -2807,10 +2809,32 @@ static void x86_cpu_apic_realize(X86CPU *cpu, Error **errp) return; } } + +static void x86_cpu_apic_unrealize(X86CPU *cpu, Error **errp) +{ + Error *local_err = NULL; + + if (cpu->apic_state == NULL) { + return; + } + + object_property_set_bool(OBJECT(cpu->apic_state), + false, "realized", &local_err); + if (local_err != NULL) { + error_propagate(errp, local_err); + return; + } + + vmstate_unregister(NULL, &vmstate_apic_common, cpu->apic_state); + object_unparent(OBJECT(cpu->apic_state)); +} #else static void x86_cpu_apic_realize(X86CPU *cpu, Error **errp) { } +static void x86_cpu_apic_unrealize(X86CPU *cpu, Error **errp) +{ +} #endif @@ -2893,6 +2917,27 @@ out: } } +static void x86_cpu_unrealizefn(DeviceState *dev, Error **errp) +{ + X86CPU *cpu = X86_CPU(dev); + CPUClass *cc = CPU_GET_CLASS(dev); + Error *local_err = NULL; + + if (qdev_get_vmsd(DEVICE(cpu)) == NULL) { + vmstate_unregister(NULL, &vmstate_cpu_common, cpu); + } + + if (cc->vmsd != NULL) { + vmstate_unregister(NULL, cc->vmsd, cpu); + } + + x86_cpu_apic_unrealize(cpu, &local_err); + if (local_err != NULL) { + error_propagate(errp, local_err); + return; + } +} + /* Enables contiguous-apic-ID mode, for compatibility */ static bool compat_apic_id_mode; @@ -3059,6 +3104,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) xcc->parent_realize = dc->realize; dc->realize = x86_cpu_realizefn; + dc->unrealize = x86_cpu_unrealizefn; dc->bus_type = TYPE_ICC_BUS; dc->props = x86_cpu_properties;