From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49531) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXEbj-0002at-A7 for qemu-devel@nongnu.org; Wed, 23 May 2012 12:40:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SXEbd-0008Ly-Iu for qemu-devel@nongnu.org; Wed, 23 May 2012 12:40:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10670) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXEbd-0008LJ-AE for qemu-devel@nongnu.org; Wed, 23 May 2012 12:40:13 -0400 From: Igor Mammedov Date: Wed, 23 May 2012 18:39:41 +0200 Message-Id: <1337791181-27446-7-git-send-email-imammedo@redhat.com> In-Reply-To: <1337791181-27446-1-git-send-email-imammedo@redhat.com> References: <1337791181-27446-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH qom-next 6/6] target-i386: move reset callback to cpu.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, wei.liu2@citrix.com, ehabkost@redhat.com, stefano.stabellini@eu.citrix.com, sw@weilnetz.de, mtosatti@redhat.com, agraf@suse.de, blauwirbel@gmail.com, avi@redhat.com, jan.kiszka@siemens.com, anthony.perard@citrix.com, pbonzini@redhat.com, afaerber@suse.de Moving reset callback into cpu object from board level will allow properly create object during run-time (hotplug). When reset over QOM hierarchy is implemented, this reset callback should be removed. v2: - fix build for i386-linux-target Signed-off-by: Igor Mammedov --- hw/pc.c | 7 ------- target-i386/cpu.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index d7845ea..868dbe7 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -885,12 +885,6 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level) } } -static void pc_cpu_reset(void *opaque) -{ - X86CPU *cpu = opaque; - cpu_reset(CPU(cpu)); -} - void pc_cpus_init(const char *cpu_model) { X86CPU *cpu; @@ -901,7 +895,6 @@ void pc_cpus_init(const char *cpu_model) if (cpu == NULL) { exit(1); } - qemu_register_reset(pc_cpu_reset, cpu); } } diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 99ef891..ad39f71 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1775,6 +1775,13 @@ static void x86_set_cpu_model(Object *obj, const char *value, Error **errp) } #ifndef CONFIG_USER_ONLY +/* TODO: remove me, when reset over QOM tree is implemented */ +static void x86_cpu_machine_reset_cb(void *opaque) +{ + X86CPU *cpu = opaque; + cpu_reset(CPU(cpu)); +} + static CPUDebugExcpHandler *prev_debug_excp_handler; static void breakpoint_handler(CPUX86State *env) @@ -1823,6 +1830,10 @@ void x86_cpu_realize(Object *obj, Error **errp) mce_init(cpu); qemu_init_vcpu(env); + +#ifndef CONFIG_USER_ONLY + qemu_register_reset(x86_cpu_machine_reset_cb, cpu); +#endif cpu_reset(CPU(cpu)); } -- 1.7.7.6