Commit fe646693 authored Jul 07, 2015 by Kővágó, Zoltán Committed by Michael Tokarev Sep 11, 2015

opts: produce valid command line in qemu_opts_print



This will let us print options in a format that the user would actually
write it on the command line (foo=bar,baz=asd,etc=def), without
prepending a spurious comma at the beginning of the list, or quoting
values unnecessarily.  This patch provides the following changes:
* write and id=, if the option has an id
* do not print separator before the first element
* do not quote string arguments
* properly escape commas (,) for QEMU

Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu@gmail.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

parent 71e0e067

tests/qemu-iotests/017.out

+1 −1

Original line number	Diff line number	Diff line
		@@ -269,7 +269,7 @@ wrote 65536/65536 bytes at offset 4295032832
		No errors were found on the image.
		Creating test image with backing file

		Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 backing_file='TEST_DIR/t.IMGFMT.base'
		Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 backing_file=TEST_DIR/t.IMGFMT.base
		Filling test image

		=== IO: pattern 1

tests/qemu-iotests/018.out

+1 −1

Original line number	Diff line number	Diff line
		@@ -269,7 +269,7 @@ wrote 65536/65536 bytes at offset 4295032832
		No errors were found on the image.
		Creating test image with backing file

		Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 backing_file='TEST_DIR/t.IMGFMT.base'
		Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 backing_file=TEST_DIR/t.IMGFMT.base
		Filling test image

		=== IO: pattern 1

tests/qemu-iotests/019.out

+1 −1

Original line number	Diff line number	Diff line
		@@ -269,7 +269,7 @@ wrote 65536/65536 bytes at offset 4296015872
		No errors were found on the image.
		Creating test image with backing file

		Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 backing_file='TEST_DIR/t.IMGFMT.base'
		Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 backing_file=TEST_DIR/t.IMGFMT.base
		Filling test image

		=== IO: pattern 43

tests/qemu-iotests/020.out

+1 −1

Original line number	Diff line number	Diff line
		@@ -269,7 +269,7 @@ wrote 65536/65536 bytes at offset 4295032832
		No errors were found on the image.
		Creating test image with backing file

		Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 backing_file='TEST_DIR/t.IMGFMT.base'
		Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 backing_file=TEST_DIR/t.IMGFMT.base
		Filling test image

		=== IO: pattern 1

tests/qemu-iotests/024.out

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ wrote 131072/131072 bytes at offset 786432
		128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
		Creating COW image

		Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 backing_file='TEST_DIR/t.IMGFMT.base_old'
		Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 backing_file=TEST_DIR/t.IMGFMT.base_old
		=== IO: pattern 0x33
		wrote 262144/262144 bytes at offset 0
		256 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)