From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43605) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9FII-0003AT-6T for qemu-devel@nongnu.org; Tue, 13 Aug 2013 10:10:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V9FI9-0004X6-99 for qemu-devel@nongnu.org; Tue, 13 Aug 2013 10:09:54 -0400 Received: from e8.ny.us.ibm.com ([32.97.182.138]:44289) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9FI9-0004St-4c for qemu-devel@nongnu.org; Tue, 13 Aug 2013 10:09:45 -0400 Received: from /spool/local by e8.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 13 Aug 2013 15:09:20 +0100 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 7F02E38C8039 for ; Tue, 13 Aug 2013 10:09:16 -0400 (EDT) Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r7DE9HGt175090 for ; Tue, 13 Aug 2013 10:09:17 -0400 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r7DE9Clq021766 for ; Tue, 13 Aug 2013 08:09:12 -0600 From: Anthony Liguori Date: Tue, 13 Aug 2013 09:09:11 -0500 Message-Id: <1376402951-3620-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH] pvpanic: fix bad merge List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Markus Armbruster , Michael Tsirkin Context matching caused the 'has_pvpanic = true' to be applied to the 1.6 machine type instead of the 1.5 machine type. Reported-by: Markus Armbruster Reported-by: Michael S. Tsirkin Signed-off-by: Anthony Liguori --- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 55c24f2..6e1e654 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -252,12 +252,12 @@ static void pc_init_pci(QEMUMachineInitArgs *args) static void pc_init_pci_1_6(QEMUMachineInitArgs *args) { has_pci_info = false; - has_pvpanic = true; pc_init_pci(args); } static void pc_init_pci_1_5(QEMUMachineInitArgs *args) { + has_pvpanic = true; pc_init_pci_1_6(args); } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index bd25071..10e770e 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -221,12 +221,12 @@ static void pc_q35_init(QEMUMachineInitArgs *args) static void pc_q35_init_1_6(QEMUMachineInitArgs *args) { has_pci_info = false; - has_pvpanic = true; pc_q35_init(args); } static void pc_q35_init_1_5(QEMUMachineInitArgs *args) { + has_pvpanic = true; pc_q35_init_1_6(args); } -- 1.8.0