From patchwork Fri Jun 24 16:06:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 640323 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 3rbkf926MJz9t0r for ; Sat, 25 Jun 2016 02:42:57 +1000 (AEST) Received: from localhost ([::1]:44933 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGUBz-0003dl-88 for incoming@patchwork.ozlabs.org; Fri, 24 Jun 2016 12:42:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34707) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGTd4-00049b-58 for qemu-devel@nongnu.org; Fri, 24 Jun 2016 12:06:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bGTcz-0000iH-0Z for qemu-devel@nongnu.org; Fri, 24 Jun 2016 12:06:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37874) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGTcy-0000iB-PX for qemu-devel@nongnu.org; Fri, 24 Jun 2016 12:06:44 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 722C964080; Fri, 24 Jun 2016 16:06:44 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.34.112.60]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5OG68xd021983; Fri, 24 Jun 2016 12:06:42 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Fri, 24 Jun 2016 18:06:02 +0200 Message-Id: <1466784366-281935-15-git-send-email-imammedo@redhat.com> In-Reply-To: <1466784366-281935-1-git-send-email-imammedo@redhat.com> References: <1466784366-281935-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 24 Jun 2016 16:06:44 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 14/18] (kvm)apic: add unrealize callbacks X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pkrempa@redhat.com, ehabkost@redhat.com, mst@redhat.com, armbru@redhat.com, eduardo.otubo@profitbricks.com, marcel@redhat.com, pbonzini@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" callbacks will do necessary cleanups before APIC device is deleted Signed-off-by: Chen Fan Signed-off-by: Gu Zheng Signed-off-by: Zhu Guihua Signed-off-by: Igor Mammedov --- hw/i386/kvm/apic.c | 5 +++++ hw/intc/apic.c | 10 ++++++++++ hw/intc/apic_common.c | 13 +++++++++++++ include/hw/i386/apic_internal.h | 1 + 4 files changed, 29 insertions(+) diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c index c5983c7..6cde5f1 100644 --- a/hw/i386/kvm/apic.c +++ b/hw/i386/kvm/apic.c @@ -192,11 +192,16 @@ static void kvm_apic_realize(DeviceState *dev, Error **errp) } } +static void kvm_apic_unrealize(DeviceState *dev, Error **errp) +{ +} + 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 f473572..45887d9 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -887,11 +887,21 @@ static void apic_realize(DeviceState *dev, Error **errp) msi_nonbroken = true; } +static void apic_unrealize(DeviceState *dev, Error **errp) +{ + APICCommonState *s = APIC_COMMON(dev); + + timer_del(s->timer); + timer_free(s->timer); + local_apics[s->id] = 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 fd425d1..0bb9ad5 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -315,6 +315,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); @@ -421,6 +433,7 @@ static void apic_common_class_init(ObjectClass *klass, void *data) dc->reset = apic_reset_common; dc->props = apic_properties_common; dc->realize = apic_common_realize; + dc->unrealize = apic_common_unrealize; /* * Reason: APIC and CPU need to be wired up by * x86_cpu_apic_create() diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h index e5d1550..52ca45d 100644 --- a/include/hw/i386/apic_internal.h +++ b/include/hw/i386/apic_internal.h @@ -135,6 +135,7 @@ typedef struct APICCommonClass DeviceClass 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);