From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38258) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvXPQ-0005j6-5p for qemu-devel@nongnu.org; Fri, 13 Jun 2014 15:45:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WvXPK-0006Qj-1X for qemu-devel@nongnu.org; Fri, 13 Jun 2014 15:45:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30010) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvXPJ-0006PQ-Oh for qemu-devel@nongnu.org; Fri, 13 Jun 2014 15:45:01 -0400 From: Eduardo Habkost Date: Fri, 13 Jun 2014 16:43:49 -0300 Message-Id: <1402688658-22333-11-git-send-email-ehabkost@redhat.com> In-Reply-To: <1402688658-22333-1-git-send-email-ehabkost@redhat.com> References: <1402688658-22333-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC v2 10/39] pc: Eliminate pc_default_machine_options() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, "Michael S. Tsirkin" Cc: Marcel Apfelbaum , Alexander Graf , Don Slutz , Anthony Liguori , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= 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. If we just make isapc set hot_add_cpu to NULL, we can move pc_default_machine_options() the PC common class_init. Signed-off-by: Eduardo Habkost --- 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 b2e0809..10e8d10 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1618,6 +1618,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 8b3cffe..c829aa8 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -407,7 +407,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; } @@ -970,6 +969,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 cfeda8d..521bff7 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -321,7 +321,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 1b09eb4..92fab21 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -500,10 +500,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.0