diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-08-07 16:55:47 -0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-08-13 14:08:26 +0300 |
| commit | 41742767bfa8127954b6f57b39b590adcde3ac6c (patch) | |
| tree | c0adf49fe13db009ef4eaead1c2a021d3151ef34 /hw/i386 | |
| parent | 8170dfa077761ed979b45f608cf706253a764f0d (diff) | |
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: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/i386')
| -rw-r--r-- | hw/i386/pc.c | 1 | ||||
| -rw-r--r-- | hw/i386/pc_piix.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index ad1a861eb8..583c47ab09 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -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; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index c88ed0db8b..d722518668 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -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"; |