diff options
| author | Andreas Färber | 2013-11-05 17:46:04 +0100 |
|---|---|---|
| committer | Andreas Färber | 2013-11-05 17:46:04 +0100 |
| commit | 6d0a37354259ec446bace1a671685ba27f1fe1d6 (patch) | |
| tree | 0cd2a17c667731f1d0b9ef9427eb641771838f9d /hw/i386/pc_piix.c | |
| parent | Merge remote-tracking branch 'kwolf/tags/for-anthony' into staging (diff) | |
| parent | vl: allow "cont" from panicked state (diff) | |
| download | qemu-6d0a37354259ec446bace1a671685ba27f1fe1d6.tar.gz qemu-6d0a37354259ec446bace1a671685ba27f1fe1d6.tar.xz qemu-6d0a37354259ec446bace1a671685ba27f1fe1d6.zip | |
Merge tag 'for_anthony' of git://git.kernel.org/pub/scm/virt/kvm/mst/qemu
pci, pc, pvpanic bug fixes
This fixes strange pvpanic behaviour: you had to
pause to let VM continue (and potentially reboot on panic
if enabled).
This also fixes two bugs reported by Andreas.
One is a long-standing bug exposed by recent pci changes,
the other affects old piix machine types and was caused
by recent acpi changes.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/i386/pc_piix.c')
| -rw-r--r-- | hw/i386/pc_piix.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 24a98cbee7..4fdb7b62c5 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -309,6 +309,7 @@ static void pc_init_pci_1_2(QEMUMachineInitArgs *args) static void pc_init_pci_no_kvmclock(QEMUMachineInitArgs *args) { has_pci_info = false; + has_acpi_build = false; disable_kvm_pv_eoi(); enable_compat_apic_id_mode(); pc_init1(args, 1, 0); @@ -317,6 +318,7 @@ static void pc_init_pci_no_kvmclock(QEMUMachineInitArgs *args) static void pc_init_isa(QEMUMachineInitArgs *args) { has_pci_info = false; + has_acpi_build = false; if (!args->cpu_model) { args->cpu_model = "486"; } |