Dario Faggioli
3206ea7c01
- Revert to revision 715. We're fixing bug 1199924, before moving to QEMU 7.0 OBS-URL: https://build.opensuse.org/request/show/979479 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=718
84 lines
3.1 KiB
Diff
84 lines
3.1 KiB
Diff
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Date: Thu, 23 Dec 2021 17:01:31 +0100
|
|
Subject: iotests.py: rewrite default luks support in qemu_img
|
|
|
|
Git-commit: 28a5ad93da08ae55c8dfac0db8615936ca14b822
|
|
|
|
Move the logic to more generic qemu_img_pipe_and_status(). Also behave
|
|
better when we have several -o options. And reuse argument parser of
|
|
course.
|
|
|
|
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
|
|
Message-Id: <20211223160144.1097696-7-vsementsov@virtuozzo.com>
|
|
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
|
|
Signed-off-by: Li Zhang <lizhang@suse.de>
|
|
---
|
|
tests/qemu-iotests/iotests.py | 36 +++++++++++++++++------------------
|
|
1 file changed, 17 insertions(+), 19 deletions(-)
|
|
|
|
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
|
|
index 5a6bfcbb6adbb84d412e37966360..f424e04573a7f7f07474e5d96f3e 100644
|
|
--- a/tests/qemu-iotests/iotests.py
|
|
+++ b/tests/qemu-iotests/iotests.py
|
|
@@ -160,9 +160,13 @@ def qemu_img_create_prepare_args(args: List[str]) -> List[str]:
|
|
args = args[1:]
|
|
|
|
p = argparse.ArgumentParser(allow_abbrev=False)
|
|
+ # -o option may be specified several times
|
|
+ p.add_argument('-o', action='append', default=[])
|
|
p.add_argument('-f')
|
|
parsed, remaining = p.parse_known_args(args)
|
|
|
|
+ opts_list = parsed.o
|
|
+
|
|
result = ['create']
|
|
if parsed.f is not None:
|
|
result += ['-f', parsed.f]
|
|
@@ -171,8 +175,18 @@ def qemu_img_create_prepare_args(args: List[str]) -> List[str]:
|
|
# like extended_l2 or compression_type for qcow2. Test may want to create
|
|
# additional images in other formats that doesn't support these options.
|
|
# So, use IMGOPTS only for images created in imgfmt format.
|
|
- if parsed.f == imgfmt and 'IMGOPTS' in os.environ:
|
|
- result += ['-o', os.environ['IMGOPTS']]
|
|
+ imgopts = os.environ.get('IMGOPTS')
|
|
+ if imgopts and parsed.f == imgfmt:
|
|
+ opts_list.insert(0, imgopts)
|
|
+
|
|
+ # default luks support
|
|
+ if parsed.f == 'luks' and \
|
|
+ all('key-secret' not in opts for opts in opts_list):
|
|
+ result += ['--object', luks_default_secret_object]
|
|
+ opts_list.append(luks_default_key_secret_opt)
|
|
+
|
|
+ for opts in opts_list:
|
|
+ result += ['-o', opts]
|
|
|
|
result += remaining
|
|
|
|
@@ -203,23 +217,7 @@ def ordered_qmp(qmsg, conv_keys=True):
|
|
return qmsg
|
|
|
|
def qemu_img_create(*args):
|
|
- args = list(args)
|
|
-
|
|
- # default luks support
|
|
- if '-f' in args and args[args.index('-f') + 1] == 'luks':
|
|
- if '-o' in args:
|
|
- i = args.index('-o')
|
|
- if 'key-secret' not in args[i + 1]:
|
|
- args[i + 1].append(luks_default_key_secret_opt)
|
|
- args.insert(i + 2, '--object')
|
|
- args.insert(i + 3, luks_default_secret_object)
|
|
- else:
|
|
- args = ['-o', luks_default_key_secret_opt,
|
|
- '--object', luks_default_secret_object] + args
|
|
-
|
|
- args.insert(0, 'create')
|
|
-
|
|
- return qemu_img(*args)
|
|
+ return qemu_img('create', *args)
|
|
|
|
def qemu_img_measure(*args):
|
|
return json.loads(qemu_img_pipe("measure", "--output", "json", *args))
|