From nobody Mon Feb 9 01:22:15 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617972763; cv=none; d=zohomail.com; s=zohoarc; b=XU8EgsF4NvzlUTTFIlXA7oU3Qv9teIFEOtH4yYaysU/3Y+bluwLTl+8Ytg7mKYYMURMmxZfIG2BKfW9kg0qWN8kDYG81zeTZW5dJbZ8SA1tffixb1+2aykO7DsY4K17//s0lyTznRHfnVsNVsQuKhjHKGGL4FUz3fZZA0X2DIJY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617972763; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=G+o+xn98tLGJE82aeGBwYmaMAOw7EyM1cvK22Ddjm7k=; b=CTMAr4618wxWlMGGgNo7L2MXWLRcT/HwyAe0tMirHY07fcd2a4io6PXkwh3bSryE2DJfOpUWXFbjy53aTaxgTkHt2oQcJPa//p4tFg4Ev3i5EejlAMtuHlgSU3FZVA0iJI93+Q199KD8+kYN71STyH4V7xlqc8i1HGqS2TESO+M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1617972763440668.9244883338654; Fri, 9 Apr 2021 05:52:43 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-356-xAsdxdtMNgiqAnIhm6sg7g-1; Fri, 09 Apr 2021 08:52:40 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4288B83DD22; Fri, 9 Apr 2021 12:52:35 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1758C101E5AF; Fri, 9 Apr 2021 12:52:35 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CD2251806D0E; Fri, 9 Apr 2021 12:52:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 139CqX0q009310 for ; Fri, 9 Apr 2021 08:52:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7E4765C1A1; Fri, 9 Apr 2021 12:52:33 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id A58EA5C1D5 for ; Fri, 9 Apr 2021 12:52:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617972762; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=G+o+xn98tLGJE82aeGBwYmaMAOw7EyM1cvK22Ddjm7k=; b=JdlrqUBYqtIIFzTOr9YekHWaIUia2n4zGbcR+86hk8nn/Brdv003J+gwXRR0SpeQLFaXIa 47N4dbYWboO4wYpTiwOvfeA39DzLvlsU95k0lVinSqo227Znrvb7ptRJvTYctR/qOkoXO9 8c5fo87ZgHzMfME5j9qKlyBl9p1qOVw= X-MC-Unique: xAsdxdtMNgiqAnIhm6sg7g-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 20/25] storagevolxml2argvtest: Use internal wrapping of command line arguments Date: Fri, 9 Apr 2021 14:50:22 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" virCommandToString has the possibility to return an already wrapped string with better format than what we get from the test wrapper script. Signed-off-by: Peter Krempa --- tests/storagevolxml2argvdata/iso-input.argv | 4 +++- tests/storagevolxml2argvdata/iso.argv | 4 +++- .../storagevolxml2argvdata/logical-from-qcow2.argv | 4 +++- tests/storagevolxml2argvdata/luks-cipher.argv | 6 +++--- .../luks-convert-encrypt.argv | 12 +++++------- .../luks-convert-encrypt2fileqcow2.argv | 12 ++++++------ .../luks-convert-encrypt2fileraw.argv | 12 ++++++------ .../storagevolxml2argvdata/luks-convert-qcow2.argv | 11 +++++------ tests/storagevolxml2argvdata/luks-convert.argv | 10 +++++----- tests/storagevolxml2argvdata/luks.argv | 3 ++- tests/storagevolxml2argvdata/qcow2-1.1.argv | 4 +++- tests/storagevolxml2argvdata/qcow2-compat.argv | 4 +++- .../qcow2-from-logical-compat.argv | 4 +++- tests/storagevolxml2argvdata/qcow2-lazy.argv | 5 +++-- .../qcow2-luks-convert-encrypt.argv | 14 ++++++-------- .../qcow2-luks-convert-encrypt2fileqcow2.argv | 12 ++++++------ .../qcow2-luks-convert-encrypt2fileraw.argv | 12 ++++++------ tests/storagevolxml2argvdata/qcow2-luks.argv | 6 +++--- .../qcow2-nobacking-convert-prealloc-compat.argv | 4 ++-- .../qcow2-nobacking-prealloc-compat.argv | 5 +++-- .../qcow2-nocapacity-convert-prealloc.argv | 4 ++-- tests/storagevolxml2argvdata/qcow2-nocapacity.argv | 3 ++- .../storagevolxml2argvdata/qcow2-nocow-compat.argv | 5 +++-- .../storagevolxml2argvdata/qcow2-zerocapacity.argv | 4 +++- tests/storagevolxml2argvtest.c | 6 +++--- 25 files changed, 92 insertions(+), 78 deletions(-) diff --git a/tests/storagevolxml2argvdata/iso-input.argv b/tests/storagevol= xml2argvdata/iso-input.argv index 203f27ca22..16e0e91a4c 100644 --- a/tests/storagevolxml2argvdata/iso-input.argv +++ b/tests/storagevolxml2argvdata/iso-input.argv @@ -1,4 +1,6 @@ qemu-img \ convert \ -f raw \ --O raw /var/lib/libvirt/images/test.iso /var/lib/libvirt/images/sparse.img +-O raw \ +/var/lib/libvirt/images/test.iso \ +/var/lib/libvirt/images/sparse.img diff --git a/tests/storagevolxml2argvdata/iso.argv b/tests/storagevolxml2ar= gvdata/iso.argv index f74505ecec..52b29a51c2 100644 --- a/tests/storagevolxml2argvdata/iso.argv +++ b/tests/storagevolxml2argvdata/iso.argv @@ -1,3 +1,5 @@ qemu-img \ create \ --f raw /var/lib/libvirt/images/test.iso 1024K +-f raw \ +/var/lib/libvirt/images/test.iso \ +1024K diff --git a/tests/storagevolxml2argvdata/logical-from-qcow2.argv b/tests/s= toragevolxml2argvdata/logical-from-qcow2.argv index c1b3cef4b9..3da4dada9b 100644 --- a/tests/storagevolxml2argvdata/logical-from-qcow2.argv +++ b/tests/storagevolxml2argvdata/logical-from-qcow2.argv @@ -1,4 +1,6 @@ qemu-img \ convert \ -f qcow2 \ --O raw /var/lib/libvirt/images/OtherDemo.img /dev/HostVG/Swap +-O raw \ +/var/lib/libvirt/images/OtherDemo.img \ +/dev/HostVG/Swap diff --git a/tests/storagevolxml2argvdata/luks-cipher.argv b/tests/storagev= olxml2argvdata/luks-cipher.argv index bb4438949c..f482018182 100644 --- a/tests/storagevolxml2argvdata/luks-cipher.argv +++ b/tests/storagevolxml2argvdata/luks-cipher.argv @@ -2,6 +2,6 @@ qemu-img \ create \ -f luks \ --object secret,id=3DLuksDemo.img_encrypt0,file=3D/path/to/secretFile \ --o key-secret=3DLuksDemo.img_encrypt0,cipher-alg=3Dserpent-256,cipher-mode= =3Dcbc,\ -hash-alg=3Dsha256,ivgen-alg=3Dplain64,\ -ivgen-hash-alg=3Dsha256 /var/lib/libvirt/images/LuksDemo.img 5242880K +-o key-secret=3DLuksDemo.img_encrypt0,cipher-alg=3Dserpent-256,cipher-mode= =3Dcbc,hash-alg=3Dsha256,ivgen-alg=3Dplain64,ivgen-hash-alg=3Dsha256 \ +/var/lib/libvirt/images/LuksDemo.img \ +5242880K diff --git a/tests/storagevolxml2argvdata/luks-convert-encrypt.argv b/tests= /storagevolxml2argvdata/luks-convert-encrypt.argv index 456ae621d1..307e08c9b4 100644 --- a/tests/storagevolxml2argvdata/luks-convert-encrypt.argv +++ b/tests/storagevolxml2argvdata/luks-convert-encrypt.argv @@ -2,7 +2,8 @@ qemu-img \ create \ -f luks \ --object secret,id=3DLuksDemo.img_encrypt0,file=3D/path/to/secretFile \ --o key-secret=3DLuksDemo.img_encrypt0 /var/lib/libvirt/images/LuksDemo.img= \ +-o key-secret=3DLuksDemo.img_encrypt0 \ +/var/lib/libvirt/images/LuksDemo.img \ 5242880K qemu-img \ convert \ @@ -10,9 +11,6 @@ convert \ -n \ --target-image-opts \ --object secret,id=3DLuksDemo.img_encrypt0,file=3D/path/to/secretFile \ ---object secret,id=3DOtherDemo.img_encrypt0,\ -file=3D/path/to/inputSecretFile driver=3Dluks,\ -file.filename=3D/var/lib/libvirt/images/OtherDemo.img,\ -key-secret=3DOtherDemo.img_encrypt0 driver=3Dluks,\ -file.filename=3D/var/lib/libvirt/images/LuksDemo.img,\ -key-secret=3DLuksDemo.img_encrypt0 +--object secret,id=3DOtherDemo.img_encrypt0,file=3D/path/to/inputSecretFil= e \ +driver=3Dluks,file.filename=3D/var/lib/libvirt/images/OtherDemo.img,key-se= cret=3DOtherDemo.img_encrypt0 \ +driver=3Dluks,file.filename=3D/var/lib/libvirt/images/LuksDemo.img,key-sec= ret=3DLuksDemo.img_encrypt0 diff --git a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.ar= gv b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv index 1320e2ee2f..4b9ccfe8dc 100644 --- a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv +++ b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv @@ -1,14 +1,14 @@ qemu-img \ create \ -f qcow2 \ --o compat=3D0.10 /var/lib/libvirt/images/sparse-qcow2.img 1073741824K +-o compat=3D0.10 \ +/var/lib/libvirt/images/sparse-qcow2.img \ +1073741824K qemu-img \ convert \ --image-opts \ -n \ --target-image-opts \ ---object secret,id=3DOtherDemo.img_encrypt0,\ -file=3D/path/to/inputSecretFile driver=3Dluks,\ -file.filename=3D/var/lib/libvirt/images/OtherDemo.img,\ -key-secret=3DOtherDemo.img_encrypt0 driver=3Dqcow2,\ -file.filename=3D/var/lib/libvirt/images/sparse-qcow2.img +--object secret,id=3DOtherDemo.img_encrypt0,file=3D/path/to/inputSecretFil= e \ +driver=3Dluks,file.filename=3D/var/lib/libvirt/images/OtherDemo.img,key-se= cret=3DOtherDemo.img_encrypt0 \ +driver=3Dqcow2,file.filename=3D/var/lib/libvirt/images/sparse-qcow2.img diff --git a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv= b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv index e140850217..d48dbf371c 100644 --- a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv +++ b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv @@ -1,13 +1,13 @@ qemu-img \ create \ --f raw /var/lib/libvirt/images/sparse.img 1073741824K +-f raw \ +/var/lib/libvirt/images/sparse.img \ +1073741824K qemu-img \ convert \ --image-opts \ -n \ --target-image-opts \ ---object secret,id=3DOtherDemo.img_encrypt0,\ -file=3D/path/to/inputSecretFile driver=3Dluks,\ -file.filename=3D/var/lib/libvirt/images/OtherDemo.img,\ -key-secret=3DOtherDemo.img_encrypt0 driver=3Draw,\ -file.filename=3D/var/lib/libvirt/images/sparse.img +--object secret,id=3DOtherDemo.img_encrypt0,file=3D/path/to/inputSecretFil= e \ +driver=3Dluks,file.filename=3D/var/lib/libvirt/images/OtherDemo.img,key-se= cret=3DOtherDemo.img_encrypt0 \ +driver=3Draw,file.filename=3D/var/lib/libvirt/images/sparse.img diff --git a/tests/storagevolxml2argvdata/luks-convert-qcow2.argv b/tests/s= toragevolxml2argvdata/luks-convert-qcow2.argv index 78cd9a2a8d..050d6fce0d 100644 --- a/tests/storagevolxml2argvdata/luks-convert-qcow2.argv +++ b/tests/storagevolxml2argvdata/luks-convert-qcow2.argv @@ -2,15 +2,14 @@ qemu-img \ create \ -f luks \ --object secret,id=3DOtherDemo.img_encrypt0,file=3D/path/to/secretFile \ --o key-secret=3DOtherDemo.img_encrypt0 /var/lib/libvirt/images/OtherDemo.i= mg \ +-o key-secret=3DOtherDemo.img_encrypt0 \ +/var/lib/libvirt/images/OtherDemo.img \ 5242880K qemu-img \ convert \ --image-opts \ -n \ --target-image-opts \ ---object secret,id=3DOtherDemo.img_encrypt0,\ -file=3D/path/to/secretFile driver=3Dqcow2,\ -file.filename=3D/var/lib/libvirt/images/sparse-qcow2.img driver=3Dluks,\ -file.filename=3D/var/lib/libvirt/images/OtherDemo.img,\ -key-secret=3DOtherDemo.img_encrypt0 +--object secret,id=3DOtherDemo.img_encrypt0,file=3D/path/to/secretFile \ +driver=3Dqcow2,file.filename=3D/var/lib/libvirt/images/sparse-qcow2.img \ +driver=3Dluks,file.filename=3D/var/lib/libvirt/images/OtherDemo.img,key-se= cret=3DOtherDemo.img_encrypt0 diff --git a/tests/storagevolxml2argvdata/luks-convert.argv b/tests/storage= volxml2argvdata/luks-convert.argv index e4a8277d7f..5b6bc7bc63 100644 --- a/tests/storagevolxml2argvdata/luks-convert.argv +++ b/tests/storagevolxml2argvdata/luks-convert.argv @@ -2,14 +2,14 @@ qemu-img \ create \ -f luks \ --object secret,id=3DOtherDemo.img_encrypt0,file=3D/path/to/secretFile \ --o key-secret=3DOtherDemo.img_encrypt0 /var/lib/libvirt/images/OtherDemo.i= mg \ +-o key-secret=3DOtherDemo.img_encrypt0 \ +/var/lib/libvirt/images/OtherDemo.img \ 5242880K qemu-img \ convert \ --image-opts \ -n \ --target-image-opts \ ---object secret,id=3DOtherDemo.img_encrypt0,file=3D/path/to/secretFile dri= ver=3Draw,\ -file.filename=3D/var/lib/libvirt/images/sparse.img driver=3Dluks,\ -file.filename=3D/var/lib/libvirt/images/OtherDemo.img,\ -key-secret=3DOtherDemo.img_encrypt0 +--object secret,id=3DOtherDemo.img_encrypt0,file=3D/path/to/secretFile \ +driver=3Draw,file.filename=3D/var/lib/libvirt/images/sparse.img \ +driver=3Dluks,file.filename=3D/var/lib/libvirt/images/OtherDemo.img,key-se= cret=3DOtherDemo.img_encrypt0 diff --git a/tests/storagevolxml2argvdata/luks.argv b/tests/storagevolxml2a= rgvdata/luks.argv index 5013c8ca7f..41b5fd663c 100644 --- a/tests/storagevolxml2argvdata/luks.argv +++ b/tests/storagevolxml2argvdata/luks.argv @@ -2,5 +2,6 @@ qemu-img \ create \ -f luks \ --object secret,id=3DLuksDemo.img_encrypt0,file=3D/path/to/secretFile \ --o key-secret=3DLuksDemo.img_encrypt0 /var/lib/libvirt/images/LuksDemo.img= \ +-o key-secret=3DLuksDemo.img_encrypt0 \ +/var/lib/libvirt/images/LuksDemo.img \ 5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-1.1.argv b/tests/storagevol= xml2argvdata/qcow2-1.1.argv index 5ee974afe9..40fbe065e0 100644 --- a/tests/storagevolxml2argvdata/qcow2-1.1.argv +++ b/tests/storagevolxml2argvdata/qcow2-1.1.argv @@ -2,4 +2,6 @@ qemu-img \ create \ -f qcow2 \ -b /dev/null \ --o backing_fmt=3Draw,compat=3D1.1 /var/lib/libvirt/images/OtherDemo.img 52= 42880K +-o backing_fmt=3Draw,compat=3D1.1 \ +/var/lib/libvirt/images/OtherDemo.img \ +5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-compat.argv b/tests/storage= volxml2argvdata/qcow2-compat.argv index 3071d7a790..bf3a50a7f3 100644 --- a/tests/storagevolxml2argvdata/qcow2-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-compat.argv @@ -2,4 +2,6 @@ qemu-img \ create \ -f qcow2 \ -b /dev/null \ --o backing_fmt=3Draw,compat=3D0.10 /var/lib/libvirt/images/OtherDemo.img 5= 242880K +-o backing_fmt=3Draw,compat=3D0.10 \ +/var/lib/libvirt/images/OtherDemo.img \ +5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv b/= tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv index 1971da200d..dbc7deb16a 100644 --- a/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv @@ -2,4 +2,6 @@ qemu-img \ convert \ -f raw \ -O qcow2 \ --o compat=3D0.10 /dev/HostVG/Swap /var/lib/libvirt/images/OtherDemo.img +-o compat=3D0.10 \ +/dev/HostVG/Swap \ +/var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-lazy.argv b/tests/storagevo= lxml2argvdata/qcow2-lazy.argv index 2621b01168..cd551be6e9 100644 --- a/tests/storagevolxml2argvdata/qcow2-lazy.argv +++ b/tests/storagevolxml2argvdata/qcow2-lazy.argv @@ -2,5 +2,6 @@ qemu-img \ create \ -f qcow2 \ -b /dev/null \ --o backing_fmt=3Draw,compat=3D1.1,\ -lazy_refcounts /var/lib/libvirt/images/OtherDemo.img 5242880K +-o backing_fmt=3Draw,compat=3D1.1,lazy_refcounts \ +/var/lib/libvirt/images/OtherDemo.img \ +5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv b= /tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv index de8aef4233..d89622d4a6 100644 --- a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv +++ b/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt.argv @@ -2,17 +2,15 @@ qemu-img \ create \ -f qcow2 \ --object secret,id=3DOtherDemoLuks.img_encrypt0,file=3D/path/to/secretFile= \ --o encrypt.format=3Dluks,encrypt.key-secret=3DOtherDemoLuks.img_encrypt0,\ -compat=3D0.10 /var/lib/libvirt/images/OtherDemoLuks.img 5242880K +-o encrypt.format=3Dluks,encrypt.key-secret=3DOtherDemoLuks.img_encrypt0,c= ompat=3D0.10 \ +/var/lib/libvirt/images/OtherDemoLuks.img \ +5242880K qemu-img \ convert \ --image-opts \ -n \ --target-image-opts \ --object secret,id=3DOtherDemoLuks.img_encrypt0,file=3D/path/to/secretFile= \ ---object secret,id=3DOtherDemoLuksConvert.img_encrypt0,\ -file=3D/path/to/inputSecretFile driver=3Dqcow2,\ -file.filename=3D/var/lib/libvirt/images/OtherDemoLuksConvert.img,\ -encrypt.key-secret=3DOtherDemoLuksConvert.img_encrypt0 driver=3Dqcow2,\ -file.filename=3D/var/lib/libvirt/images/OtherDemoLuks.img,\ -encrypt.key-secret=3DOtherDemoLuks.img_encrypt0 +--object secret,id=3DOtherDemoLuksConvert.img_encrypt0,file=3D/path/to/inp= utSecretFile \ +driver=3Dqcow2,file.filename=3D/var/lib/libvirt/images/OtherDemoLuksConver= t.img,encrypt.key-secret=3DOtherDemoLuksConvert.img_encrypt0 \ +driver=3Dqcow2,file.filename=3D/var/lib/libvirt/images/OtherDemoLuks.img,e= ncrypt.key-secret=3DOtherDemoLuks.img_encrypt0 diff --git a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileqc= ow2.argv b/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileqcow= 2.argv index 517156ca83..4d910552d0 100644 --- a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileqcow2.argv +++ b/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileqcow2.argv @@ -1,14 +1,14 @@ qemu-img \ create \ -f qcow2 \ --o compat=3D0.10 /var/lib/libvirt/images/sparse-qcow2.img 1073741824K +-o compat=3D0.10 \ +/var/lib/libvirt/images/sparse-qcow2.img \ +1073741824K qemu-img \ convert \ --image-opts \ -n \ --target-image-opts \ ---object secret,id=3DOtherDemoLuksConvert.img_encrypt0,\ -file=3D/path/to/inputSecretFile driver=3Dqcow2,\ -file.filename=3D/var/lib/libvirt/images/OtherDemoLuksConvert.img,\ -encrypt.key-secret=3DOtherDemoLuksConvert.img_encrypt0 driver=3Dqcow2,\ -file.filename=3D/var/lib/libvirt/images/sparse-qcow2.img +--object secret,id=3DOtherDemoLuksConvert.img_encrypt0,file=3D/path/to/inp= utSecretFile \ +driver=3Dqcow2,file.filename=3D/var/lib/libvirt/images/OtherDemoLuksConver= t.img,encrypt.key-secret=3DOtherDemoLuksConvert.img_encrypt0 \ +driver=3Dqcow2,file.filename=3D/var/lib/libvirt/images/sparse-qcow2.img diff --git a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2filera= w.argv b/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileraw.ar= gv index 7483c864c1..24197bfd64 100644 --- a/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileraw.argv +++ b/tests/storagevolxml2argvdata/qcow2-luks-convert-encrypt2fileraw.argv @@ -1,13 +1,13 @@ qemu-img \ create \ --f raw /var/lib/libvirt/images/sparse.img 1073741824K +-f raw \ +/var/lib/libvirt/images/sparse.img \ +1073741824K qemu-img \ convert \ --image-opts \ -n \ --target-image-opts \ ---object secret,id=3DOtherDemoLuksConvert.img_encrypt0,\ -file=3D/path/to/inputSecretFile driver=3Dqcow2,\ -file.filename=3D/var/lib/libvirt/images/OtherDemoLuksConvert.img,\ -encrypt.key-secret=3DOtherDemoLuksConvert.img_encrypt0 driver=3Draw,\ -file.filename=3D/var/lib/libvirt/images/sparse.img +--object secret,id=3DOtherDemoLuksConvert.img_encrypt0,file=3D/path/to/inp= utSecretFile \ +driver=3Dqcow2,file.filename=3D/var/lib/libvirt/images/OtherDemoLuksConver= t.img,encrypt.key-secret=3DOtherDemoLuksConvert.img_encrypt0 \ +driver=3Draw,file.filename=3D/var/lib/libvirt/images/sparse.img diff --git a/tests/storagevolxml2argvdata/qcow2-luks.argv b/tests/storagevo= lxml2argvdata/qcow2-luks.argv index 4b51b374ca..308316c90c 100644 --- a/tests/storagevolxml2argvdata/qcow2-luks.argv +++ b/tests/storagevolxml2argvdata/qcow2-luks.argv @@ -3,6 +3,6 @@ create \ -f qcow2 \ -b /dev/null \ --object secret,id=3DOtherDemoLuks.img_encrypt0,file=3D/path/to/secretFile= \ --o backing_fmt=3Draw,encrypt.format=3Dluks,\ -encrypt.key-secret=3DOtherDemoLuks.img_encrypt0,\ -compat=3D0.10 /var/lib/libvirt/images/OtherDemoLuks.img 5242880K +-o backing_fmt=3Draw,encrypt.format=3Dluks,encrypt.key-secret=3DOtherDemoL= uks.img_encrypt0,compat=3D0.10 \ +/var/lib/libvirt/images/OtherDemoLuks.img \ +5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-= compat.argv b/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc= -compat.argv index 87489641d5..463ae26779 100644 --- a/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.= argv +++ b/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.= argv @@ -2,6 +2,6 @@ qemu-img \ convert \ -f raw \ -O qcow2 \ --o preallocation=3Dmetadata,\ -compat=3D0.10 /var/lib/libvirt/images/sparse.img \ +-o preallocation=3Dmetadata,compat=3D0.10 \ +/var/lib/libvirt/images/sparse.img \ /var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.a= rgv b/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv index a883030744..510e0c13f6 100644 --- a/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv @@ -1,5 +1,6 @@ qemu-img \ create \ -f qcow2 \ --o preallocation=3Dmetadata,\ -compat=3D0.10 /var/lib/libvirt/images/OtherDemo.img 5242880K +-o preallocation=3Dmetadata,compat=3D0.10 \ +/var/lib/libvirt/images/OtherDemo.img \ +5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc= .argv b/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv index 049d2d73b5..0152b1efb6 100644 --- a/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv +++ b/tests/storagevolxml2argvdata/qcow2-nocapacity-convert-prealloc.argv @@ -2,6 +2,6 @@ qemu-img \ convert \ -f raw \ -O qcow2 \ --o preallocation=3Dfalloc,\ -compat=3D0.10 /var/lib/libvirt/images/sparse.img \ +-o preallocation=3Dfalloc,compat=3D0.10 \ +/var/lib/libvirt/images/sparse.img \ /var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-nocapacity.argv b/tests/sto= ragevolxml2argvdata/qcow2-nocapacity.argv index 30bcfb00c7..047932a559 100644 --- a/tests/storagevolxml2argvdata/qcow2-nocapacity.argv +++ b/tests/storagevolxml2argvdata/qcow2-nocapacity.argv @@ -2,4 +2,5 @@ qemu-img \ create \ -f qcow2 \ -b /dev/null \ --o backing_fmt=3Draw,compat=3D0.10 /var/lib/libvirt/images/OtherDemo.img +-o backing_fmt=3Draw,compat=3D0.10 \ +/var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv b/tests/s= toragevolxml2argvdata/qcow2-nocow-compat.argv index 5e327dab0b..4cc7904cfc 100644 --- a/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv +++ b/tests/storagevolxml2argvdata/qcow2-nocow-compat.argv @@ -2,5 +2,6 @@ qemu-img \ create \ -f qcow2 \ -b /dev/null \ --o backing_fmt=3Draw,nocow=3Don,\ -compat=3D0.10 /var/lib/libvirt/images/OtherDemo.img 5242880K +-o backing_fmt=3Draw,nocow=3Don,compat=3D0.10 \ +/var/lib/libvirt/images/OtherDemo.img \ +5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv b/tests/s= toragevolxml2argvdata/qcow2-zerocapacity.argv index 95dfc65d9b..607c642e6f 100644 --- a/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv +++ b/tests/storagevolxml2argvdata/qcow2-zerocapacity.argv @@ -1,4 +1,6 @@ qemu-img \ create \ -f qcow2 \ --o compat=3D0.10 /var/lib/libvirt/images/OtherDemo.img 0K +-o compat=3D0.10 \ +/var/lib/libvirt/images/OtherDemo.img \ +0K diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c index 5e62313441..1b639e157e 100644 --- a/tests/storagevolxml2argvtest.c +++ b/tests/storagevolxml2argvtest.c @@ -104,13 +104,13 @@ testCompareXMLToArgvFiles(bool shouldFail, } if (convertStep !=3D VIR_STORAGE_VOL_ENCRYPT_CONVERT) { - if (!(actualCmdline =3D virCommandToString(cmd, false))) + if (!(actualCmdline =3D virCommandToString(cmd, true))) goto cleanup; } else { char *createCmdline =3D actualCmdline; g_autofree char *cvtCmdline =3D NULL; - if (!(cvtCmdline =3D virCommandToString(cmd, false))) + if (!(cvtCmdline =3D virCommandToString(cmd, true))) goto cleanup; actualCmdline =3D g_strdup_printf("%s\n%s", createCmdline, cvt= Cmdline); @@ -127,7 +127,7 @@ testCompareXMLToArgvFiles(bool shouldFail, } while (convertStep !=3D VIR_STORAGE_VOL_ENCRYPT_DONE); - if (virTestCompareToFile(actualCmdline, cmdline) < 0) + if (virTestCompareToFileFull(actualCmdline, cmdline, false) < 0) goto cleanup; ret =3D 0; --=20 2.30.2