From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52337) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1zeY-0005tL-M7 for qemu-devel@nongnu.org; Thu, 26 Nov 2015 11:44:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1zeV-0007V6-Fo for qemu-devel@nongnu.org; Thu, 26 Nov 2015 11:44:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40059) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1zeV-0007V2-AT for qemu-devel@nongnu.org; Thu, 26 Nov 2015 11:44:11 -0500 Date: Thu, 26 Nov 2015 18:44:07 +0200 From: "Michael S. Tsirkin" Message-ID: <1448556198-25213-3-git-send-email-mst@redhat.com> References: <1448556198-25213-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1448556198-25213-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 2/9] pc: Don't set hw_version on pc-*-2.5 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , Eduardo Habkost , Paolo Bonzini From: Eduardo Habkost Now that qemu_hw_version() returns a fixed "2.5+" string instead of QEMU_VERSION, we don't need to set hw_version on pc-*-2.5 explicitly. Suggested-by: Michael S. Tsirkin Signed-off-by: Eduardo Habkost Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/pc_piix.c | 1 - hw/i386/pc_q35.c | 1 - 2 files changed, 2 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 07d0baa..2e41efe 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -472,7 +472,6 @@ static void pc_i440fx_machine_options(MachineClass *m) static void pc_i440fx_2_5_machine_options(MachineClass *m) { pc_i440fx_machine_options(m); - m->hw_version = QEMU_VERSION; m->alias = "pc"; m->is_default = 1; } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 0fdae09..133bc68 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -373,7 +373,6 @@ static void pc_q35_machine_options(MachineClass *m) static void pc_q35_2_5_machine_options(MachineClass *m) { pc_q35_machine_options(m); - m->hw_version = QEMU_VERSION; m->alias = "q35"; } -- MST