From patchwork Mon Aug 26 16:43:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 269933 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 39DA32C0097 for ; Tue, 27 Aug 2013 02:42:20 +1000 (EST) Received: from localhost ([::1]:52227 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VDzru-0000xM-7s for incoming@patchwork.ozlabs.org; Mon, 26 Aug 2013 12:42:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54009) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VDzqq-0000Aa-PM for qemu-devel@nongnu.org; Mon, 26 Aug 2013 12:41:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VDzql-0003EI-U4 for qemu-devel@nongnu.org; Mon, 26 Aug 2013 12:41:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30436) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VDzql-0003EE-Kl for qemu-devel@nongnu.org; Mon, 26 Aug 2013 12:41:07 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7QGf5WS005204 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 26 Aug 2013 12:41:06 -0400 Received: from redhat.com (vpn1-5-108.ams2.redhat.com [10.36.5.108]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r7QGf3U5032147; Mon, 26 Aug 2013 12:41:04 -0400 Date: Mon, 26 Aug 2013 19:43:02 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1377535318-30491-2-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.23 X-MIME-Autoconverted: from 8bit to quoted-printable by mx1.redhat.com id r7QGf5WS005204 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: =?us-ascii?B?PT9VVEYtOD9xP0FuZHJlYXM9MjBGPUMzPUE0cmJlcj89?= , Anthony Liguori , Eduardo Habkost Subject: [Qemu-devel] [PULL 01/14] pc: cleanup 1.4 compat support 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 Make 1.4 compat code call the 1.6 one, reducing code duplication. Add comment explaining why we can't make 1.4 call 1.5 as usual. Signed-off-by: Michael S. Tsirkin Reviewed-by: Andreas Färber Reviewed-by: Eduardo Habkost --- 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 6e1e654..46f1fd7 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -265,8 +265,8 @@ static void pc_init_pci_1_4(QEMUMachineInitArgs *args) { 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); - has_pci_info = false; - pc_init_pci(args); + /* 1.5 was special - it enabled pvpanic in builtin machine */ + pc_init_pci_1_6(args); } static void pc_init_pci_1_3(QEMUMachineInitArgs *args) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 10e770e..ab0aa70 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -234,8 +234,8 @@ static void pc_q35_init_1_4(QEMUMachineInitArgs *args) { 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); - has_pci_info = false; - pc_q35_init(args); + /* 1.5 was special - it enabled pvpanic in builtin machine */ + pc_q35_init_1_6(args); } static QEMUMachine pc_q35_machine_v1_6 = {