From patchwork Fri Nov 27 17:11:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 549546 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C79BF140326 for ; Sat, 28 Nov 2015 04:12:38 +1100 (AEDT) Received: from localhost ([::1]:57776 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2MZY-0002DJ-Ky for incoming@patchwork.ozlabs.org; Fri, 27 Nov 2015 12:12:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39180) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2MZ1-0001I4-4e for qemu-devel@nongnu.org; Fri, 27 Nov 2015 12:12:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a2MYz-00054d-0g for qemu-devel@nongnu.org; Fri, 27 Nov 2015 12:12:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44151) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2MYy-00054X-Ri for qemu-devel@nongnu.org; Fri, 27 Nov 2015 12:12:00 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 6FD4BA3261; Fri, 27 Nov 2015 17:12:00 +0000 (UTC) Received: from localhost (ovpn-113-49.phx2.redhat.com [10.3.113.49]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tARHBwuf024555; Fri, 27 Nov 2015 12:11:59 -0500 From: Eduardo Habkost To: qemu-devel@nongnu.org, "Michael S. Tsirkin" Date: Fri, 27 Nov 2015 15:11:49 -0200 Message-Id: <1448644310-7563-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1448644310-7563-1-git-send-email-ehabkost@redhat.com> References: <1448644310-7563-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Haozhong Zhang Subject: [Qemu-devel] [for-2.6 PATCH 1/2] pc: Remove redundant code from pc-*-2.3 machine classes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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); }