[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 09/14] pc: kvm_apic: pass APIC ID depending on x
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH RFC 09/14] pc: kvm_apic: pass APIC ID depending on xAPIC/x2APIC mode |
Date: |
Mon, 9 May 2016 11:26:55 +0200 |
Signed-off-by: Igor Mammedov <address@hidden>
---
hw/i386/kvm/apic.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c
index 3c7c8fa..c6891b8 100644
--- a/hw/i386/kvm/apic.c
+++ b/hw/i386/kvm/apic.c
@@ -32,7 +32,11 @@ void kvm_put_apic_state(DeviceState *dev, struct
kvm_lapic_state *kapic)
int i;
memset(kapic, 0, sizeof(*kapic));
- kvm_apic_set_reg(kapic, 0x2, s->id << 24);
+ if (s->apicbase & MSR_IA32_APICBASE_EXTD) {
+ kvm_apic_set_reg(kapic, 0x2, cpu_to_be32(s->initial_apic_id));
+ } else {
+ kvm_apic_set_reg(kapic, 0x2, s->id << 24);
+ }
kvm_apic_set_reg(kapic, 0x8, s->tpr);
kvm_apic_set_reg(kapic, 0xd, s->log_dest << 24);
kvm_apic_set_reg(kapic, 0xe, s->dest_mode << 28 | 0x0fffffff);
@@ -57,7 +61,11 @@ void kvm_get_apic_state(DeviceState *dev, struct
kvm_lapic_state *kapic)
APICCommonState *s = APIC_COMMON(dev);
int i, v;
- s->id = kvm_apic_get_reg(kapic, 0x2) >> 24;
+ if (s->apicbase & MSR_IA32_APICBASE_EXTD) {
+ assert(be32_to_cpu(kvm_apic_get_reg(kapic, 0x2)) ==
s->initial_apic_id);
+ } else {
+ s->id = kvm_apic_get_reg(kapic, 0x2) >> 24;
+ }
s->tpr = kvm_apic_get_reg(kapic, 0x8);
s->arb_id = kvm_apic_get_reg(kapic, 0x9);
s->log_dest = kvm_apic_get_reg(kapic, 0xd) >> 24;
--
1.8.3.1
- [Qemu-devel] [PATCH RFC 00/14]pc: q35: x2APIC support in kvm_apic mode, Igor Mammedov, 2016/05/09
- [Qemu-devel] [PATCH RFC 01/14] pc: acpi: x2APIC support for MADT table, Igor Mammedov, 2016/05/09
- [Qemu-devel] [PATCH RFC 02/14] pc: acpi: x2APIC support for SRAT table, Igor Mammedov, 2016/05/09
- [Qemu-devel] [PATCH RFC 04/14] pc: leave max apic_id_limit only in legacy cpu hotplug code, Igor Mammedov, 2016/05/09
- [Qemu-devel] [PATCH RFC 03/14] acpi: cphp: add support for x2APIC in _MAT method, Igor Mammedov, 2016/05/09
- [Qemu-devel] [PATCH RFC 05/14] pc: apic: move MAX_APICS check to 'apic' class, Igor Mammedov, 2016/05/09
- [Qemu-devel] [PATCH RFC 06/14] pc: apic_common: extend APIC ID property to 32bit, Igor Mammedov, 2016/05/09
- [Qemu-devel] [PATCH RFC 08/14] pc: apic_common: reset APIC ID to initial ID when switching into x2APIC mode, Igor Mammedov, 2016/05/09
- [Qemu-devel] [PATCH RFC 09/14] pc: kvm_apic: pass APIC ID depending on xAPIC/x2APIC mode,
Igor Mammedov <=
- [Qemu-devel] [PATCH RFC 10/14] pc: clarify FW_CFG_MAX_CPUS usage comment, Igor Mammedov, 2016/05/09
- [Qemu-devel] [PATCH RFC 11/14] increase MAX_CPUMASK_BITS from 255 to 288, Igor Mammedov, 2016/05/09
- [Qemu-devel] [PATCH RFC 07/14] pc: apic_common: restore APIC ID to initial ID on reset, Igor Mammedov, 2016/05/09
- [Qemu-devel] [PATCH RFC 12/14] pc: add 'etc/boot-cpus' fw_cfg file for machine with more than 255 CPUs, Igor Mammedov, 2016/05/09
- [Qemu-devel] [PATCH RFC 13/14] pc: q35: bump max_cpus to 288, Igor Mammedov, 2016/05/09
- [Qemu-devel] [PATCH RFC 14/14] DO NOT APPLY: hack to make 2nd CPU APIC ID to be x2APIC one, Igor Mammedov, 2016/05/09