From mboxrd@z Thu Jan 1 00:00:00 1970 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 Date: Mon, 26 Aug 2013 19:43:36 +0300 From: "Michael S. Tsirkin" 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-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1377535318-30491-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 12/14] pc: pc_compat_1_4() now can call pc_compat_1_5() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Anthony Liguori 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); } -- MST