From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38332) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvXPY-00060q-Ga for qemu-devel@nongnu.org; Fri, 13 Jun 2014 15:45:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WvXPS-0006fB-Cx for qemu-devel@nongnu.org; Fri, 13 Jun 2014 15:45:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31597) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvXPS-0006f1-5f for qemu-devel@nongnu.org; Fri, 13 Jun 2014 15:45:10 -0400 From: Eduardo Habkost Date: Fri, 13 Jun 2014 16:43:52 -0300 Message-Id: <1402688658-22333-14-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 13/39] q35: Eliminate pc_q35_1_4_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?= Signed-off-by: Eduardo Habkost --- hw/i386/pc_q35.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 5750239..0f1d28d 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -430,11 +430,6 @@ static TypeInfo pc_q35_machine_v1_5_type_info = { .class_init = pc_q35_machine_v1_5_class_init, }; -static void pc_q35_1_4_machine_options(MachineClass *mc) -{ - mc->hot_add_cpu = NULL; -} - static void pc_q35_machine_v1_4_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -442,7 +437,7 @@ static void pc_q35_machine_v1_4_class_init(ObjectClass *oc, void *data) PC_Q35_COMPAT_1_4, { /* end of list */ } }; - pc_q35_1_4_machine_options(mc); + mc->hot_add_cpu = NULL; mc->init = pc_q35_init_1_4; machine_class_add_compat_props(mc, compat_props); mc->name = "pc-q35-1.4"; -- 1.9.0