projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 328465f) | patch
pvpanic: fix bad merge
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 13 Aug 2013 14:02:52 +0000 (09:02 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 13 Aug 2013 14:02:52 +0000 (09:02 -0500)
commit02653c5ea77bc3837376232ce508b7dd3e358ca1
treef9441065adc2efec8a343c4cc8bbf78fd1fbd7eatree | snapshot
parent328465fd9f3a628ab320b5959d68d3d49df58fa6commit | diff
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>
hw/i386/pc_piix.c diff | blob | history
hw/i386/pc_q35.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.