| Message ID | 1442963752-10950-1-git-send-email-eblake@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 09/22/2015 07:15 PM, Eric Blake wrote: > Commit 50b7b000 improved HMP error messages, but forgot to update > qemu-iotests to match. > > Reported-by: Kevin Wolf <kwolf@redhat.com> > Signed-off-by: Eric Blake <eblake@redhat.com> > --- > > I'm not sure if this should go through Markus' "error" tree, > since that's where the break was introduced, or through a > "block" tree since it touches qemu-iotests. > > And now that I have a recipe for running qemu-iotests, I should > have no excuse for repeating this type of mistake :) > > tests/qemu-iotests/049.out | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/tests/qemu-iotests/049.out b/tests/qemu-iotests/049.out > index 0425ae0..a2b6703 100644 > --- a/tests/qemu-iotests/049.out > +++ b/tests/qemu-iotests/049.out > @@ -118,6 +118,7 @@ qemu-img: kilobytes, megabytes, gigabytes, terabytes, petabytes and exabytes. > > qemu-img create -f qcow2 -o size=foobar TEST_DIR/t.qcow2 > qemu-img: Parameter 'size' expects a size > +You may use k, M, G or T suffixes for kilobytes, megabytes, gigabytes and terabytes. > qemu-img: TEST_DIR/t.qcow2: Invalid options for file format 'qcow2' > > == Check correct interpretation of suffixes for cluster size == > Grazie, Reviewed-by: John Snow <jsnow@redhat.com>
On Wed 23 Sep 2015 01:15:52 AM CEST, Eric Blake <eblake@redhat.com> wrote: > Commit 50b7b000 improved HMP error messages, but forgot to update > qemu-iotests to match. > > Reported-by: Kevin Wolf <kwolf@redhat.com> > Signed-off-by: Eric Blake <eblake@redhat.com> Reviewed-by: Alberto Garcia <berto@igalia.com> Berto
Am 23.09.2015 um 01:15 hat Eric Blake geschrieben: > Commit 50b7b000 improved HMP error messages, but forgot to update > qemu-iotests to match. > > Reported-by: Kevin Wolf <kwolf@redhat.com> > Signed-off-by: Eric Blake <eblake@redhat.com> Thanks, applied to the block branch. > I'm not sure if this should go through Markus' "error" tree, > since that's where the break was introduced, or through a > "block" tree since it touches qemu-iotests. Doesn't really matter as long as someone takes it. And if both took it, I think git should be clever enough to figure it out without merge conflicts. Kevin
Kevin Wolf <kwolf@redhat.com> writes: > Am 23.09.2015 um 01:15 hat Eric Blake geschrieben: >> Commit 50b7b000 improved HMP error messages, but forgot to update >> qemu-iotests to match. >> >> Reported-by: Kevin Wolf <kwolf@redhat.com> >> Signed-off-by: Eric Blake <eblake@redhat.com> > > Thanks, applied to the block branch. > >> I'm not sure if this should go through Markus' "error" tree, >> since that's where the break was introduced, or through a >> "block" tree since it touches qemu-iotests. You copied both maintainers, so they can figure it out. Good move. > Doesn't really matter as long as someone takes it. And if both took > it, I think git should be clever enough to figure it out without merge > conflicts. Since you took it, I won't. Thanks!
diff --git a/tests/qemu-iotests/049.out b/tests/qemu-iotests/049.out index 0425ae0..a2b6703 100644 --- a/tests/qemu-iotests/049.out +++ b/tests/qemu-iotests/049.out @@ -118,6 +118,7 @@ qemu-img: kilobytes, megabytes, gigabytes, terabytes, petabytes and exabytes. qemu-img create -f qcow2 -o size=foobar TEST_DIR/t.qcow2 qemu-img: Parameter 'size' expects a size +You may use k, M, G or T suffixes for kilobytes, megabytes, gigabytes and terabytes. qemu-img: TEST_DIR/t.qcow2: Invalid options for file format 'qcow2' == Check correct interpretation of suffixes for cluster size ==
Commit 50b7b000 improved HMP error messages, but forgot to update qemu-iotests to match. Reported-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Eric Blake <eblake@redhat.com> --- I'm not sure if this should go through Markus' "error" tree, since that's where the break was introduced, or through a "block" tree since it touches qemu-iotests. And now that I have a recipe for running qemu-iotests, I should have no excuse for repeating this type of mistake :) tests/qemu-iotests/049.out | 1 + 1 file changed, 1 insertion(+)