diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-08-13 09:02:52 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-08-13 09:02:52 -0500 |
| commit | 02653c5ea77bc3837376232ce508b7dd3e358ca1 (patch) | |
| tree | f9441065adc2efec8a343c4cc8bbf78fd1fbd7ea /qemu-char.c | |
| parent | 328465fd9f3a628ab320b5959d68d3d49df58fa6 (diff) | |
| download | qemu-02653c5ea77bc3837376232ce508b7dd3e358ca1.tar.gz qemu-02653c5ea77bc3837376232ce508b7dd3e358ca1.tar.bz2 qemu-02653c5ea77bc3837376232ce508b7dd3e358ca1.zip | |
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>
Diffstat (limited to 'qemu-char.c')
0 files changed, 0 insertions, 0 deletions