From: Anthony Liguori Date: Tue, 5 Nov 2013 16:29:56 +0000 (-0800) Subject: Merge remote-tracking branch 'mst/tags/for_anthony' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f772a83113a9b692b94dc48b4f282224a2c6ccf2;p=qemu.git Merge remote-tracking branch 'mst/tags/for_anthony' into staging 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 # gpg: Signature made Mon 04 Nov 2013 05:42:46 AM PST using RSA key ID D28D5469 # gpg: Can't check signature: public key not found # By Michael S. Tsirkin (2) and Paolo Bonzini (1) # Via Michael S. Tsirkin * mst/tags/for_anthony: vl: allow "cont" from panicked state exec: limit system memory size pc: disable acpi info for isapc and old pc machine Message-id: 1383572851-28326-1-git-send-email-mst@redhat.com Signed-off-by: Anthony Liguori --- f772a83113a9b692b94dc48b4f282224a2c6ccf2