[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 13/33] pc: Eliminate pc_default_machine_options()
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH v4 13/33] pc: Eliminate pc_default_machine_options() |
Date: |
Thu, 14 Aug 2014 16:25:42 -0300 |
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: Eduardo Habkost <address@hidden>
---
hw/i386/pc.c | 2 ++
hw/i386/pc_piix.c | 2 +-
hw/i386/pc_q35.c | 1 -
include/hw/i386/pc.h | 6 ------
4 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index f61eade..53c39cb 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1689,6 +1689,8 @@ 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";
+ mc->hot_add_cpu = pc_hot_add_cpu;
+ mc->max_cpus = 255;
hc->plug = pc_machine_device_plug_cb;
}
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 4bc2d8b..5688b10 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -454,7 +454,6 @@ static void pc_xen_hvm_init(MachineState *machine)
static void pc_i440fx_machine_options(MachineClass *mc)
{
- pc_default_machine_options(mc);
mc->desc = "Standard PC (i440FX + PIIX, 1996)";
mc->hot_add_cpu = pc_hot_add_cpu;
}
@@ -1017,6 +1016,7 @@ static void isapc_machine_class_init(ObjectClass *oc,
void *data)
mc->desc = "ISA-only PC";
mc->init = pc_init_isa;
mc->max_cpus = 1;
+ mc->hot_add_cpu = NULL;
mc->name = "isapc";
machine_class_add_compat_props(mc, compat_props);
}
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 3b923b7..0074640 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -343,7 +343,6 @@ static void pc_q35_init_1_4(MachineState *machine)
static void pc_q35_machine_options(MachineClass *mc)
{
- pc_default_machine_options(mc);
mc->desc = "Standard PC (Q35 + ICH9, 2009)";
mc->hot_add_cpu = pc_hot_add_cpu;
}
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index b3dd3ed..fa4cf3c 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -506,10 +506,4 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
.value = stringify(0),\
}
-static inline void pc_default_machine_options(MachineClass *mc)
-{
- mc->hot_add_cpu = pc_hot_add_cpu;
- mc->max_cpus = 255;
-}
-
#endif
--
1.9.3
- [Qemu-devel] [PATCH v4 03/33] pc: Eliminate has_pci_info global variable, (continued)
- [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, 2014/08/14
- [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 <=
- [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
- [Qemu-devel] [PATCH v4 21/33] machine: Add MachineClass.default_cpu_model field, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 22/33] pc: Move globals to PCMachineClass, Eduardo Habkost, 2014/08/14
- [Qemu-devel] [PATCH v4 23/33] pc: Move option_rom_has_mr/rom_file_has_mr to MachineClass, Eduardo Habkost, 2014/08/14