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

pc: Eliminate pc_common_machine_options() 



All TYPE_PC_MACHINE subclasses call pc_common_machine_options().
TYPE_PC_MACHINE can simply initialize the common options on class_init
directly.

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 8170dfa0

hw/i386/pc.c

+1 −0
Original line number Diff line number Diff line
@@ -1938,6 +1938,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) 
    pcmc->get_hotplug_handler = mc->get_hotplug_handler;

    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";

    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 −2
Original line number Diff line number Diff line
@@ -887,7 +887,6 @@ DEFINE_I440FX_MACHINE(v0_10, "pc-0.10", pc_compat_0_13, 


static void isapc_machine_options(MachineClass *m)

{

    pc_common_machine_options(m);

    m->desc = "ISA-only PC";

    m->max_cpus = 1;

}
@@ -899,7 +898,6 @@ DEFINE_PC_MACHINE(isapc, "isapc", pc_init_isa, 
#ifdef CONFIG_XEN

static void xenfv_machine_options(MachineClass *m)

{

    pc_common_machine_options(m);

    m->desc = "Xen Fully-virtualized PC";

    m->max_cpus = HVM_MAX_VCPUS;

    m->default_machine_opts = "accel=xen";

include/hw/i386/pc.h

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

        },



static inline void pc_common_machine_options(MachineClass *m)

{

    m->default_boot_order = "cad";

}



static inline void pc_default_machine_options(MachineClass *m)

{

    pc_common_machine_options(m);

    m->hot_add_cpu = pc_hot_add_cpu;

    m->max_cpus = 255;

}