From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MDySE-00027F-6A
	for qemu-devel@nongnu.org; Tue, 09 Jun 2009 06:21:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MDyS9-00026f-B9
	for qemu-devel@nongnu.org; Tue, 09 Jun 2009 06:21:17 -0400
Received: from [199.232.76.173] (port=37525 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MDyS9-00026c-3s
	for qemu-devel@nongnu.org; Tue, 09 Jun 2009 06:21:13 -0400
Received: from lizzard.sbs.de ([194.138.37.39]:23750)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <jan.kiszka@siemens.com>) id 1MDyS8-0002tH-JB
	for qemu-devel@nongnu.org; Tue, 09 Jun 2009 06:21:12 -0400
Message-ID: <4A2E3795.6020404@siemens.com>
Date: Tue, 09 Jun 2009 12:21:09 +0200
From: Jan Kiszka <jan.kiszka@siemens.com>
MIME-Version: 1.0
References: <1244538657-7878-1-git-send-email-gleb@redhat.com>
	<1244538657-7878-2-git-send-email-gleb@redhat.com>
In-Reply-To: <1244538657-7878-2-git-send-email-gleb@redhat.com>
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [PATCH 2/2] Don't register cpu reset handler for
	cpu with APIC.
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Gleb Natapov <gleb@redhat.com>
Cc: qemu-devel@nongnu.org

Gleb Natapov wrote:
> APIC reset handler already resets cpu. Also register cpu_reset handler
> directly to make it impossible to add additional code to main_cpu_reset()
> by mistake.
> 
> Signed-off-by: Gleb Natapov <gleb@redhat.com>
> ---
>  hw/pc.c |   10 +++-------
>  1 files changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/hw/pc.c b/hw/pc.c
> index d5b4112..5e7b115 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -751,12 +751,6 @@ static void load_linux(target_phys_addr_t option_rom,
>      generate_bootsect(option_rom, gpr, seg, 0);
>  }
>  
> -static void main_cpu_reset(void *opaque)
> -{
> -    CPUState *env = opaque;
> -    cpu_reset(env);
> -}
> -
>  static const int ide_iobase[2] = { 0x1f0, 0x170 };
>  static const int ide_iobase2[2] = { 0x3f6, 0x376 };
>  static const int ide_irq[2] = { 14, 15 };
> @@ -878,9 +872,11 @@ static void pc_init1(ram_addr_t ram_size,
>          }
>          if (i != 0)
>              env->halted = 1;
> -        qemu_register_reset(main_cpu_reset, 0, env);
>          if ((env->cpuid_features & CPUID_APIC) || smp_cpus > 1) {
>              apic_init(env);
> +        } else {
> +	    /* APIC reset callback resets cpu */

That comment should rather go into the previous block (and please remove
the tab).

> +            qemu_register_reset((QEMUResetHandler*)cpu_reset, 0, env);
>          }
>      }
>  

Looks fine to me otherwise. Will give these patches a try later today.

Jan

-- 
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux