[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 12/33] pc: Eliminate pc_common_machine_options()
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH v4 12/33] pc: Eliminate pc_common_machine_options() |
Date: |
Thu, 14 Aug 2014 16:25:41 -0300 |
The TYPE_PC_MACHINE parent class can initialize the common options for
all PC machines.
Reviewed-by: Andreas Färber <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/i386/pc.c | 1 +
hw/i386/pc_piix.c | 2 --
include/hw/i386/pc.h | 6 ------
3 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index e56716f..f61eade 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1688,6 +1688,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->default_boot_order = "cad";
hc->plug = pc_machine_device_plug_cb;
}
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index a2ff925..4bc2d8b 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -1014,7 +1014,6 @@ static void isapc_machine_class_init(ObjectClass *oc,
void *data)
static GlobalProperty compat_props[] = {
{ /* end of list */ }
};
- pc_common_machine_options(mc);
mc->desc = "ISA-only PC";
mc->init = pc_init_isa;
mc->max_cpus = 1;
@@ -1043,7 +1042,6 @@ static void xenfv_machine_class_init(ObjectClass *oc,
void *data)
},
{ /* end of list */ }
};
- pc_common_machine_options(mc);
mc->desc = "Xen Fully-virtualized PC";
mc->init = pc_xen_hvm_init;
mc->max_cpus = HVM_MAX_VCPUS;
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 46bbf48..b3dd3ed 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -506,14 +506,8 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
.value = stringify(0),\
}
-static inline void pc_common_machine_options(MachineClass *mc)
-{
- mc->default_boot_order = "cad";
-}
-
static inline void pc_default_machine_options(MachineClass *mc)
{
- pc_common_machine_options(mc);
mc->hot_add_cpu = pc_hot_add_cpu;
mc->max_cpus = 255;
}
--
1.9.3
- [Qemu-devel] [PATCH v4 00/33] Convert PC machine-types to QOM classes, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 02/33] vl.c: Use qdev_prop_register_global() for single globals, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 01/33] pc: Replace tabs with spaces on pc.h, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 03/33] pc: Eliminate has_pci_info global variable, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 04/33] piix: Add kvmclock_enabled, pci_enabled globals, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 05/33] piix: Eliminate pc_init_pci(), Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 06/33] piix: Move pc-0.14 qxl compat properties to PC_COMPAT_0_14, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 07/33] piix: Move pc-0.13 virtio-9p-pci compat to PC_COMPAT_0_13, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 08/33] piix: Move pc-0.1[23] rombar compat props to PC_COMPAT_0_13, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 09/33] piix: Move pc-0.11 drive version compat props to PC_COMPAT_0_11, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 12/33] pc: Eliminate pc_common_machine_options(),
Eduardo Habkost <=
- [Qemu-devel] [PATCH v4 11/33] pc: Register machine classes directly instead of using QEMUMachine, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 10/33] machine: Make compat_props a linked list, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 13/33] pc: Eliminate pc_default_machine_options(), Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 14/33] piix: Eliminate pc_i440fx_machine_options(), Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 15/33] q35: Eliminate pc_q35_machine_options(), Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 16/33] q35: Eliminate pc_q35_1_4_machine_options(), Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 17/33] pc: Eliminate all *_machine_options() functions, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 18/33] machine: Eliminate QEMUMachine.compat_props, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 19/33] pc: Rename pc_machine variable to pcms, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 20/33] pc: Pass PCMachineState argument to pc_cpus_init(), Eduardo Habkost, 2014/08/14