target-i386: kvm: Set vcpu_id to APIC ID instead of CPU index
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 <ehabkost@redhat.com> Reviewed-by: Marcelo Tosatti <mtosatti@redhat.com> Acked-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
		
							parent
							
								
									b164e48ed1
								
							
						
					
					
						commit
						83b17af5e6
					
				| 
						 | 
					@ -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)
 | 
					int kvm_arch_init_vcpu(CPUState *cs)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue