qemu/hw/i386
Anthony Liguori 02653c5ea7 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>
2013-08-13 09:02:52 -05:00
..
kvm
Makefile.objs pc_sysfw: do not make it a device anymore 2013-08-12 09:31:14 -05:00
kvmvapic.c
multiboot.c
multiboot.h
pc.c pc_sysfw: do not make it a device anymore 2013-08-12 09:31:14 -05:00
pc_piix.c pvpanic: fix bad merge 2013-08-13 09:02:52 -05:00
pc_q35.c pvpanic: fix bad merge 2013-08-13 09:02:52 -05:00
pc_sysfw.c pc_sysfw: do not make it a device anymore 2013-08-12 09:31:14 -05:00
smbios.c
xen_domainbuild.c
xen_domainbuild.h
xen_machine_pv.c