Re: [Qemu-devel] [PATCH] pvpanic: fix bad merge

2013-08-14 Thread Anthony Liguori
Applied. Thanks. Regards, Anthony Liguori

Re: [Qemu-devel] [PATCH] pvpanic: fix bad merge

2013-08-13 Thread Markus Armbruster
Anthony Liguori writes: > 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 > Reported-by: Michael S. Tsirkin > Signed-off-by: Anthony Liguori Reviewed-by: Markus Armbruster

Re: [Qemu-devel] [PATCH] pvpanic: fix bad merge

2013-08-13 Thread Michael S. Tsirkin
On Tue, Aug 13, 2013 at 09:09:11AM -0500, Anthony Liguori wrote: > 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 > Reported-by: Michael S. Tsirkin > Signed-off-by: Anthony Liguori Rev

[Qemu-devel] [PATCH] pvpanic: fix bad merge

2013-08-13 Thread Anthony Liguori
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 Reported-by: Michael S. Tsirkin Signed-off-by: Anthony Liguori --- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- 2 files changed, 2 inser