[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/12] x86: use new method to correct reset sequence
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 10/12] x86: use new method to correct reset sequence |
Date: |
Mon, 5 Oct 2015 13:06:32 -0300 |
From: Zhu Guihua <address@hidden>
During reset some devices (such as hpet, rtc) might send IRQ to APIC
which changes APIC's state from default one it's supposed to have
at machine startup time.
Fix this by resetting APIC after devices have been reset to cancel
any changes that qemu_devices_reset() might have done to its state.
Signed-off-by: Zhu Guihua <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/i386/pc.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 6a20e16..02e0b42 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1926,6 +1926,25 @@ static void pc_machine_initfn(Object *obj)
NULL, &error_abort);
}
+static void pc_machine_reset(void)
+{
+ CPUState *cs;
+ X86CPU *cpu;
+
+ qemu_devices_reset();
+
+ /* Reset APIC after devices have been reset to cancel
+ * any changes that qemu_devices_reset() might have done.
+ */
+ CPU_FOREACH(cs) {
+ cpu = X86_CPU(cs);
+
+ if (cpu->apic_state) {
+ device_reset(cpu->apic_state);
+ }
+ }
+}
+
static unsigned pc_cpu_index_to_socket_id(unsigned cpu_index)
{
X86CPUTopoInfo topo;
@@ -1947,6 +1966,7 @@ static void pc_machine_class_init(ObjectClass *oc, void
*data)
mc->default_boot_order = "cad";
mc->hot_add_cpu = pc_hot_add_cpu;
mc->max_cpus = 255;
+ mc->reset = pc_machine_reset;
hc->plug = pc_machine_device_plug_cb;
hc->unplug_request = pc_machine_device_unplug_request_cb;
hc->unplug = pc_machine_device_unplug_cb;
--
2.1.0
- [Qemu-devel] [PULL 12/12] icc_bus: drop the unused files, (continued)
- [Qemu-devel] [PULL 12/12] icc_bus: drop the unused files, Eduardo Habkost, 2015/10/08
- [Qemu-devel] [PULL 01/12] cpu: Introduce X86CPUTopoInfo structure for argument simplification, Eduardo Habkost, 2015/10/08
- [Qemu-devel] [PULL 03/12] target-i386: Convert kvm_default_*features to property/value pairs, Eduardo Habkost, 2015/10/08
- [Qemu-devel] [PULL 04/12] target-i386: Move breakpoint related functions to new file, Eduardo Habkost, 2015/10/08
- [Qemu-devel] [PULL 07/12] target-i386: add ABM to Haswell* and Broadwell* CPU models, Eduardo Habkost, 2015/10/08
- [Qemu-devel] [PULL 06/12] target-i386: get/put MSR_TSC_AUX across reset and migration, Eduardo Habkost, 2015/10/08
- [Qemu-devel] [PULL 09/12] apic: move APIC's MMIO region mapping into APIC, Eduardo Habkost, 2015/10/08
- Re: [Qemu-devel] [PULL 00/12] X86 queue, 2015-10-05, Peter Maydell, 2015/10/08
- [Qemu-devel] [PULL 08/12] Correctly re-init EFER state during INIT IPI, Eduardo Habkost, 2015/10/08
- [Qemu-devel] [PULL 02/12] vl: Add another sanity check to smp_parse() function, Eduardo Habkost, 2015/10/08
- [Qemu-devel] [PULL 10/12] x86: use new method to correct reset sequence,
Eduardo Habkost <=
- [Qemu-devel] [PULL 05/12] target-i386: Make check_hw_breakpoints static, Eduardo Habkost, 2015/10/08
- [Qemu-devel] [PULL 11/12] cpu/apic: drop icc bus/bridge, Eduardo Habkost, 2015/10/08