Commit ae50c55a authored by Zhu Guihua's avatar Zhu Guihua Committed by Eduardo Habkost
Browse files

x86: use new method to correct reset sequence 



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: default avatarZhu Guihua <zhugh.fnst@cn.fujitsu.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 8d42d2d3

hw/i386/pc.c

+20 −0
Original line number Diff line number Diff line
@@ -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;