]> Git Repo - qemu.git/commit
pvpanic: fix bad merge
authorAnthony Liguori <[email protected]>
Tue, 13 Aug 2013 14:02:52 +0000 (09:02 -0500)
committerAnthony Liguori <[email protected]>
Tue, 13 Aug 2013 14:02:52 +0000 (09:02 -0500)
commit02653c5ea77bc3837376232ce508b7dd3e358ca1
treef9441065adc2efec8a343c4cc8bbf78fd1fbd7ea
parent328465fd9f3a628ab320b5959d68d3d49df58fa6
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 <[email protected]>
Reported-by: Michael S. Tsirkin <[email protected]>
Signed-off-by: Anthony Liguori <[email protected]>
hw/i386/pc_piix.c
hw/i386/pc_q35.c
This page took 0.024979 seconds and 4 git commands to generate.