[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 06/11] apic: use emulated lapic version 0x14 on pc
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 06/11] apic: use emulated lapic version 0x14 on pc machines >= 2.1 |
Date: |
Wed, 7 May 2014 19:17:08 +0300 |
From: "Gabriel L. Somlo" <address@hidden>
Add "version" property to local apic, and have it default to
0x14 for pc machines starting at 2.1. For compatibility with
previous releases, pc machines up to 2.0 will have their local
apic version set to 0x11.
Signed-off-by: Gabriel L. Somlo <address@hidden>
Acked-by: Alexander Graf <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/i386/apic_internal.h | 1 +
include/hw/i386/pc.h | 3 +++
hw/intc/apic.c | 2 +-
hw/intc/apic_common.c | 1 +
4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h
index 70542a6..83e2a42 100644
--- a/include/hw/i386/apic_internal.h
+++ b/include/hw/i386/apic_internal.h
@@ -98,6 +98,7 @@ struct APICCommonState {
X86CPU *cpu;
uint32_t apicbase;
uint8_t id;
+ uint8_t version;
uint8_t arb_id;
uint8_t tpr;
uint32_t spurious_vec;
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 0ade0f1..32a7687 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -268,6 +268,9 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
#define PC_COMPAT_2_0 \
{\
+ .driver = "apic",\
+ .property = "version",\
+ .value = stringify(0x11),\
}
#define PC_COMPAT_1_7 \
diff --git a/hw/intc/apic.c b/hw/intc/apic.c
index 2f40cba..ef19e55 100644
--- a/hw/intc/apic.c
+++ b/hw/intc/apic.c
@@ -675,7 +675,7 @@ static uint32_t apic_mem_readl(void *opaque, hwaddr addr)
val = s->id << 24;
break;
case 0x03: /* version */
- val = 0x11 | ((APIC_LVT_NB - 1) << 16); /* version 0x11 */
+ val = s->version | ((APIC_LVT_NB - 1) << 16);
break;
case 0x08:
apic_sync_vapic(s, SYNC_FROM_VAPIC);
diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
index 7ecce2d..7137653 100644
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@@ -380,6 +380,7 @@ static const VMStateDescription vmstate_apic_common = {
static Property apic_properties_common[] = {
DEFINE_PROP_UINT8("id", APICCommonState, id, -1),
+ DEFINE_PROP_UINT8("version", APICCommonState, version, 0x14),
DEFINE_PROP_BIT("vapic", APICCommonState, vapic_control, VAPIC_ENABLE_BIT,
true),
DEFINE_PROP_END_OF_LIST(),
--
MST
- [Qemu-devel] [PULL v2 00/11] pc,net,MAINTAINERS,build updates, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL v2 01/11] acpi/pcihp.c: Rewrite acpi_pcihp_get_bsel using object_property_get_int, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL v2 02/11] acpi-build: properly decrement objects' reference counters, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL v2 03/11] acpi: fix tables for no-hpet configuration, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL v2 05/11] pc: add compat_props placeholder for 2.0 machine type, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL v2 04/11] i8259: don't abort when trying to use level sensitive irqs, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL v2 07/11] smbus: allow returning an error from reads, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL v2 06/11] apic: use emulated lapic version 0x14 on pc machines >= 2.1,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 08/11] smbus: return -1 if nothing found at the given address, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL v2 09/11] pm_smbus: correctly report unclaimed cycles, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL v2 10/11] MAINTAINERS: addresses for responsible disclosure, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL v2 11/11] configure: make source tree build more robust, Michael S. Tsirkin, 2014/05/07
- Re: [Qemu-devel] [PULL v2 00/11] pc,net,MAINTAINERS,build updates, Peter Maydell, 2014/05/07