From patchwork Fri Jul 11 09:59:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gu Zheng X-Patchwork-Id: 369111 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 424AD140085 for ; Fri, 11 Jul 2014 20:38:54 +1000 (EST) Received: from localhost ([::1]:43870 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5YE8-0005o5-Hk for incoming@patchwork.ozlabs.org; Fri, 11 Jul 2014 06:38:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55132) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5YDd-0005D5-Ti for qemu-devel@nongnu.org; Fri, 11 Jul 2014 06:38:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X5YDW-0001Tu-UA for qemu-devel@nongnu.org; Fri, 11 Jul 2014 06:38:21 -0400 Received: from fgwmail8.fujitsu.co.jp ([192.51.44.38]:48418) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5YDW-0001Tp-AZ for qemu-devel@nongnu.org; Fri, 11 Jul 2014 06:38:14 -0400 Received: from fgwmail6.fujitsu.co.jp (fgwmail6.fujitsu.co.jp [192.51.44.36]) by fgwmail8.fujitsu.co.jp (Postfix) with ESMTP id 984E017928C3 for ; Fri, 11 Jul 2014 19:16:08 +0900 (JST) Received: from kw-mxq.gw.nic.fujitsu.com (unknown [10.0.237.131]) by fgwmail6.fujitsu.co.jp (Postfix) with ESMTP id A62AE3EE0BB for ; Fri, 11 Jul 2014 19:16:07 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (s1.gw.nic.fujitsu.com [10.0.50.91]) by kw-mxq.gw.nic.fujitsu.com (Postfix) with ESMTP id E57EEAC0A86 for ; Fri, 11 Jul 2014 19:16:06 +0900 (JST) Received: from s00.gw.fujitsu.co.jp (s00.gw.nic.fujitsu.com [133.161.11.15]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id 9840E1DB8045 for ; Fri, 11 Jul 2014 19:16:06 +0900 (JST) Received: from s00.gw.fujitsu.co.jp (kw-mxio2.gw.nic.fujitsu.com [10.0.237.142]) by s00.gw.fujitsu.co.jp (Postfix) with ESMTP id 6ABDA4E235; Fri, 11 Jul 2014 19:16:06 +0900 (JST) Received: from guz (unknown [10.167.226.100]) by s00.gw.fujitsu.co.jp (Postfix) with ESMTP id 3D4EC8A001; Fri, 11 Jul 2014 19:16:06 +0900 (JST) Received: (from root@localhost) by guz (8.14.5/8.14.5/Submit) id s6BA2KES014472; Fri, 11 Jul 2014 18:02:20 +0800 From: Gu Zheng To: qemu-devel@nongnu.org Date: Fri, 11 Jul 2014 17:59:49 +0800 Message-Id: <1405072795-14342-2-git-send-email-guz.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1405072795-14342-1-git-send-email-guz.fnst@cn.fujitsu.com> References: <1405072795-14342-1-git-send-email-guz.fnst@cn.fujitsu.com> X-TM-AS-MML: disable X-TMASE-MatchedRID: RKkR8WK0E1pjIUwfLI+HssC2JPjUsXOaYtmTggNRdceWSyNgdonoDrhK Fzoc5Z4IkZ3T6ylBNAUBtjkcfRMmqWPlX7LITICtMfOzLbxP4ZW6hgVvSdGKo01KG1YrOQW/g7c fJQw9FsdnTpfNfjb/rGSLax1QSEcDtt90M/7M5GZhW/KqLK7NUDAuMzu3eJGjvDa284z78ydpxU er0hlMRssBdc34VbTIfup+TgcoS//Wv4yGaGcihQ2IdVM+s7+jWjWsWQUWzVpxnvWQpA54eqPFj JEFr+olwXCBO/GKkVqOhzOa6g8KremAqW9hHirllvH57T1nEk3ORxW9RwafOoT8C39WbOPMtOPc ILa4FKM= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 192.51.44.38 Cc: tangchen@cn.fujitsu.com, Gu Zheng , isimatu.yasuaki@jp.fujitsu.com, imammedo@redhat.com, Chen Fan , anshul.makkar@profitbricks.com, afaerber@suse.de Subject: [Qemu-devel] [RFC PATCH 1/7] 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 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 --- hw/i386/kvm/apic.c | 8 +++++++ hw/intc/apic.c | 10 ++++++++ hw/intc/apic_common.c | 23 +++++++++++++++++++- include/hw/cpu/icc_bus.h | 1 + include/hw/i386/apic_internal.h | 1 + target-i386/cpu-qom.h | 1 + target-i386/cpu.c | 44 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 87 insertions(+), 1 deletions(-) diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c index e873b50..593ca19 100644 --- a/hw/i386/kvm/apic.c +++ b/hw/i386/kvm/apic.c @@ -183,11 +183,19 @@ static void kvm_apic_realize(DeviceState *dev, Error **errp) } } +static void kvm_apic_unrealize(DeviceState *dev, Error **errp) +{ + APICCommonState *s = APIC_COMMON(dev); + + memory_region_destroy(&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->set_base = kvm_apic_set_base; k->set_tpr = kvm_apic_set_tpr; k->get_tpr = kvm_apic_get_tpr; diff --git a/hw/intc/apic.c b/hw/intc/apic.c index ef19e55..efdbf5b 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -885,11 +885,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); + + memory_region_destroy(&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 029f67d..8d17be1 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -289,12 +289,13 @@ static int apic_load_old(QEMUFile *f, void *opaque, int version_id) return 0; } +static int apic_no; + 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) { @@ -324,6 +325,25 @@ 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); + + if (apic_no <= 0) { + error_setg(errp, "%s exit failed.", + object_get_typename(OBJECT(dev))); + return; + } + apic_no--; + + info->unrealize(dev, errp); + + if (apic_report_tpr_access && info->enable_tpr_reporting) { + info->enable_tpr_reporting(s, false); + } +} + static void apic_dispatch_pre_save(void *opaque) { APICCommonState *s = APIC_COMMON(opaque); @@ -394,6 +414,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 98a979f..75ed309 100644 --- a/include/hw/cpu/icc_bus.h +++ b/include/hw/cpu/icc_bus.h @@ -67,6 +67,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 8a645cf..32fb354 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-qom.h b/target-i386/cpu-qom.h index 71a1b97..2239105 100644 --- a/target-i386/cpu-qom.h +++ b/target-i386/cpu-qom.h @@ -65,6 +65,7 @@ typedef struct X86CPUClass { bool kvm_required; DeviceRealize parent_realize; + DeviceUnrealize parent_unrealize; void (*parent_reset)(CPUState *cpu); } X86CPUClass; diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 881ff25..56043fa 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2715,10 +2715,31 @@ 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; + } + + 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 static void x86_cpu_realizefn(DeviceState *dev, Error **errp) @@ -2781,6 +2802,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; @@ -2960,7 +3002,9 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) DeviceClass *dc = DEVICE_CLASS(oc); xcc->parent_realize = dc->realize; + xcc->parent_unrealize = dc->unrealize; dc->realize = x86_cpu_realizefn; + dc->unrealize = x86_cpu_unrealizefn; dc->bus_type = TYPE_ICC_BUS; dc->props = x86_cpu_properties;