| Message ID | 1500973176-29235-1-git-send-email-kwolf@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Kevin Wolf <kwolf@redhat.com> writes: > 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> Reviewed-by: Markus Armbruster <armbru@redhat.com>
On Tue, Jul 25, 2017 at 10:59:36AM +0200, Kevin Wolf wrote: > 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> > --- > tests/qemu-iotests/186.out | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
On 2017-07-25 10:59, Kevin Wolf wrote: > 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> > --- > tests/qemu-iotests/186.out | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Thanks, applied to my block tree: https://github.com/XanClic/qemu/commits/block Max
On 2017-07-25 10:59, Kevin Wolf wrote: > 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> > --- > tests/qemu-iotests/186.out | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) I've noticed that test 186 fails when not using qemu-system-x86_64, though (just build with --target-list=i386-softmmu, for example). But this patch doesn't make it worse, so I'll keep it. Max
diff --git a/tests/qemu-iotests/186.out b/tests/qemu-iotests/186.out index b963b12..b8bf9a2 100644 --- a/tests/qemu-iotests/186.out +++ b/tests/qemu-iotests/186.out @@ -442,7 +442,7 @@ ide0-cd0 (NODE_NAME): null-co:// (null-co, read-only) Cache mode: writeback (qemu) quit -warning: qemu-system-x86_64: -drive if=scsi,driver=null-co: bus=0,unit=0 is deprecated with this machine type +qemu-system-x86_64: -drive if=scsi,driver=null-co: warning: bus=0,unit=0 is deprecated with this machine type Testing: -drive if=scsi,driver=null-co QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block @@ -451,7 +451,7 @@ scsi0-hd0 (NODE_NAME): null-co:// (null-co) Cache mode: writeback (qemu) quit -warning: qemu-system-x86_64: -drive if=scsi,media=cdrom: bus=0,unit=0 is deprecated with this machine type +qemu-system-x86_64: -drive if=scsi,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type Testing: -drive if=scsi,media=cdrom QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block @@ -460,7 +460,7 @@ scsi0-cd0: [not inserted] Removable device: not locked, tray closed (qemu) quit -warning: qemu-system-x86_64: -drive if=scsi,driver=null-co,media=cdrom: bus=0,unit=0 is deprecated with this machine type +qemu-system-x86_64: -drive if=scsi,driver=null-co,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type Testing: -drive if=scsi,driver=null-co,media=cdrom QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block
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> --- tests/qemu-iotests/186.out | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)