summaryrefslogtreecommitdiffstats
path: root/hw/i386/pc_piix.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-08-13 09:02:52 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-08-13 09:02:52 -0500
commit02653c5ea77bc3837376232ce508b7dd3e358ca1 (patch)
treef9441065adc2efec8a343c4cc8bbf78fd1fbd7ea /hw/i386/pc_piix.c
parent328465fd9f3a628ab320b5959d68d3d49df58fa6 (diff)
downloadhqemu-02653c5ea77bc3837376232ce508b7dd3e358ca1.zip
hqemu-02653c5ea77bc3837376232ce508b7dd3e358ca1.tar.gz
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 <armbru@redhat.com> Reported-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/i386/pc_piix.c')
-rw-r--r--hw/i386/pc_piix.c2
1 files changed, 1 insertions, 1 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);
}
OpenPOWER on IntegriCloud