Commit 02653c5e authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Reported-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 328465fd

hw/i386/pc_piix.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

hw/i386/pc_q35.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}