From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54677) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2NLL-0000af-Dw for qemu-devel@nongnu.org; Fri, 27 Nov 2015 13:02:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a2NLK-0002zM-IE for qemu-devel@nongnu.org; Fri, 27 Nov 2015 13:01:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51667) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2NLK-0002zH-DI for qemu-devel@nongnu.org; Fri, 27 Nov 2015 13:01:58 -0500 From: Eduardo Habkost Date: Fri, 27 Nov 2015 16:01:50 -0200 Message-Id: <1448647311-13783-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1448647311-13783-1-git-send-email-ehabkost@redhat.com> References: <1448647311-13783-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [for-2.6 PATCH v2 1/2] pc: Remove redundant code from pc-*-2.3 machine classes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, "Michael S. Tsirkin" Cc: Haozhong Zhang Remove the redundant 'alias = NULL' and 'is_default = 0' lines from older machine-types. pc_*_2_4_machine_options() already clear those fields, so they don't need to be cleared by pc_*_2_3_machine_options(). Signed-off-by: Eduardo Habkost --- hw/i386/pc_piix.c | 2 -- hw/i386/pc_q35.c | 1 - 2 files changed, 3 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 2e41efe..1a4ff01 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -499,8 +499,6 @@ static void pc_i440fx_2_3_machine_options(MachineClass *m) { pc_i440fx_2_4_machine_options(m); m->hw_version = "2.3.0"; - m->alias = NULL; - m->is_default = 0; SET_MACHINE_COMPAT(m, PC_COMPAT_2_3); } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 133bc68..f17acca 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -399,7 +399,6 @@ static void pc_q35_2_3_machine_options(MachineClass *m) m->hw_version = "2.3.0"; m->no_floppy = 0; m->no_tco = 1; - m->alias = NULL; SET_MACHINE_COMPAT(m, PC_COMPAT_2_3); } -- 2.1.0