aboutsummaryrefslogtreecommitdiff
path: root/hw/intc
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2015-01-20 11:07:09 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2015-01-26 12:27:05 +0100
commit927411fa42c5fcf16ed0fcc0447d5ee8c83b22ca (patch)
tree849eff7d539176c3b0bb86d5689526252d625072 /hw/intc
parent874b1cfad51e325d535f99261f91c92df444c18c (diff)
downloadqemu-927411fa42c5fcf16ed0fcc0447d5ee8c83b22ca.zip
qemu-927411fa42c5fcf16ed0fcc0447d5ee8c83b22ca.tar.gz
qemu-927411fa42c5fcf16ed0fcc0447d5ee8c83b22ca.tar.bz2
apic: do not dereference pointer before it is checked for NULL
Right now you only get to apic_init_reset if you have an APIC (do_cpu_init is reached only if CPU_INTERRUPT_INIT is set and that only happens in hw/intc/apic.c). However, this is wrong because for example a port 92 or keyboard controller reset is really an INIT, and that can happen also with no APIC. So keep the check and fix the error that Coverity reported. Reported-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/intc')
-rw-r--r--hw/intc/apic_common.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
index d9bb188..0858b45 100644
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@@ -177,13 +177,14 @@ bool apic_next_timer(APICCommonState *s, int64_t current_time)
void apic_init_reset(DeviceState *dev)
{
- APICCommonState *s = APIC_COMMON(dev);
- APICCommonClass *info = APIC_COMMON_GET_CLASS(s);
+ APICCommonState *s;
+ APICCommonClass *info;
int i;
- if (!s) {
+ if (!dev) {
return;
}
+ s = APIC_COMMON(dev);
s->tpr = 0;
s->spurious_vec = 0xff;
s->log_dest = 0;
@@ -208,6 +209,7 @@ void apic_init_reset(DeviceState *dev)
}
s->timer_expiry = -1;
+ info = APIC_COMMON_GET_CLASS(s);
if (info->reset) {
info->reset(s);
}