summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Dovgalyuk <pavel.dovgaluk@ispras.ru>2017-01-31 14:40:54 +0300
committerMichael Roth <mdroth@linux.vnet.ibm.com>2017-03-16 12:10:41 -0500
commit270a46ea0d50bbb24aafaa92cbd35a01fad48ec3 (patch)
treee98a6a450012f23abf9a961d56539c0da7ee82bb
parentf61f76cb3ff9fea6ecbcb9696ed82b3e2c5b7364 (diff)
downloadqemu-270a46ea0d50bbb24aafaa92cbd35a01fad48ec3.tar.gz
apic: reset apic_delivered global variable on machine reset
This patch adds call to apic_reset_irq_delivered when the virtual machine is reset. Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru> Message-Id: <20170131114054.276.62201.stgit@PASHA-ISP> Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> (cherry picked from commit f65e821262029ee30c6b228e80ddeb86acdf7ff0) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r--hw/intc/apic_common.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
index d78c885509..7dfcca437a 100644
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@@ -250,6 +250,8 @@ static void apic_reset_common(DeviceState *dev)
s->apicbase = APIC_DEFAULT_ADDRESS | bsp | MSR_IA32_APICBASE_ENABLE;
s->id = s->initial_apic_id;
+ apic_reset_irq_delivered();
+
s->vapic_paddr = 0;
info->vapic_base_update(s);