From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38432) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a358F-0005g2-8F for qemu-devel@nongnu.org; Sun, 29 Nov 2015 11:47:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a358C-0000Dh-2T for qemu-devel@nongnu.org; Sun, 29 Nov 2015 11:47:23 -0500 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:34990) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a358B-0000Da-SL for qemu-devel@nongnu.org; Sun, 29 Nov 2015 11:47:20 -0500 Received: by wmuu63 with SMTP id u63so102746944wmu.0 for ; Sun, 29 Nov 2015 08:47:19 -0800 (PST) References: <1448647311-13783-1-git-send-email-ehabkost@redhat.com> <1448647311-13783-2-git-send-email-ehabkost@redhat.com> From: Marcel Apfelbaum Message-ID: <565B2C15.6060700@gmail.com> Date: Sun, 29 Nov 2015 18:47:17 +0200 MIME-Version: 1.0 In-Reply-To: <1448647311-13783-2-git-send-email-ehabkost@redhat.com> Content-Type: text/plain; charset=gbk; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [for-2.6 PATCH v2 1/2] pc: Remove redundant code from pc-*-2.3 machine classes Reply-To: marcel@redhat.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost , qemu-devel@nongnu.org, "Michael S. Tsirkin" Cc: Haozhong Zhang On 11/27/2015 08:01 PM, Eduardo Habkost wrote: > 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); > } > > Reviewed-by: Marcel Apfelbaum