From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38368) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvXPc-00068y-Db for qemu-devel@nongnu.org; Fri, 13 Jun 2014 15:45:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WvXPV-0006ft-Bu for qemu-devel@nongnu.org; Fri, 13 Jun 2014 15:45:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62976) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvXPV-0006fl-0l for qemu-devel@nongnu.org; Fri, 13 Jun 2014 15:45:13 -0400 From: Eduardo Habkost Date: Fri, 13 Jun 2014 16:43:53 -0300 Message-Id: <1402688658-22333-15-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 14/39] pc: Eliminate *machine_options macros 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_piix.c | 4 +--- hw/i386/pc_q35.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 87108d4..05d1241 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -443,8 +443,6 @@ static TypeInfo pc_i440fx_machine_v2_1_type_info = { .class_init = pc_i440fx_machine_v2_1_class_init, }; -#define pc_i440fx_2_0_machine_options pc_i440fx_2_1_machine_options - static void pc_i440fx_machine_v2_0_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -452,7 +450,7 @@ static void pc_i440fx_machine_v2_0_class_init(ObjectClass *oc, void *data) PC_COMPAT_2_0, { /* end of list */ } }; - pc_i440fx_2_0_machine_options(mc); + pc_i440fx_2_1_machine_options(mc); mc->init = pc_init_pci_2_0; mc->name = "pc-i440fx-2.0"; machine_class_add_compat_props(mc, compat_props); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 0f1d28d..bdc8929 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -355,8 +355,6 @@ static TypeInfo pc_q35_machine_v2_1_type_info = { .class_init = pc_q35_machine_v2_1_class_init, }; -#define pc_q35_2_0_machine_options pc_q35_2_1_machine_options - static void pc_q35_machine_v2_0_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -364,7 +362,7 @@ static void pc_q35_machine_v2_0_class_init(ObjectClass *oc, void *data) PC_Q35_COMPAT_2_0, { /* end of list */ } }; - pc_q35_2_0_machine_options(mc); + pc_q35_2_1_machine_options(mc); mc->init = pc_q35_init_2_0; machine_class_add_compat_props(mc, compat_props); mc->name = "pc-q35-2.0"; -- 1.9.0