From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MDfRg-0001eV-83
	for qemu-devel@nongnu.org; Mon, 08 Jun 2009 10:03:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MDfRb-0001Wv-8j
	for qemu-devel@nongnu.org; Mon, 08 Jun 2009 10:03:27 -0400
Received: from [199.232.76.173] (port=54137 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MDfRb-0001Wg-2P
	for qemu-devel@nongnu.org; Mon, 08 Jun 2009 10:03:23 -0400
Received: from gecko.sbs.de ([194.138.37.40]:22266)
	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 1MDfRa-0005Gy-CH
	for qemu-devel@nongnu.org; Mon, 08 Jun 2009 10:03:22 -0400
Message-ID: <4A2D1A27.4080504@siemens.com>
Date: Mon, 08 Jun 2009 16:03:19 +0200
From: Jan Kiszka <jan.kiszka@siemens.com>
MIME-Version: 1.0
References: <20090608125946.GF27210@redhat.com>
In-Reply-To: <20090608125946.GF27210@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [PATCH v2] Apic creation should not depend on pci
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:
>     
> It should depend on whether cpu has APIC.
> 
> Signed-off-by: Gleb Natapov <gleb@redhat.com>
> diff --git a/hw/pc.c b/hw/pc.c
> index 0934778..cb49772 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -878,14 +878,10 @@ static void pc_init1(ram_addr_t ram_size,
>          }
>          if (i != 0)
>              env->halted = 1;
> -        if (smp_cpus > 1) {
> -            /* XXX: enable it in all cases */
> -            env->cpuid_features |= CPUID_APIC;
> -        }
> -        qemu_register_reset(main_cpu_reset, 0, env);
> -        if (pci_enabled) {
> +        if ((env->cpuid_features & CPUID_APIC) || smp_cpus > 1) {

Obviously :), I'm fine with that change. Needs testing, though. What
scenarios did you already check?

>              apic_init(env);
>          }
> +        qemu_register_reset(main_cpu_reset, 0, env);

But this line silently reorders CPU and APIC reset handlers. If you did
it intentionally (I vaguely recall it may have some benefit /wrt KVM
synchronizing kernel and user space states), I would suggest pushing it
as a separate patch.

>      }
>  
>      vmport_init();
> --
> 			Gleb.
> 

Jan

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