From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VB3LC-0004R2-Hm for qemu-devel@nongnu.org; Sun, 18 Aug 2013 09:48:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VB3L6-00005x-Ip for qemu-devel@nongnu.org; Sun, 18 Aug 2013 09:48:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11014) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VB3L6-00005r-Au for qemu-devel@nongnu.org; Sun, 18 Aug 2013 09:48:16 -0400 Date: Sun, 18 Aug 2013 16:50:02 +0300 From: "Michael S. Tsirkin" Message-ID: <20130818135002.GA5999@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] pc: cleanup 1.4 compat support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Eduardo Habkost , Gerd Hoffmann , Paolo Bonzini , Andreas =?iso-8859-1?Q?F=E4rber?= 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 --- 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 15c932e..86cfadc 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -272,8 +272,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 09d8183..8d62700 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -239,8 +239,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 = { -- MST