From 02653c5ea77bc3837376232ce508b7dd3e358ca1 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Tue, 13 Aug 2013 09:02:52 -0500 Subject: pvpanic: fix bad merge 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 55c24f2f6f..6e1e654f3f 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 bd250718fb..10e770e362 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); } -- cgit v1.2.1