From patchwork Mon Jan 7 16:14:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [s390-next] target-s390x: Unregister reset callback on finalization From: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 209970 Message-Id: <1357575256-29700-1-git-send-email-afaerber@suse.de> To: qemu-devel@nongnu.org Cc: Jens Freimann , agraf@suse.de, =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 7 Jan 2013 17:14:16 +0100 Since commit "s390: Add CPU reset handler" the CPU's instance_init registers a reset callback. Unregister that on instance_finalize. Signed-off-by: Andreas Färber Cc: Jens Freimann --- target-s390x/cpu.c | 10 ++++++++++ 1 Datei geändert, 10 Zeilen hinzugefügt(+) diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index fcd195c..cdb2439 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -126,6 +126,15 @@ static void s390_cpu_initfn(Object *obj) cpu_reset(CPU(cpu)); } +static void s390_cpu_finalize(Object *obj) +{ +#if !defined(CONFIG_USER_ONLY) + S390CPU *cpu = S390_CPU(obj); + + qemu_unregister_reset(s390_cpu_machine_reset_cb, cpu); +#endif +} + static void s390_cpu_class_init(ObjectClass *oc, void *data) { S390CPUClass *scc = S390_CPU_CLASS(oc); @@ -140,6 +149,7 @@ static const TypeInfo s390_cpu_type_info = { .parent = TYPE_CPU, .instance_size = sizeof(S390CPU), .instance_init = s390_cpu_initfn, + .instance_finalize = s390_cpu_finalize, .abstract = false, .class_size = sizeof(S390CPUClass), .class_init = s390_cpu_class_init,