From mboxrd@z Thu Jan 1 00:00:00 1970 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 Date: Mon, 26 Aug 2013 19:43:02 +0300 From: "Michael S. Tsirkin" 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-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1377535318-30491-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 01/14] pc: cleanup 1.4 compat support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?us-ascii?B?PT9VVEYtOD9xP0FuZHJlYXM9MjBGPUMzPUE0cmJlcj89?= , Anthony Liguori , Eduardo Habkost 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=E4rber 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_PCL= MULQDQ); - has_pci_info =3D false; - pc_init_pci(args); + /* 1.5 was special - it enabled pvpanic in builtin machine */ + pc_init_pci_1_6(args); } =20 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_PCL= MULQDQ); - has_pci_info =3D false; - pc_q35_init(args); + /* 1.5 was special - it enabled pvpanic in builtin machine */ + pc_q35_init_1_6(args); } =20 static QEMUMachine pc_q35_machine_v1_6 =3D { --=20 MST