From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNnkk-0007uq-48 for qemu-devel@nongnu.org; Fri, 07 Aug 2015 15:56:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZNnkf-0003bE-2b for qemu-devel@nongnu.org; Fri, 07 Aug 2015 15:56:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52940) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNnke-0003b8-TW for qemu-devel@nongnu.org; Fri, 07 Aug 2015 15:56:25 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 7CC20372599 for ; Fri, 7 Aug 2015 19:56:24 +0000 (UTC) From: Eduardo Habkost Date: Fri, 7 Aug 2015 16:55:47 -0300 Message-Id: <1438977359-29840-7-git-send-email-ehabkost@redhat.com> In-Reply-To: <1438977359-29840-1-git-send-email-ehabkost@redhat.com> References: <1438977359-29840-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH for-2.5 06/18] pc: Eliminate pc_common_machine_options() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: qemu-devel@nongnu.org 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 --- 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 ad1a861..583c47a 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 c88ed0d..d722518 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"; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 6746097..1d21ab2 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -699,14 +699,8 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); .value = "off",\ }, -static inline void pc_common_machine_options(MachineClass *m) -{ - m->default_boot_order = "cad"; -} - static inline void pc_default_machine_options(MachineClass *m) { - pc_common_machine_options(m); m->hot_add_cpu = pc_hot_add_cpu; m->max_cpus = 255; } -- 2.1.0