From patchwork Mon Apr 16 23:37:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 153007 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CDE9DB7000 for ; Tue, 17 Apr 2012 09:37:38 +1000 (EST) Received: from localhost ([::1]:60530 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SJvUG-0002Ki-KD for incoming@patchwork.ozlabs.org; Mon, 16 Apr 2012 19:37:36 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50213) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SJvTy-00023t-Ca for qemu-devel@nongnu.org; Mon, 16 Apr 2012 19:37:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SJvTv-0008Ix-Ct for qemu-devel@nongnu.org; Mon, 16 Apr 2012 19:37:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64187) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SJvTv-0008IB-5f for qemu-devel@nongnu.org; Mon, 16 Apr 2012 19:37:15 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q3GNbDtR022734 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 16 Apr 2012 19:37:13 -0400 Received: from nial.brq.redhat.com (dhcp-1-247.brq.redhat.com [10.34.1.247]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q3GNb3CQ024642; Mon, 16 Apr 2012 19:37:12 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Tue, 17 Apr 2012 01:37:02 +0200 Message-Id: <1334619423-13012-6-git-send-email-imammedo@redhat.com> In-Reply-To: <1334619423-13012-1-git-send-email-imammedo@redhat.com> References: <1334619423-13012-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, aliguori@us.ibm.com, afaerber@suse.de, jan.kiszka@siemens.com Subject: [Qemu-devel] [PATCH RFC 5/6] target-i386: move reset callback to cpu.c 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: Igor Mammedov Signed-off-by: Igor Mammedov --- hw/pc.c | 8 -------- target-i386/cpu.c | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index db381ab..157327a 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -887,13 +887,6 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level) } } -static void pc_cpu_reset(void *opaque) -{ - CPUX86State *env = opaque; - - cpu_state_reset(env); -} - void pc_cpus_init(const char *cpu_model) { CPUX86State *env; @@ -904,7 +897,6 @@ void pc_cpus_init(const char *cpu_model) if (!env) { exit(1); } - qemu_register_reset(pc_cpu_reset, env); } } diff --git a/target-i386/cpu.c b/target-i386/cpu.c index e4dcf52..d92ec58 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1456,6 +1456,13 @@ static void x86_cpu_reset(CPUState *s) env->halted = !(cpu_get_apic_base(env->apic_state) & MSR_IA32_APICBASE_BSP); } +static void pc_cpu_reset(void *opaque) +{ + CPUX86State *env = opaque; + + cpu_reset(ENV_GET_CPU(env)); +} + static void mce_init(X86CPU *cpu) { CPUX86State *cenv = &cpu->env; @@ -1574,6 +1581,7 @@ static void x86_cpu_realize(Object *obj, Error **errp) CPUX86State *env = &cpu->env; qemu_init_vcpu(env); + qemu_register_reset(pc_cpu_reset, env); cpu_reset(CPU(cpu)); }