Commit 4458fb3a authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Michael S. Tsirkin
Browse files

pc: Eliminate pc_default_machine_options() 



The only PC machines that didn't call pc_default_machine_options() were
isaps and xenfv. Both were already overwriting max_cpus, and only isapc
was not overwriting hot_add_cpu.

After making isapc set hot_add_cpu to NULL, we can move the
pc_default_machine_options() code the PC common class_init.

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 41742767

hw/i386/pc.c

+2 −0
Original line number Diff line number Diff line
@@ -1939,6 +1939,8 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) 
    mc->get_hotplug_handler = pc_get_hotpug_handler;

    mc->cpu_index_to_socket_id = pc_cpu_index_to_socket_id;

    mc->default_boot_order = "cad";

    mc->hot_add_cpu = pc_hot_add_cpu;

    mc->max_cpus = 255;

    hc->plug = pc_machine_device_plug_cb;

    hc->unplug_request = pc_machine_device_unplug_request_cb;

    hc->unplug = pc_machine_device_unplug_cb;

hw/i386/pc_piix.c

+0 −1
Original line number Diff line number Diff line
@@ -449,7 +449,6 @@ static void pc_xen_hvm_init(MachineState *machine) 


static void pc_i440fx_machine_options(MachineClass *m)

{

    pc_default_machine_options(m);

    m->family = "pc_piix";

    m->desc = "Standard PC (i440FX + PIIX, 1996)";

    m->hot_add_cpu = pc_hot_add_cpu;

hw/i386/pc_q35.c

+0 −1
Original line number Diff line number Diff line
@@ -363,7 +363,6 @@ static void pc_compat_1_4(MachineState *machine) 


static void pc_q35_machine_options(MachineClass *m)

{

    pc_default_machine_options(m);

    m->family = "pc_q35";

    m->desc = "Standard PC (Q35 + ICH9, 2009)";

    m->hot_add_cpu = pc_hot_add_cpu;

include/hw/i386/pc.h

+0 −6
Original line number Diff line number Diff line
@@ -699,12 +699,6 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); 
            .value = "off",\

        },



static inline void pc_default_machine_options(MachineClass *m)

{

    m->hot_add_cpu = pc_hot_add_cpu;

    m->max_cpus = 255;

}



#define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \

    static void pc_machine_##suffix##_class_init(ObjectClass *oc, void *data) \

    { \