From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60900) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKgDU-0006hQ-FO for qemu-devel@nongnu.org; Wed, 06 Jul 2016 02:21:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKgDT-0004Sm-7i for qemu-devel@nongnu.org; Wed, 06 Jul 2016 02:21:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45736) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKgDS-0004Sd-Vv for qemu-devel@nongnu.org; Wed, 06 Jul 2016 02:21:47 -0400 From: Igor Mammedov Date: Wed, 6 Jul 2016 08:20:50 +0200 Message-Id: <1467786055-85835-15-git-send-email-imammedo@redhat.com> In-Reply-To: <1467786055-85835-1-git-send-email-imammedo@redhat.com> References: <1467786055-85835-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH v3 14/19] (kvm)apic: add unrealize callbacks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 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); -- 2.7.0