[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [7048] apic: Fix access to non-existent APIC
From: |
Aurelien Jarno |
Subject: |
[Qemu-devel] [7048] apic: Fix access to non-existent APIC |
Date: |
Wed, 08 Apr 2009 22:56:26 +0000 |
Revision: 7048
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7048
Author: aurel32
Date: 2009-04-08 22:56:26 +0000 (Wed, 08 Apr 2009)
Log Message:
-----------
apic: Fix access to non-existent APIC
When running with -M isapc, there is no env->apic_state. Fix
cpu_get/set_apic_* helpers to handle this corner case gracefully.
Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>
Modified Paths:
--------------
trunk/hw/apic.c
Modified: trunk/hw/apic.c
===================================================================
--- trunk/hw/apic.c 2009-04-08 22:56:19 UTC (rev 7047)
+++ trunk/hw/apic.c 2009-04-08 22:56:26 UTC (rev 7048)
@@ -280,6 +280,8 @@
#ifdef DEBUG_APIC
printf("cpu_set_apic_base: %016" PRIx64 "\n", val);
#endif
+ if (!s)
+ return;
s->apicbase = (val & 0xfffff000) |
(s->apicbase & (MSR_IA32_APICBASE_BSP | MSR_IA32_APICBASE_ENABLE));
/* if disabled, cannot be enabled again */
@@ -294,14 +296,17 @@
{
APICState *s = env->apic_state;
#ifdef DEBUG_APIC
- printf("cpu_get_apic_base: %016" PRIx64 "\n", (uint64_t)s->apicbase);
+ printf("cpu_get_apic_base: %016" PRIx64 "\n",
+ s ? (uint64_t)s->apicbase: 0);
#endif
- return s->apicbase;
+ return s ? s->apicbase : 0;
}
void cpu_set_apic_tpr(CPUX86State *env, uint8_t val)
{
APICState *s = env->apic_state;
+ if (!s)
+ return;
s->tpr = (val & 0x0f) << 4;
apic_update_irq(s);
}
@@ -309,7 +314,7 @@
uint8_t cpu_get_apic_tpr(CPUX86State *env)
{
APICState *s = env->apic_state;
- return s->tpr >> 4;
+ return s ? s->tpr >> 4 : 0;
}
/* return -1 if no bit is set */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [7048] apic: Fix access to non-existent APIC,
Aurelien Jarno <=