apic: Fix access to non-existent APIC
PATCH 1/1 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 <[email protected]>
---
hw/apic.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)
hw/apic.c +8 -3
@@ -280,6 +280,8 @@ void cpu_set_apic_base(CPUState *env, uint64_t val)#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 @@ uint64_t cpu_get_apic_base(CPUState *env) {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 @@ void cpu_set_apic_tpr(CPUX86State *env, uint8_t val)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 */
Aurelien Jarno
AppliedQuoted 8 lines · Jan Kiszka
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 <[email protected]>---
hw/apic.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)
Thanks, applied.
Quoted 45 lines
hw/apic.c +8
-3@@ -280,6 +280,8 @@ void cpu_set_apic_base(CPUState *env, uint64_t val)#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 @@ uint64_t cpu_get_apic_base(CPUState *env) {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 @@ void cpu_set_apic_tpr(CPUX86State *env, uint8_t val)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 */
Signature · 2 lines
Aurelien Jarno GPG: 1024D/F1BCDB73 [email protected] http://www.aurel32.net