On Wed, Sep 17, 2014 at 01:31:06PM +0200, Kevin Wolf wrote: > The device_name of a BlockDriverState is currently checked because it is > always used as a QemuOpts ID and qemu_opts_create() checks whether such > IDs are wellformed. > > node-name is supposed to share the same namespace, but it isn't checked > currently. This patch adds explicit checks both for device_name and > node-name so that the same rules will still apply even if QemuOpts won't > be used any more at some point. > > Signed-off-by: Kevin Wolf <kw...@redhat.com> > --- > block.c | 16 +++++++++++++--- > include/qemu/option.h | 1 + > util/qemu-option.c | 4 ++-- > 3 files changed, 16 insertions(+), 5 deletions(-)
This patch breaks qemu-iotests 048 and 055. Please fix and resend, I
have dropped it from the block branch:
048 3s ... - output mismatch (see 048.out.bad)
--- /home/stefanha/qemu/tests/qemu-iotests/048.out 2014-09-16
16:37:56.617967668 +0100
+++ 048.out.bad 2014-09-19 14:19:44.428753385 +0100
@@ -9,25 +9,31 @@
4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
wrote 4096/4096 bytes at offset 536576
4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-Images are identical.
-0
-0
+qemu-img: Invalid device name
+./048: line 39: 11542 Aborted (core dumped) $QEMU_IMG compare
"$@" "$TEST_IMG" "${TEST_IMG2}"
+134
+qemu-img: Invalid device name
+./048: line 39: 11547 Aborted (core dumped) $QEMU_IMG compare
"$@" "$TEST_IMG" "${TEST_IMG2}"
+134
Image resized.
-Warning: Image size mismatch!
-Images are identical.
-0
-Strict mode: Image size mismatch!
-1
+qemu-img: Invalid device name
+./048: line 39: 11551 Aborted (core dumped) $QEMU_IMG compare
"$@" "$TEST_IMG" "${TEST_IMG2}"
+134
+qemu-img: Invalid device name
+./048: line 39: 11553 Aborted (core dumped) $QEMU_IMG compare
"$@" "$TEST_IMG" "${TEST_IMG2}"
+134
=== IO: pattern 67
wrote 4096/4096 bytes at offset 1228800
4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-Content mismatch at offset 1228800!
-1
+qemu-img: Invalid device name
+./048: line 39: 11563 Aborted (core dumped) $QEMU_IMG compare
"$@" "$TEST_IMG" "${TEST_IMG2}"
+134
=== IO: pattern 123
wrote 4096/4096 bytes at offset 0
4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-Content mismatch at offset 0!
-1
+qemu-img: Invalid device name
+./048: line 39: 11573 Aborted (core dumped) $QEMU_IMG compare
"$@" "$TEST_IMG" "${TEST_IMG2}"
+134
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
=== IO: pattern 100
wrote 512/512 bytes at offset 0
@@ -35,6 +41,7 @@
=== IO: pattern 101
wrote 512/512 bytes at offset 512
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-Content mismatch at offset 512!
-1
+qemu-img: Invalid device name
+./048: line 39: 11596 Aborted (core dumped) $QEMU_IMG compare
"$@" "$TEST_IMG" "${TEST_IMG2}"
+134
Cleanup
055 9s ... [failed, exit status 1] - output mismatch (see 055.out.bad)
--- /home/stefanha/qemu/tests/qemu-iotests/055.out 2014-03-14
08:29:48.818442477 +0000
+++ 055.out.bad 2014-09-19 14:19:51.739791191 +0100
@@ -1,5 +1,23 @@
-..............
+qemu-img: Invalid device name
+qemu-img: Invalid device name
+.......F.....F
+======================================================================
+FAIL: test_pause (__main__.TestSingleDrive)
+----------------------------------------------------------------------
+Traceback (most recent call last):
+ File "055", line 90, in test_pause
+ 'target image does not match source after backup')
+AssertionError: target image does not match source after backup
+
+======================================================================
+FAIL: test_pause (__main__.TestSingleTransaction)
+----------------------------------------------------------------------
+Traceback (most recent call last):
+ File "055", line 252, in test_pause
+ 'target image does not match source after backup')
+AssertionError: target image does not match source after backup
+
----------------------------------------------------------------------
Ran 14 tests
-OK
+FAILED (failures=2)
Failures: 048 055
Failed 2 of 2 tests
pgpkyVLNaGGFH.pgp
Description: PGP signature
