From patchwork Mon Aug 26 16:43:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 269945 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0DFBA2C0097 for ; Tue, 27 Aug 2013 02:49:20 +1000 (EST) Received: from localhost ([::1]:52287 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VDzyg-0004yl-8t for incoming@patchwork.ozlabs.org; Mon, 26 Aug 2013 12:49:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54263) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VDzrP-00014j-Fa for qemu-devel@nongnu.org; Mon, 26 Aug 2013 12:41:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VDzrJ-0003Nk-4r for qemu-devel@nongnu.org; Mon, 26 Aug 2013 12:41:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64899) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VDzrI-0003Nf-TT for qemu-devel@nongnu.org; Mon, 26 Aug 2013 12:41:41 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7QGfdPH021500 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 26 Aug 2013 12:41:39 -0400 Received: from redhat.com (vpn1-5-108.ams2.redhat.com [10.36.5.108]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id r7QGfbfN030798; Mon, 26 Aug 2013 12:41:38 -0400 Date: Mon, 26 Aug 2013 19:43:36 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1377535318-30491-13-git-send-email-mst@redhat.com> References: <1377535318-30491-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1377535318-30491-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Eduardo Habkost , Anthony Liguori Subject: [Qemu-devel] [PULL 12/14] pc: pc_compat_1_4() now can call pc_compat_1_5() 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 From: Eduardo Habkost It just needs to set has_pvpanic=false after calling it. This way, it won't be a special case anymore. Signed-off-by: Eduardo Habkost Signed-off-by: Michael S. Tsirkin --- hw/i386/pc_piix.c | 4 ++-- hw/i386/pc_q35.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index a5e5bec..d3d4893 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -250,8 +250,8 @@ static void pc_compat_1_5(QEMUMachineInitArgs *args) static void pc_compat_1_4(QEMUMachineInitArgs *args) { - /* 1.5 was special - it enabled pvpanic in builtin machine */ - pc_compat_1_6(args); + pc_compat_1_5(args); + has_pvpanic = false; x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE); x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ); } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index f5e0b94..198c785 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -229,8 +229,8 @@ static void pc_compat_1_5(QEMUMachineInitArgs *args) static void pc_compat_1_4(QEMUMachineInitArgs *args) { - /* 1.5 was special - it enabled pvpanic in builtin machine */ - pc_compat_1_6(args); + pc_compat_1_5(args); + has_pvpanic = false; x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE); x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ); }