[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 05/12] target-i386: kvm: Set vcpu_id to APIC ID instea
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [RFC 05/12] target-i386: kvm: Set vcpu_id to APIC ID instead of CPU index |
Date: |
Wed, 9 Jan 2013 16:53:45 -0200 |
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 <address@hidden>
---
Cc: address@hidden
Cc: Michael S. Tsirkin <address@hidden>
Cc: Gleb Natapov <address@hidden>
Cc: Marcelo Tosatti <address@hidden>
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.7.11.7
- [Qemu-devel] [RFC 00/12] target-i386: Fix APIC-ID-based topology (v4), Eduardo Habkost, 2013/01/09
- [Qemu-devel] [RFC 01/12] kvm: add KVM_FEATURE_CLOCKSOURCE_STABLE_BIT fake #define, Eduardo Habkost, 2013/01/09
- [Qemu-devel] [RFC 05/12] target-i386: kvm: Set vcpu_id to APIC ID instead of CPU index,
Eduardo Habkost <=
- [Qemu-devel] [RFC 08/12] cpus.h: Make constant smp_cores/smp_threads available on *-user, Eduardo Habkost, 2013/01/09
- [Qemu-devel] [RFC 03/12] pc: Reverse pc_init_pci() compatibility logic, Eduardo Habkost, 2013/01/09
- [Qemu-devel] [RFC 06/12] fw_cfg: Remove FW_CFG_MAX_CPUS from fw_cfg_init(), Eduardo Habkost, 2013/01/09
- [Qemu-devel] [RFC 09/12] pc: Set fw_cfg data based on APIC ID calculation, Eduardo Habkost, 2013/01/09
- [Qemu-devel] [RFC 12/12] pc: Generate APIC IDs according to CPU topology, Eduardo Habkost, 2013/01/09
- [Qemu-devel] [RFC 04/12] kvm: Create kvm_arch_vcpu_id() function, Eduardo Habkost, 2013/01/09
- [Qemu-devel] [RFC 07/12] target-i386/cpu: Introduce apic_id_for_cpu() function, Eduardo Habkost, 2013/01/09