On Tue, Jan 22, 2013 at 06:25:02PM -0200, Eduardo Habkost wrote: > The CPU ID in KVM is supposed to be the APIC ID, so change the > KVM_CREATE_VCPU call to match it. The current behavior didn't break > anything yet because today the APIC ID is assumed to be equal to the CPU > index, but this won't be true in the future. > > Signed-off-by: Eduardo Habkost <[email protected]> > Reviewed-by: Marcelo Tosatti <[email protected]> Acked-by: Gleb Natapov <[email protected]>
> --- > Cc: [email protected] > Cc: Michael S. Tsirkin <[email protected]> > Cc: Gleb Natapov <[email protected]> > Cc: Marcelo Tosatti <[email protected]> > > Changes v2: > - Change only i386 code (kvm_arch_vcpu_id()) > > Changes v3: > - Get CPUState as argument instead of CPUArchState > --- > target-i386/kvm.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/target-i386/kvm.c b/target-i386/kvm.c > index 5f3f789..c440809 100644 > --- a/target-i386/kvm.c > +++ b/target-i386/kvm.c > @@ -411,9 +411,10 @@ static void cpu_update_state(void *opaque, int running, > RunState state) > } > } > > -unsigned long kvm_arch_vcpu_id(CPUState *cpu) > +unsigned long kvm_arch_vcpu_id(CPUState *cs) > { > - return cpu->cpu_index; > + X86CPU *cpu = X86_CPU(cs); > + return cpu->env.cpuid_apic_id; > } > > int kvm_arch_init_vcpu(CPUState *cs) > -- > 1.8.1 -- Gleb.
