Commit 2d996150 authored by Gu Zheng's avatar Gu Zheng Committed by Michael S. Tsirkin
Browse files

pc: Update rtc_cmos in pc_cpu_plug 



Update rtc_cmos in pc_cpu_plug() directly, instead of the notifier.

Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarGu Zheng <guz.fnst@cn.fujitsu.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
parent 5279569e

hw/i386/pc.c

+16 −21
Original line number Diff line number Diff line
@@ -355,30 +355,15 @@ static void pc_cmos_init_late(void *opaque) 
    qemu_unregister_reset(pc_cmos_init_late, opaque);

}



typedef struct RTCCPUHotplugArg {

    Notifier cpu_added_notifier;

    ISADevice *rtc_state;

} RTCCPUHotplugArg;



static void rtc_notify_cpu_added(Notifier *notifier, void *data)

{

    RTCCPUHotplugArg *arg = container_of(notifier, RTCCPUHotplugArg,

                                         cpu_added_notifier);

    ISADevice *s = arg->rtc_state;



    /* increment the number of CPUs */

    rtc_set_memory(s, 0x5f, rtc_get_memory(s, 0x5f) + 1);

}



void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,

                  const char *boot_device,

                  const char *boot_device, MachineState *machine,

                  ISADevice *floppy, BusState *idebus0, BusState *idebus1,

                  ISADevice *s)

{

    int val, nb, i;

    FDriveType fd_type[2] = { FDRIVE_DRV_NONE, FDRIVE_DRV_NONE };

    static pc_cmos_init_late_arg arg;

    static RTCCPUHotplugArg cpu_hotplug_cb;

    PCMachineState *pc_machine = PC_MACHINE(machine);



    /* various important CMOS locations needed by PC/Bochs bios */
@@ -417,10 +402,14 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, 


    /* set the number of CPU */

    rtc_set_memory(s, 0x5f, smp_cpus - 1);

    /* init CPU hotplug notifier */

    cpu_hotplug_cb.rtc_state = s;

    cpu_hotplug_cb.cpu_added_notifier.notify = rtc_notify_cpu_added;

    qemu_register_cpu_added_notifier(&cpu_hotplug_cb.cpu_added_notifier);



    object_property_add_link(OBJECT(machine), "rtc_state",

                             TYPE_ISA_DEVICE,

                             (Object **)&pc_machine->rtc,

                             object_property_allow_set_link,

                             OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort);

    object_property_set_link(OBJECT(machine), OBJECT(s),

                             "rtc_state", &error_abort);



    if (set_boot_dev(s, boot_device)) {

        exit(1);
@@ -1637,6 +1626,12 @@ static void pc_cpu_plug(HotplugHandler *hotplug_dev, 


    hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev);

    hhc->plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err);

    if (local_err) {

        goto out;

    }



    /* increment the number of CPUs */

    rtc_set_memory(pcms->rtc, 0x5f, rtc_get_memory(pcms->rtc, 0x5f) + 1);

out:

    error_propagate(errp, local_err);

}

hw/i386/pc_piix.c

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ static void pc_init1(MachineState *machine, 
    }



    pc_cmos_init(below_4g_mem_size, above_4g_mem_size, machine->boot_order,

                 floppy, idebus[0], idebus[1], rtc_state);

                 machine, floppy, idebus[0], idebus[1], rtc_state);



    if (pci_enabled && usb_enabled(false)) {

        pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci");

hw/i386/pc_q35.c

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static void pc_q35_init(MachineState *machine) 
                      8, NULL, 0);



    pc_cmos_init(below_4g_mem_size, above_4g_mem_size, machine->boot_order,

                 floppy, idebus[0], idebus[1], rtc_state);

                 machine, floppy, idebus[0], idebus[1], rtc_state);



    /* the rest devices to which pci devfn is automatically assigned */

    pc_vga_init(isa_bus, host_bus);

include/hw/i386/pc.h

+2 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ struct PCMachineState { 
    MemoryRegion hotplug_memory;



    HotplugHandler *acpi_dev;

    ISADevice *rtc;



    uint64_t max_ram_below_4g;

};
@@ -211,7 +212,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, 
                          uint32 hpet_irqs);

void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd);

void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,

                  const char *boot_device,

                  const char *boot_device, MachineState *machine,

                  ISADevice *floppy, BusState *ide0, BusState *ide1,

                  ISADevice *s);

void pc_nic_init(ISABus *isa_bus, PCIBus *pci_bus);