From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPq0Q-0002eI-Lf for qemu-devel@nongnu.org; Wed, 10 Apr 2013 04:03:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UPq0P-0005Hh-Ht for qemu-devel@nongnu.org; Wed, 10 Apr 2013 04:03:46 -0400 Received: from [222.73.24.84] (port=47803 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPq0P-0005HI-3Z for qemu-devel@nongnu.org; Wed, 10 Apr 2013 04:03:45 -0400 From: liguang Date: Wed, 10 Apr 2013 16:02:28 +0800 Message-Id: <1365580949-32467-1-git-send-email-lig.fnst@cn.fujitsu.com> Subject: [Qemu-devel] [PATCH 1/2] target-i386: remove cpu reset callback List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: afaerber@suse.de, qemu-devel@nongnu.org Cc: liguang we should remove it now, if not, cpu reset will do 2 times. Signed-off-by: liguang --- target-i386/cpu.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 356378c..6e13053 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2024,13 +2024,6 @@ bool cpu_is_bsp(X86CPU *cpu) { return cpu_get_apic_base(cpu->env.apic_state) & MSR_IA32_APICBASE_BSP; } - -/* 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)); -} #endif static void mce_init(X86CPU *cpu) @@ -2140,8 +2133,6 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) } #ifndef CONFIG_USER_ONLY - qemu_register_reset(x86_cpu_machine_reset_cb, cpu); - if (cpu->env.cpuid_features & CPUID_APIC || smp_cpus > 1) { x86_cpu_apic_init(cpu, &local_err); if (local_err != NULL) { -- 1.7.2.5