summaryrefslogtreecommitdiff
path: root/hw/intc/apic.c
diff options
context:
space:
mode:
authorGabriel L. Somlo <gsomlo@gmail.com>2014-05-05 10:52:51 -0400
committerMichael S. Tsirkin <mst@redhat.com>2014-05-07 18:36:37 +0300
commitaa93200b88fb1071eaf21bf766711762ed4630e2 (patch)
treea7963bbfbb776768ac2616950b1839b7becaf7fe /hw/intc/apic.c
parent9df11c9f086e8329cdc06a67314ddce886841a5b (diff)
downloadqemu-aa93200b88fb1071eaf21bf766711762ed4630e2.tar.gz
apic: use emulated lapic version 0x14 on pc machines >= 2.1
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 <somlo@cmu.edu> Acked-by: Alexander Graf <agraf@suse.de> Reviewed-by: Andreas Färber <afaerber@suse.de> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/intc/apic.c')
-rw-r--r--hw/intc/apic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/intc/apic.c b/hw/intc/apic.c
index 2f40cbad2d..ef19e5515c 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);