[Qemu-devel] Re: [PATCH 2/4] move CPUID_APIC flag to where it belongs

[Jan Kiszka]

Glauber Costa wrote:
> We can safely do that inconditionally, so move to processor defined
> flags like any other flag.
> 
> Signed-off-by: Glauber Costa <address@hidden>
> ---
>  hw/pc.c              |    4 ----
>  target-i386/helper.c |    2 +-
>  2 files changed, 1 insertions(+), 5 deletions(-)
> 
> diff --git a/hw/pc.c b/hw/pc.c
> index 351de83..b726c17 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -851,10 +851,6 @@ static void pc_init1(ram_addr_t ram_size, int 
> vga_ram_size,
>          }
>          if (i != 0)
>              env->halted = 1;
> -        if (smp_cpus > 1) {
> -            /* XXX: enable it in all cases */
> -            env->cpuid_features |= CPUID_APIC;
> -        }
>          if (pci_enabled) {
>              apic_init(env);
>          }
> diff --git a/target-i386/helper.c b/target-i386/helper.c
> index 2210412..2c11cd3 100644
> --- a/target-i386/helper.c
> +++ b/target-i386/helper.c
> @@ -102,7 +102,7 @@ typedef struct x86_def_t {
>      char model_id[48];
>  } x86_def_t;
>  
> -#define I486_FEATURES (CPUID_FP87 | CPUID_VME | CPUID_PSE)
> +#define I486_FEATURES (CPUID_FP87 | CPUID_VME | CPUID_PSE | CPUID_APIC)

Without doing my homework:
What impact will it have on an emulated CPUs without [L]APIC? I'm
thinking of -M isapc e.g.

Jan

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