aboutsummaryrefslogtreecommitdiff
path: root/hw/display
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2017-07-25 10:59:36 +0200
committerMax Reitz <mreitz@redhat.com>2017-07-25 16:33:58 +0200
commitbd998d7cc8ced211def90e4225042d63dddecc54 (patch)
treef2f1d7ad1922c1a0d73a1cfd739a5b01a7712bfc /hw/display
parentb6b75a99dab760c902c3d355519e0dc2616872e1 (diff)
downloadqemu-bd998d7cc8ced211def90e4225042d63dddecc54.zip
qemu-bd998d7cc8ced211def90e4225042d63dddecc54.tar.gz
qemu-bd998d7cc8ced211def90e4225042d63dddecc54.tar.bz2
qemu-iotests: Fix reference output for 186
Commits 70f17a1 ('error: Revert unwanted change of warning messages') and e1824e5 ('qemu-iotests: Test 'info block'') had a semantic merge conflict, which results in failure for qemu-iotests case 186. Fix the reference output to consider the changes of 70f17a1. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Message-id: 1500973176-29235-1-git-send-email-kwolf@redhat.com Reviewed-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'hw/display')
0 files changed, 0 insertions, 0 deletions