mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pvpanic: fix bad merge

Browse Source 
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>
This commit is contained in:
Anthony Liguori 2013-08-13 09:02:52 -05:00
parent 328465fd9f
commit 02653c5ea7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/i386/pc_piix.c
View File

@ -252,12 +252,12 @@ static void pc_init_pci(QEMUMachineInitArgs *args)
static void pc_init_pci_1_6(QEMUMachineInitArgs *args) static void pc_init_pci_1_6(QEMUMachineInitArgs *args)
{ {
has_pci_info = false; has_pci_info = false;
has_pvpanic = true;
pc_init_pci(args); pc_init_pci(args);
} }
static void pc_init_pci_1_5(QEMUMachineInitArgs *args) static void pc_init_pci_1_5(QEMUMachineInitArgs *args)
{ {
has_pvpanic = true;
pc_init_pci_1_6(args); pc_init_pci_1_6(args);
} }

2
hw/i386/pc_q35.c
View File

@ -221,12 +221,12 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
static void pc_q35_init_1_6(QEMUMachineInitArgs *args) static void pc_q35_init_1_6(QEMUMachineInitArgs *args)
{ {
has_pci_info = false; has_pci_info = false;
has_pvpanic = true;
pc_q35_init(args); pc_q35_init(args);
} }
static void pc_q35_init_1_5(QEMUMachineInitArgs *args) static void pc_q35_init_1_5(QEMUMachineInitArgs *args)
{ {
has_pvpanic = true;
pc_q35_init_1_6(args); pc_q35_init_1_6(args);
} }