summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2015-08-07 16:55:48 -0300
committerMichael S. Tsirkin <mst@redhat.com>2015-08-13 14:08:27 +0300
commit4458fb3a7993249f466662b18ccae75f1a313200 (patch)
treea7003d0c8d08e90021685b44b84a6c3f28919dc5 /include
parent41742767bfa8127954b6f57b39b590adcde3ac6c (diff)
downloadqemu-4458fb3a7993249f466662b18ccae75f1a313200.tar.gz
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: 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 'include')
-rw-r--r--include/hw/i386/pc.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 1d21ab2c63..0273becc95 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -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) \
{ \