| Message ID | 1386954633-28905-14-git-send-email-mreitz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 12/13/2013 10:10 AM, Max Reitz wrote: > Allowing nested file formats now results in e.g. qcow2 BlockDriverStates > never being directly passed to bdrv_open_common() from bdrv_file_open(), > but instead being handed through bdrv_open(). This changes the error > message when trying to give a filename to qcow2, i.e. trying to use it > as a driver for the protocol level. Shouldn't this be squashed with the patch that changed the error message, so that a bisection doesn't hit the broken test? Besides, touching the testsuite at the same time as the rest of the code base shows that you are aware of the changes caused by your code.
Am 13.12.2013 um 18:10 hat Max Reitz geschrieben: > Allowing nested file formats now results in e.g. qcow2 BlockDriverStates > never being directly passed to bdrv_open_common() from bdrv_file_open(), > but instead being handed through bdrv_open(). This changes the error > message when trying to give a filename to qcow2, i.e. trying to use it > as a driver for the protocol level. > > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > tests/qemu-iotests/051.out | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out > index 49e95a2..121ca66 100644 > --- a/tests/qemu-iotests/051.out > +++ b/tests/qemu-iotests/051.out > @@ -223,7 +223,7 @@ QEMU X.Y.Z monitor - type 'help' for more information > (qemu) q[K[Dqu[K[D[Dqui[K[D[D[Dquit[K > > Testing: -drive file=TEST_DIR/t.qcow2,file.driver=qcow2 > -QEMU_PROG: -drive file=TEST_DIR/t.qcow2,file.driver=qcow2: could not open disk image TEST_DIR/t.qcow2: Can't use 'qcow2' as a block driver for the protocol level > +QEMU_PROG: -drive file=TEST_DIR/t.qcow2,file.driver=qcow2: could not open disk image TEST_DIR/t.qcow2: Block format 'qcow2' used by device '' doesn't support the option 'filename' Shows that our error messages aren't really good yet. bdrv_file_open() shouldn't be talking about device names, it's the wrong layer. But that's an unrelated problem. Reviewed-by: Kevin Wolf <kwolf@redhat.com>
diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out index 49e95a2..121ca66 100644 --- a/tests/qemu-iotests/051.out +++ b/tests/qemu-iotests/051.out @@ -223,7 +223,7 @@ QEMU X.Y.Z monitor - type 'help' for more information (qemu) q[K[Dqu[K[D[Dqui[K[D[D[Dquit[K Testing: -drive file=TEST_DIR/t.qcow2,file.driver=qcow2 -QEMU_PROG: -drive file=TEST_DIR/t.qcow2,file.driver=qcow2: could not open disk image TEST_DIR/t.qcow2: Can't use 'qcow2' as a block driver for the protocol level +QEMU_PROG: -drive file=TEST_DIR/t.qcow2,file.driver=qcow2: could not open disk image TEST_DIR/t.qcow2: Block format 'qcow2' used by device '' doesn't support the option 'filename' === Parsing protocol from file name ===
Allowing nested file formats now results in e.g. qcow2 BlockDriverStates never being directly passed to bdrv_open_common() from bdrv_file_open(), but instead being handed through bdrv_open(). This changes the error message when trying to give a filename to qcow2, i.e. trying to use it as a driver for the protocol level. Signed-off-by: Max Reitz <mreitz@redhat.com> --- tests/qemu-iotests/051.out | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)