From nobody Sat May 11 13:56:12 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1701798175633720.9538702179678; Tue, 5 Dec 2023 09:42:55 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 4E9331902; Tue, 5 Dec 2023 12:42:54 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 91FF817CC; Tue, 5 Dec 2023 12:41:16 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 78B3717C7; Tue, 5 Dec 2023 12:41:12 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 62D8817AC for ; Tue, 5 Dec 2023 12:41:11 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-567-jPV4uDL1NX2f1El7RgFunQ-1; Tue, 05 Dec 2023 12:41:09 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5CCB485A58B for ; Tue, 5 Dec 2023 17:41:09 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA256C15E6C for ; Tue, 5 Dec 2023 17:41:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: jPV4uDL1NX2f1El7RgFunQ-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [RFC PATCH 1/5] [DO NOT PUSH] update qemu capabilities for 'backing-mask-protocol' Date: Tue, 5 Dec 2023 18:41:02 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: HIZNTF3RQ5RG3BY7O2KYPD6LF3REUD2U X-Message-ID-Hash: HIZNTF3RQ5RG3BY7O2KYPD6LF3REUD2U X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1701798176736100001 The feature is not yet in qemu and will not make it into 8.2. --- .../caps_8.2.0_x86_64.replies | 21 ++++++++++++++----- .../caps_8.2.0_x86_64.xml | 4 ++-- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies b/tests/q= emucapabilitiesdata/caps_8.2.0_x86_64.replies index b9d26f633c..9d170e292d 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies @@ -17,11 +17,11 @@ { "return": { "qemu": { - "micro": 50, + "micro": 92, "minor": 1, "major": 8 }, - "package": "v8.1.0-3111-gad6ef0a42e" + "package": "v8.2.0-rc2-49-g65ad44546c" }, "id": "libvirt-2" } @@ -2687,6 +2687,11 @@ "default": null, "type": "str" }, + { + "name": "backing-mask-protocol", + "default": null, + "type": "bool" + }, { "name": "speed", "default": null, @@ -3317,6 +3322,11 @@ "default": null, "type": "str" }, + { + "name": "backing-mask-protocol", + "default": null, + "type": "bool" + }, { "name": "bottom", "default": null, @@ -30705,9 +30715,10 @@ "type": "bool" }, { - "default-value": 0, - "name": "len-reserved-regions", - "type": "uint32" + "default-value": [ + ], + "name": "reserved-regions", + "type": "list" }, { "default-value": 0, diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.2.0_x86_64.xml index ef3bd14597..6318b407c9 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml @@ -199,9 +199,9 @@ - 8001050 + 8001092 43100246 - v8.1.0-3111-gad6ef0a42e + v8.2.0-rc2-49-g65ad44546c x86_64 --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Sat May 11 13:56:12 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1701798519321108.4324006058282; Tue, 5 Dec 2023 09:48:39 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 3892E181E; Tue, 5 Dec 2023 12:48:38 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id DE4B018E0; Tue, 5 Dec 2023 12:41:32 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 2B89C17AC; Tue, 5 Dec 2023 12:41:13 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 123E617CC for ; Tue, 5 Dec 2023 12:41:12 -0500 (EST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-222-YjgfsXVQPjOg6snM5EjVtQ-1; Tue, 05 Dec 2023 12:41:10 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 293743C29A63 for ; Tue, 5 Dec 2023 17:41:10 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id A684CC15E6A for ; Tue, 5 Dec 2023 17:41:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: YjgfsXVQPjOg6snM5EjVtQ-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [RFC PATCH 2/5] qemu: capabilities: Introduce QEMU_CAPS_BLOCKJOB_BACKING_MASK_PROTOCOL Date: Tue, 5 Dec 2023 18:41:03 +0100 Message-ID: <878ece21a1a296440bc451563b3062f13c9959b0.1701797977.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: 5MTRCYZT663BIWBX5NUQWLNHIRVRBGMG X-Message-ID-Hash: 5MTRCYZT663BIWBX5NUQWLNHIRVRBGMG X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1701798520034100001 The capability is asserted when both block-stream and block-commit QMP commands support the 'backing-mask-protocol' argument. The argument causes qemu to record 'raw' as the backing file format in case when a protocol node is used directly. This is needed to preserve compatibility of images after a block-commit or block-pull libvirt operation with older libvirt versions in case when we'll want to remove the unneded 'raw' format drivers from the block graph. Signed-off-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 5 +++++ src/qemu/qemu_capabilities.h | 1 + tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml | 1 + 3 files changed, 7 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 83119e871a..ac07d3eb22 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -698,6 +698,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 450 */ "run-with.async-teardown", /* QEMU_CAPS_RUN_WITH_ASYNC_TEARD= OWN */ "virtio-blk-vhost-vdpa", /* QEMU_CAPS_DEVICE_VIRTIO_BLK_VHOS= T_VDPA */ + "blockjob.backing-mask-protocol", /* QEMU_CAPS_BLOCKJOB_BACK= ING_MASK_PROTOCOL */ ); @@ -5467,6 +5468,10 @@ virQEMUCapsProbeQMPSchemaCapabilities(virQEMUCaps *q= emuCaps, virQEMUCapsSet(qemuCaps, cmd->flag); } + if (virQEMUQAPISchemaPathExists("block-commit/arg-type/backing-mask-pr= otocol", schema) && + virQEMUQAPISchemaPathExists("block-stream/arg-type/backing-mask-pr= otocol", schema)) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_BLOCKJOB_BACKING_MASK_PROTOCOL); + return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 3c4f7f625b..60b37c772c 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -677,6 +677,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ /* 450 */ QEMU_CAPS_RUN_WITH_ASYNC_TEARDOWN, /* asynchronous teardown -run-with = async-teardown=3Don|off */ QEMU_CAPS_DEVICE_VIRTIO_BLK_VHOST_VDPA, /* virtio-blk-vhost-vdpa block= driver */ + QEMU_CAPS_BLOCKJOB_BACKING_MASK_PROTOCOL, /* backing-mask-protocol of = block-commit/block-stream */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.2.0_x86_64.xml index 6318b407c9..fb8e643040 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml @@ -199,6 +199,7 @@ + 8001092 43100246 v8.2.0-rc2-49-g65ad44546c --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Sat May 11 13:56:12 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1701798710860112.17406022392026; Tue, 5 Dec 2023 09:51:50 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id C86F317A5; Tue, 5 Dec 2023 12:51:49 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 165301870; Tue, 5 Dec 2023 12:41:53 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 00A6E18E7; Tue, 5 Dec 2023 12:41:40 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 4B46A17F3 for ; Tue, 5 Dec 2023 12:41:17 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-512-vf5S874iNz6tPq6ZfIhsBg-1; Tue, 05 Dec 2023 12:41:13 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3904780BEC7 for ; Tue, 5 Dec 2023 17:41:11 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id AF0CDC15E6A for ; Tue, 5 Dec 2023 17:41:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: vf5S874iNz6tPq6ZfIhsBg-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [RFC PATCH 3/5] qemu: monitor: Use 'backing-mask-protocol' for blockjobs when available Date: Tue, 5 Dec 2023 18:41:04 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: LBOUDRW44H66M3FJBXAO7ZH3RSXWF4MD X-Message-ID-Hash: LBOUDRW44H66M3FJBXAO7ZH3RSXWF4MD X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1701798711754100001 Store whether qemu supports the appropriate option for block-stream and block-commit commands and always use it if available. Signed-off-by: Peter Krempa --- src/qemu/qemu_monitor.c | 1 + src/qemu/qemu_monitor_json.c | 10 ++++++++++ src/qemu/qemu_monitor_priv.h | 2 ++ 3 files changed, 13 insertions(+) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index ec586b9036..3dd3d12dc3 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -624,6 +624,7 @@ qemuMonitorOpenInternal(virDomainObj *vm, if (priv) { mon->objectAddNoWrap =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_= OBJECT_JSON); mon->queryNamedBlockNodesFlat =3D virQEMUCapsGet(priv->qemuCaps, Q= EMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT); + mon->blockjobMaskProtocol =3D virQEMUCapsGet(priv->qemuCaps, QEMU_= CAPS_BLOCKJOB_BACKING_MASK_PROTOCOL); } if (virSetCloseExec(mon->fd) < 0) { diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index a9133793f6..d7bb98f068 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -4035,6 +4035,10 @@ qemuMonitorJSONBlockCommit(qemuMonitor *mon, g_autoptr(virJSONValue) cmd =3D NULL; g_autoptr(virJSONValue) reply =3D NULL; virTristateBool autodismiss =3D VIR_TRISTATE_BOOL_NO; + virTristateBool backingProtocol =3D VIR_TRISTATE_BOOL_ABSENT; + + if (mon->blockjobMaskProtocol) + backingProtocol =3D VIR_TRISTATE_BOOL_YES; cmd =3D qemuMonitorJSONMakeCommand("block-commit", "s:device", device, @@ -4045,6 +4049,7 @@ qemuMonitorJSONBlockCommit(qemuMonitor *mon, "S:backing-file", backingName, "T:auto-finalize", autofinalize, "T:auto-dismiss", autodismiss, + "T:backing-mask-protocol", backingPro= tocol, NULL); if (!cmd) return -1; @@ -4314,6 +4319,10 @@ qemuMonitorJSONBlockStream(qemuMonitor *mon, g_autoptr(virJSONValue) reply =3D NULL; virTristateBool autofinalize =3D VIR_TRISTATE_BOOL_YES; virTristateBool autodismiss =3D VIR_TRISTATE_BOOL_NO; + virTristateBool backingProtocol =3D VIR_TRISTATE_BOOL_ABSENT; + + if (mon->blockjobMaskProtocol) + backingProtocol =3D VIR_TRISTATE_BOOL_YES; if (!(cmd =3D qemuMonitorJSONMakeCommand("block-stream", "s:device", device, @@ -4323,6 +4332,7 @@ qemuMonitorJSONBlockStream(qemuMonitor *mon, "S:backing-file", backingName, "T:auto-finalize", autofinalize, "T:auto-dismiss", autodismiss, + "T:backing-mask-protocol", back= ingProtocol, NULL))) return -1; diff --git a/src/qemu/qemu_monitor_priv.h b/src/qemu/qemu_monitor_priv.h index 0826a1da94..0c2098c456 100644 --- a/src/qemu/qemu_monitor_priv.h +++ b/src/qemu/qemu_monitor_priv.h @@ -92,6 +92,8 @@ struct _qemuMonitor { bool objectAddNoWrap; /* query-named-block-nodes supports the 'flat' option */ bool queryNamedBlockNodesFlat; + /* use the backing-mask-protocol flag of block-commit/stream */ + bool blockjobMaskProtocol; }; --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Sat May 11 13:56:12 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1701798618008271.15673589037556; Tue, 5 Dec 2023 09:50:18 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 067F017EF; Tue, 5 Dec 2023 12:50:16 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 1CE5718EA; Tue, 5 Dec 2023 12:41:42 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 7186B17AC; Tue, 5 Dec 2023 12:41:15 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id E72D01790 for ; Tue, 5 Dec 2023 12:41:13 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-548-h6KKO58CNMCAUFSikAcvfg-1; Tue, 05 Dec 2023 12:41:12 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0A6F210AFB09 for ; Tue, 5 Dec 2023 17:41:12 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80B1AC15E6A for ; Tue, 5 Dec 2023 17:41:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: h6KKO58CNMCAUFSikAcvfg-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [RFC PATCH 4/5] qemu: block: Always add extra 'raw' layer for storage slice Date: Tue, 5 Dec 2023 18:41:05 +0100 Message-ID: <3553a4a72be3c618f64cac330780840aba92ca89.1701797977.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: XZ6GSIPWJATAME7LOMVMHKCLSSEHUPQC X-Message-ID-Hash: XZ6GSIPWJATAME7LOMVMHKCLSSEHUPQC X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1701798619905100001 Remove the simplification logic for the storage slice layer, as in upcoming patches we'll be getting rid of the raw 'format' layer. Doing this here will make it more clear what configuration is being changed. Since adding an extra layer creates just overhead and it will be removed within the same release we can do it in steps. Signed-off-by: Peter Krempa --- src/qemu/qemu_block.c | 36 ++----------------- .../disk-slices.x86_64-latest.args | 6 ++-- 2 files changed, 6 insertions(+), 36 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 7e9daf0bdc..738a8fedd3 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -1203,27 +1203,6 @@ qemuBlockStorageSourceGetFormatLUKSProps(virStorageS= ource *src, } -static int -qemuBlockStorageSourceGetFormatRawProps(virStorageSource *src, - virJSONValue *props) -{ - if (virJSONValueObjectAdd(&props, "s:driver", "raw", NULL) < 0) - return -1; - - /* Currently only storage slices are supported. We'll have to calculate - * the union of the slices here if we don't want to be adding needless - * 'raw' nodes. */ - if (src->sliceStorage && - virJSONValueObjectAdd(&props, - "U:offset", src->sliceStorage->offset, - "U:size", src->sliceStorage->size, - NULL) < 0) - return -1; - - return 0; -} - - static int qemuBlockStorageSourceGetCryptoProps(virStorageSource *src, virJSONValue **encprops) @@ -1343,8 +1322,7 @@ qemuBlockStorageSourceGetBlockdevFormatProps(virStora= geSource *src) if (qemuBlockStorageSourceGetFormatLUKSProps(src, props) < 0) return NULL; } else { - if (qemuBlockStorageSourceGetFormatRawProps(src, props) < 0) - return NULL; + driver =3D "raw"; } break; @@ -3253,17 +3231,7 @@ qemuBlockReopenReadOnly(virDomainObj *vm, bool qemuBlockStorageSourceNeedsStorageSliceLayer(const virStorageSource *src) { - if (!src->sliceStorage) - return false; - - if (src->format !=3D VIR_STORAGE_FILE_RAW) - return true; - - if (src->encryption && - src->encryption->format =3D=3D VIR_STORAGE_ENCRYPTION_FORMAT_LUKS) - return true; - - return false; + return !!src->sliceStorage; } diff --git a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-slices.x86_64-latest.args index 363f0c0361..b2c49a2df4 100644 --- a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args @@ -28,7 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/raw.img","= node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ","offset":0,"size":321,"file":"libvirt-6-storage"}' \ +-blockdev '{"driver":"raw","offset":0,"size":321,"file":"libvirt-6-storage= ","node-name":"libvirt-6-slice-sto","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ","file":"libvirt-6-slice-sto"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-6-format","id":"virtio-disk0","bootindex":1}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/raw.img","= node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"driver":"raw","offset":9876,"size":123456789,"file":"libvirt-= 5-storage","node-name":"libvirt-5-slice-sto","auto-read-only":true,"discard= ":"unmap"}' \ @@ -42,7 +43,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"luk= s","key-secret":"libvirt-3-format-encryption-secret0","file":"libvirt-3-sli= ce-sto"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-3-format","id":"virtio-disk2"}' \ -blockdev '{"driver":"nvme","device":"0000:02:00.0","namespace":1,"node-na= me":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","offset":1234,"size":321,"file":"libvirt-2-storage"}' \ +-blockdev '{"driver":"raw","offset":1234,"size":321,"file":"libvirt-2-stor= age","node-name":"libvirt-2-slice-sto","auto-read-only":true,"discard":"unm= ap"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-slice-sto"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-2-format","id":"virtio-disk3"}' \ -object '{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"nvme","device":"0001:02:00.0","namespace":2,"node-na= me":"libvirt-1-storage","auto-read-only":true,"discard":"unmap","cache":{"d= irect":true,"no-flush":false}}' \ --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Sat May 11 13:56:12 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1701798682729179.55427052649452; Tue, 5 Dec 2023 09:51:22 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 390F01941; Tue, 5 Dec 2023 12:51:19 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id B928C1907; Tue, 5 Dec 2023 12:42:07 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id B4EB6187E; Tue, 5 Dec 2023 12:41:50 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 8540418E8 for ; Tue, 5 Dec 2023 12:41:40 -0500 (EST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-343-9i-BwY7bMEa_m-4_4e2Wdw-1; Tue, 05 Dec 2023 12:41:32 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EE54B2818760 for ; Tue, 5 Dec 2023 17:41:16 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 789D6C15E6A for ; Tue, 5 Dec 2023 17:41:12 +0000 (UTC) X-MC-Unique: 9i-BwY7bMEa_m-4_4e2Wdw-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [RFC PATCH 5/5] qemuBlockStorageSourceNeedsFormatLayer: Stop formatting 'raw' driver when not needed Date: Tue, 5 Dec 2023 18:41:06 +0100 Message-ID: <76d44cf71d5047560879406c9797a3eba96af534.1701797977.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: 7LSBMPGVL5BM7COVAUAP5TCGZXK4WEYV X-Message-ID-Hash: 7LSBMPGVL5BM7COVAUAP5TCGZXK4WEYV X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1701798683770100001 The 'raw' driver without any special configuration is not needed and creates overhead in qemu. Stop using the 'raw' format driver in cases when it's not needed. A special case when it is needed is for FD passed images with only a single writable FD passed, where we need an overlay driver to properly reflect the 'read-only' flag. Signed-off-by: Peter Krempa --- src/qemu/qemu_block.c | 30 +- src/qemu/qemu_block.h | 3 +- src/qemu/qemu_domain.c | 2 +- tests/qemuhotplugtest.c | 15 - .../async-teardown.x86_64-latest.args | 5 +- .../audio-alsa-best.x86_64-latest.args | 5 +- .../audio-alsa-full.x86_64-latest.args | 5 +- .../audio-alsa-minimal.x86_64-latest.args | 5 +- .../audio-coreaudio-best.x86_64-latest.args | 5 +- .../audio-coreaudio-full.x86_64-latest.args | 5 +- ...audio-coreaudio-minimal.x86_64-latest.args | 5 +- ...udio-default-nographics.x86_64-latest.args | 5 +- .../audio-default-sdl.x86_64-latest.args | 5 +- .../audio-default-spice.x86_64-latest.args | 5 +- .../audio-default-vnc.x86_64-latest.args | 5 +- .../audio-file-best.x86_64-latest.args | 5 +- .../audio-file-full.x86_64-latest.args | 5 +- .../audio-file-minimal.x86_64-latest.args | 5 +- .../audio-jack-full.x86_64-latest.args | 5 +- .../audio-jack-minimal.x86_64-latest.args | 5 +- .../audio-many-backends.x86_64-latest.args | 5 +- .../audio-none-best.x86_64-latest.args | 5 +- .../audio-none-full.x86_64-latest.args | 5 +- .../audio-none-minimal.x86_64-latest.args | 5 +- .../audio-oss-best.x86_64-latest.args | 5 +- .../audio-oss-full.x86_64-latest.args | 5 +- .../audio-oss-minimal.x86_64-latest.args | 5 +- .../audio-pipewire-best.x86_64-latest.args | 5 +- .../audio-pipewire-full.x86_64-latest.args | 5 +- .../audio-pipewire-minimal.x86_64-latest.args | 5 +- .../audio-pulseaudio-best.x86_64-latest.args | 5 +- .../audio-pulseaudio-full.x86_64-latest.args | 5 +- ...udio-pulseaudio-minimal.x86_64-latest.args | 5 +- .../audio-sdl-best.x86_64-latest.args | 5 +- .../audio-sdl-full.x86_64-latest.args | 5 +- .../audio-sdl-minimal.x86_64-latest.args | 5 +- .../audio-spice-best.x86_64-latest.args | 5 +- .../audio-spice-full.x86_64-latest.args | 5 +- .../audio-spice-minimal.x86_64-latest.args | 5 +- .../autoindex.x86_64-latest.args | 5 +- .../balloon-device-auto.x86_64-latest.args | 5 +- ...loon-device-deflate-off.x86_64-latest.args | 5 +- .../balloon-device-deflate.x86_64-latest.args | 5 +- .../balloon-device-period.x86_64-latest.args | 5 +- .../balloon-device.x86_64-latest.args | 5 +- .../blkiotune-device.x86_64-latest.args | 5 +- .../blkiotune.x86_64-latest.args | 5 +- .../boot-cdrom.x86_64-latest.args | 5 +- .../boot-complex.x86_64-latest.args | 35 +- .../boot-floppy-q35.x86_64-latest.args | 5 +- .../boot-floppy.x86_64-latest.args | 10 +- ...boot-menu-disable-drive.x86_64-latest.args | 5 +- .../boot-menu-disable.x86_64-latest.args | 5 +- ...enu-enable-with-timeout.x86_64-latest.args | 5 +- .../boot-menu-enable.x86_64-latest.args | 5 +- .../boot-multi.x86_64-latest.args | 5 +- .../boot-network.x86_64-latest.args | 5 +- .../boot-order.x86_64-latest.args | 20 +- .../channel-guestfwd.x86_64-latest.args | 5 +- ...l-qemu-vdagent-features.x86_64-latest.args | 5 +- .../channel-qemu-vdagent.x86_64-latest.args | 5 +- .../channel-spicevmc.x86_64-latest.args | 5 +- .../channel-virtio-auto.x86_64-latest.args | 5 +- .../channel-virtio-autoadd.x86_64-latest.args | 5 +- ...annel-virtio-autoassign.x86_64-latest.args | 5 +- .../channel-virtio-default.x86_64-latest.args | 5 +- .../channel-virtio-state.x86_64-latest.args | 5 +- .../channel-virtio-unix.x86_64-latest.args | 5 +- .../channel-virtio.x86_64-latest.args | 5 +- .../clock-absolute.x86_64-latest.args | 5 +- .../clock-catchup.x86_64-latest.args | 5 +- .../clock-france.x86_64-latest.args | 5 +- .../clock-hpet-off.x86_64-latest.args | 5 +- ...caltime-basis-localtime.x86_64-latest.args | 5 +- .../clock-localtime.x86_64-latest.args | 5 +- .../clock-realtime.x86_64-latest.args | 5 +- .../clock-utc.x86_64-latest.args | 5 +- .../clock-variable.x86_64-latest.args | 5 +- .../console-compat-auto.x86_64-latest.args | 5 +- .../console-compat.x86_64-latest.args | 5 +- .../console-virtio-many.x86_64-latest.args | 5 +- .../console-virtio.x86_64-latest.args | 5 +- .../controller-order.x86_64-latest.args | 10 +- .../controller-virtio-scsi.x86_64-latest.args | 25 +- ...st-passthrough-features.x86_64-latest.args | 5 +- .../cputune-cpuset-big-id.x86_64-latest.args | 5 +- .../cputune-zero-shares.x86_64-latest.args | 5 +- .../cputune.x86_64-latest.args | 5 +- .../devices-acpi-index.x86_64-latest.args | 10 +- .../disk-aio.x86_64-latest.args | 5 +- ...-backing-chains-noindex.x86_64-latest.args | 10 +- .../disk-blockio.x86_64-latest.args | 10 +- .../disk-boot-cdrom.x86_64-latest.args | 10 +- .../disk-boot-disk.x86_64-latest.args | 10 +- .../disk-cdrom-bus-other.x86_64-latest.args | 5 +- ...sk-cdrom-network-nbdkit.x86_64-latest.args | 15 +- .../disk-cdrom-network.x86_64-latest.args | 15 +- .../disk-cdrom-tray.x86_64-latest.args | 10 +- .../disk-cdrom.x86_64-latest.args | 10 +- .../disk-copy_on_read.x86_64-latest.args | 5 +- .../disk-detect-zeroes.x86_64-latest.args | 5 +- .../disk-device-removable.x86_64-latest.args | 15 +- .../disk-discard.x86_64-latest.args | 5 +- .../disk-floppy-q35.x86_64-latest.args | 5 +- .../disk-floppy-tray.x86_64-latest.args | 15 +- .../disk-floppy.x86_64-latest.args | 15 +- .../disk-fmt-qcow.x86_64-latest.args | 5 +- .../disk-geometry.x86_64-latest.args | 5 +- .../disk-ide-split.x86_64-latest.args | 10 +- .../disk-ide-wwn.x86_64-latest.args | 5 +- .../disk-ioeventfd.x86_64-latest.args | 5 +- .../disk-network-gluster.x86_64-latest.args | 10 +- ...isk-network-http-nbdkit.x86_64-latest.args | 20 +- .../disk-network-http.x86_64-latest.args | 20 +- .../disk-network-iscsi.x86_64-latest.args | 35 +- .../disk-network-nbd.x86_64-latest.args | 30 +- .../disk-network-nfs.x86_64-latest.args | 5 +- ...rbd-encryption-luks-any.x86_64-latest.args | 7 +- ...sk-network-rbd-no-colon.x86_64-latest.args | 10 +- .../disk-network-rbd.x86_64-latest.args | 30 +- ...isk-network-source-auth.x86_64-latest.args | 15 +- ...work-source-curl-nbdkit.x86_64-latest.args | 20 +- ...isk-network-source-curl.x86_64-latest.args | 20 +- ...disk-network-ssh-nbdkit.x86_64-latest.args | 5 +- ...sk-network-ssh-password.x86_64-latest.args | 5 +- .../disk-network-ssh.x86_64-latest.args | 5 +- ...rk-tlsx509-nbd-hostname.x86_64-latest.args | 5 +- ...isk-network-tlsx509-nbd.x86_64-latest.args | 5 +- .../disk-no-boot.x86_64-latest.args | 15 +- .../disk-nvme.x86_64-latest.args | 15 +- .../disk-order.x86_64-latest.args | 20 +- .../disk-readonly-disk.x86_64-latest.args | 10 +- .../disk-rotation.x86_64-latest.args | 15 +- .../disk-sata-device.x86_64-latest.args | 5 +- .../disk-scsi-device-auto.x86_64-latest.args | 10 +- .../disk-scsi-disk-split.x86_64-latest.args | 20 +- .../disk-scsi-disk-vpd.x86_64-latest.args | 10 +- .../disk-scsi-disk-wwn.x86_64-latest.args | 10 +- ...sk-scsi-lun-passthrough.x86_64-latest.args | 10 +- .../disk-scsi.x86_64-latest.args | 30 +- .../disk-serial.x86_64-latest.args | 10 +- .../disk-shared.x86_64-latest.args | 20 +- .../disk-slices.x86_64-latest.args | 10 +- .../disk-snapshot.x86_64-latest.args | 5 +- .../disk-source-pool-mode.x86_64-latest.args | 20 +- .../disk-source-pool.x86_64-latest.args | 10 +- .../disk-usb-device.x86_64-latest.args | 10 +- .../disk-vhostvdpa.x86_64-latest.args | 5 +- .../disk-virtio-queues.x86_64-latest.args | 15 +- ...irtio-scsi-reservations.x86_64-latest.args | 10 +- .../disk-virtio.x86_64-latest.args | 20 +- .../event_idx.x86_64-latest.args | 5 +- .../fips-enabled.x86_64-latest.args | 5 +- ...-auto-efi-enrolled-keys.x86_64-latest.args | 5 +- ...uto-efi-loader-insecure.x86_64-latest.args | 5 +- ...re-auto-efi-loader-path.x86_64-latest.args | 5 +- ...-auto-efi-loader-secure.x86_64-latest.args | 5 +- ...to-efi-no-enrolled-keys.x86_64-latest.args | 5 +- ...are-auto-efi-no-secboot.x86_64-latest.args | 5 +- ...are-auto-efi-nvram-file.x86_64-latest.args | 5 +- ...efi-nvram-network-iscsi.x86_64-latest.args | 5 +- ...o-efi-nvram-network-nbd.x86_64-latest.args | 5 +- ...are-auto-efi-nvram-path.x86_64-latest.args | 5 +- ...auto-efi-nvram-template.x86_64-latest.args | 5 +- ...rmware-auto-efi-secboot.x86_64-latest.args | 5 +- ...rmware-auto-efi-smm-off.x86_64-latest.args | 5 +- .../firmware-auto-efi.x86_64-latest.args | 5 +- ...are-manual-efi-acpi-q35.x86_64-latest.args | 5 +- ...are-manual-efi-features.x86_64-latest.args | 5 +- ...loader-path-nonstandard.x86_64-latest.args | 5 +- ...anual-efi-loader-secure.x86_64-latest.args | 5 +- ...olled-keys-legacy-paths.x86_64-latest.args | 5 +- ...al-efi-no-enrolled-keys.x86_64-latest.args | 5 +- ...no-secboot-legacy-paths.x86_64-latest.args | 5 +- ...e-manual-efi-no-secboot.x86_64-latest.args | 5 +- ...e-manual-efi-nvram-file.x86_64-latest.args | 5 +- ...efi-nvram-network-iscsi.x86_64-latest.args | 5 +- ...l-efi-nvram-network-nbd.x86_64-latest.args | 5 +- ...am-template-nonstandard.x86_64-latest.args | 5 +- ...nual-efi-nvram-template.x86_64-latest.args | 5 +- ...fi-secboot-legacy-paths.x86_64-latest.args | 5 +- ...ware-manual-efi-secboot.x86_64-latest.args | 5 +- .../firmware-manual-efi.x86_64-latest.args | 5 +- .../graphics-dbus-audio.x86_64-latest.args | 5 +- ...egl-headless-rendernode.x86_64-latest.args | 5 +- .../graphics-egl-headless.x86_64-latest.args | 5 +- ...graphics-sdl-fullscreen.x86_64-latest.args | 5 +- .../graphics-sdl.x86_64-latest.args | 5 +- ...ics-vnc-auto-socket-cfg.x86_64-latest.args | 5 +- ...aphics-vnc-egl-headless.x86_64-latest.args | 5 +- ...hics-vnc-no-listen-attr.x86_64-latest.args | 5 +- .../graphics-vnc-policy.x86_64-latest.args | 5 +- .../graphics-vnc-power.x86_64-latest.args | 5 +- ...remove-generated-socket.x86_64-latest.args | 5 +- .../graphics-vnc-sasl.x86_64-latest.args | 5 +- .../graphics-vnc.x86_64-latest.args | 5 +- ...tdev-pci-address-device.x86_64-latest.args | 5 +- .../hostdev-pci-address.x86_64-latest.args | 5 +- .../hostdev-scsi-lsi.x86_64-latest.args | 5 +- ...dev-scsi-vhost-scsi-pci.x86_64-latest.args | 5 +- ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 5 +- ...usb-address-device-boot.x86_64-latest.args | 5 +- ...tdev-usb-address-device.x86_64-latest.args | 5 +- .../hostdev-usb-address.x86_64-latest.args | 5 +- ...ostdev-vfio-multidomain.x86_64-latest.args | 5 +- .../hostdev-vfio.x86_64-latest.args | 5 +- .../hugepages-memaccess.x86_64-latest.args | 5 +- .../hugepages-memaccess2.x86_64-latest.args | 5 +- .../hugepages-shared.x86_64-latest.args | 5 +- .../input-usbmouse-addr.x86_64-latest.args | 5 +- .../input-usbmouse.x86_64-latest.args | 5 +- .../input-usbtablet.x86_64-latest.args | 5 +- .../iothreads-disk.x86_64-latest.args | 10 +- ...threads-virtio-scsi-pci.x86_64-latest.args | 10 +- .../kvm-pit-delay.x86_64-latest.args | 5 +- .../kvm-pit-discard.x86_64-latest.args | 5 +- ...nch-security-sev-direct.x86_64-latest.args | 5 +- .../machine-aliases1.x86_64-latest.args | 5 +- .../machine-aliases2.x86_64-latest.args | 5 +- .../machine-core-off.x86_64-latest.args | 5 +- .../machine-core-on.x86_64-latest.args | 5 +- .../machine-vmport-opt.x86_64-latest.args | 5 +- ...emory-hotplug-dimm-addr.x86_64-latest.args | 5 +- .../memory-hotplug-dimm.x86_64-latest.args | 5 +- ...memory-hotplug-multiple.x86_64-latest.args | 5 +- ...y-hotplug-nvdimm-access.x86_64-latest.args | 5 +- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 5 +- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 5 +- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 5 +- ...hotplug-nvdimm-readonly.x86_64-latest.args | 5 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 5 +- ...mory-hotplug-virtio-mem.x86_64-latest.args | 5 +- ...ory-hotplug-virtio-pmem.x86_64-latest.args | 5 +- .../memory-hotplug.x86_64-latest.args | 5 +- .../memtune-unlimited.x86_64-latest.args | 5 +- .../memtune.x86_64-latest.args | 5 +- .../migrate.x86_64-latest.args | 5 +- .../minimal.x86_64-latest.args | 5 +- .../misc-acpi.x86_64-latest.args | 5 +- .../misc-disable-s3.x86_64-latest.args | 5 +- .../misc-disable-suspends.x86_64-latest.args | 5 +- .../misc-enable-s4.x86_64-latest.args | 5 +- .../misc-no-reboot.x86_64-latest.args | 5 +- .../misc-uuid.x86_64-latest.args | 5 +- ...ultifunction-pci-device.x86_64-latest.args | 5 +- .../net-client.x86_64-latest.args | 5 +- .../net-eth-hostip.x86_64-latest.args | 5 +- .../net-eth-ifname.x86_64-latest.args | 5 +- .../net-eth-names.x86_64-latest.args | 5 +- .../net-eth-unmanaged-tap.x86_64-latest.args | 5 +- .../net-eth.x86_64-latest.args | 5 +- .../net-hostdev-bootorder.x86_64-latest.args | 5 +- ...net-hostdev-multidomain.x86_64-latest.args | 5 +- ...ostdev-vfio-multidomain.x86_64-latest.args | 5 +- .../net-hostdev-vfio.x86_64-latest.args | 5 +- .../net-hostdev.x86_64-latest.args | 5 +- .../net-mcast.x86_64-latest.args | 5 +- .../net-server.x86_64-latest.args | 5 +- .../net-udp.x86_64-latest.args | 5 +- .../net-user-addr.x86_64-latest.args | 5 +- .../net-user-passt.x86_64-latest.args | 5 +- .../net-user.x86_64-latest.args | 5 +- .../net-vhostuser-multiq.x86_64-latest.args | 5 +- .../net-virtio-device.x86_64-latest.args | 5 +- ...virtio-disable-offloads.x86_64-latest.args | 5 +- .../net-virtio-netdev.x86_64-latest.args | 5 +- .../net-virtio-rss.x86_64-latest.args | 5 +- ...et-virtio-rxtxqueuesize.x86_64-latest.args | 5 +- ...-virtio-teaming-hostdev.x86_64-latest.args | 5 +- .../net-virtio-teaming.x86_64-latest.args | 5 +- .../net-virtio.x86_64-latest.args | 5 +- .../nosharepages.x86_64-latest.args | 5 +- ...auto-memory-vcpu-cpuset.x86_64-latest.args | 5 +- ...no-cpuset-and-placement.x86_64-latest.args | 5 +- ...to-vcpu-static-numatune.x86_64-latest.args | 5 +- ...static-memory-auto-vcpu.x86_64-latest.args | 5 +- .../qemuxml2argvdata/numad.x86_64-latest.args | 5 +- ...ne-auto-nodeset-invalid.x86_64-latest.args | 5 +- .../panic-no-address.x86_64-latest.args | 5 +- .../qemuxml2argvdata/panic.x86_64-latest.args | 5 +- ...arallel-parport-chardev.x86_64-latest.args | 5 +- .../parallel-tcp-chardev.x86_64-latest.args | 5 +- .../pci-autoadd-addr.x86_64-latest.args | 5 +- .../pci-autoadd-idx.x86_64-latest.args | 5 +- .../pci-autofill-addr.x86_64-latest.args | 5 +- .../pci-bridge-many-disks.x86_64-latest.args | 525 +++++++----------- .../pci-bridge.x86_64-latest.args | 5 +- .../pci-many.x86_64-latest.args | 145 ++--- .../pci-rom.x86_64-latest.args | 5 +- .../pcie-expander-bus.x86_64-latest.args | 5 +- .../pcie-root-port.x86_64-latest.args | 5 +- ...-switch-downstream-port.x86_64-latest.args | 5 +- ...ie-switch-upstream-port.x86_64-latest.args | 5 +- .../pcihole64-q35.x86_64-latest.args | 5 +- .../q35-pcie-autoadd.x86_64-latest.args | 5 +- .../q35-pcie.x86_64-latest.args | 5 +- .../q35-usb2-multi.x86_64-latest.args | 5 +- .../q35-usb2-reorder.x86_64-latest.args | 5 +- .../q35-usb2.x86_64-latest.args | 5 +- tests/qemuxml2argvdata/q35.x86_64-latest.args | 5 +- .../qemu-ns-alt.x86_64-latest.args | 5 +- ...qemu-ns-commandline-ns0.x86_64-latest.args | 5 +- ...qemu-ns-commandline-ns1.x86_64-latest.args | 5 +- .../qemu-ns-commandline.x86_64-latest.args | 5 +- ...-domain-commandline-ns0.x86_64-latest.args | 5 +- ...u-ns-domain-commandline.x86_64-latest.args | 5 +- .../qemu-ns-domain-ns0.x86_64-latest.args | 5 +- .../qemu-ns-no-env.x86_64-latest.args | 5 +- .../qemu-ns.x86_64-latest.args | 5 +- .../restore-v2-fd.x86_64-latest.args | 5 +- .../restore-v2.x86_64-latest.args | 5 +- .../seclabel-dac-none.x86_64-latest.args | 5 +- ...label-dynamic-baselabel.x86_64-latest.args | 5 +- ...label-dynamic-labelskip.x86_64-latest.args | 5 +- ...clabel-dynamic-override.x86_64-latest.args | 10 +- ...eclabel-dynamic-relabel.x86_64-latest.args | 5 +- .../seclabel-dynamic.x86_64-latest.args | 5 +- .../seclabel-none.x86_64-latest.args | 5 +- ...clabel-static-labelskip.x86_64-latest.args | 5 +- ...seclabel-static-relabel.x86_64-latest.args | 5 +- .../seclabel-static.x86_64-latest.args | 5 +- ...rial-dev-chardev-iobase.x86_64-latest.args | 5 +- .../serial-dev-chardev.x86_64-latest.args | 5 +- .../serial-file-chardev.x86_64-latest.args | 5 +- .../serial-file-log.x86_64-latest.args | 5 +- .../serial-many-chardev.x86_64-latest.args | 5 +- .../serial-pty-chardev.x86_64-latest.args | 5 +- .../serial-spiceport.x86_64-latest.args | 5 +- .../serial-tcp-chardev.x86_64-latest.args | 5 +- ...rial-tcp-telnet-chardev.x86_64-latest.args | 5 +- ...p-tlsx509-chardev-notls.x86_64-latest.args | 5 +- ...-tlsx509-chardev-verify.x86_64-latest.args | 5 +- ...ial-tcp-tlsx509-chardev.x86_64-latest.args | 5 +- ...-tlsx509-secret-chardev.x86_64-latest.args | 5 +- .../serial-udp-chardev.x86_64-latest.args | 5 +- .../serial-vc-chardev.x86_64-latest.args | 5 +- .../smbios-type-fwcfg.x86_64-latest.args | 5 +- .../smbios.x86_64-latest.args | 5 +- .../user-aliases.x86_64-latest.args | 10 +- .../user-aliases2.x86_64-latest.args | 5 +- ...host-user-gpu-secondary.x86_64-latest.args | 5 +- .../vhost-user-vga.x86_64-latest.args | 5 +- .../video-none-device.x86_64-latest.args | 5 +- .../video-qxl-heads.x86_64-latest.args | 5 +- .../video-qxl-noheads.x86_64-latest.args | 5 +- .../video-qxl-resolution.x86_64-latest.args | 5 +- .../video-vga-qxl-heads.x86_64-latest.args | 5 +- .../virtio-lun.x86_64-latest.args | 10 +- ...virtio-non-transitional.x86_64-latest.args | 5 +- ...virtio-options-disk-ats.x86_64-latest.args | 10 +- ...rtio-options-disk-iommu.x86_64-latest.args | 10 +- ...tio-options-disk-packed.x86_64-latest.args | 10 +- .../virtio-options.x86_64-latest.args | 5 +- .../virtio-transitional.x86_64-latest.args | 5 +- .../vmcoreinfo.x86_64-latest.args | 5 +- .../watchdog-device.x86_64-latest.args | 5 +- .../watchdog-dump.x86_64-latest.args | 5 +- .../watchdog-injectnmi.x86_64-latest.args | 5 +- .../watchdog.x86_64-latest.args | 5 +- 359 files changed, 1227 insertions(+), 1815 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 738a8fedd3..9cd955fed2 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -3247,10 +3247,34 @@ qemuBlockStorageSourceNeedsStorageSliceLayer(const = virStorageSource *src) * existence of the format layer nodename. */ bool -qemuBlockStorageSourceNeedsFormatLayer(const virStorageSource *src G_GNUC_= UNUSED) +qemuBlockStorageSourceNeedsFormatLayer(const virStorageSource *src, + virQEMUCaps *qemuCaps) { - /* Currently we always create a 'format' layer */ - return true; + virStorageType actualType =3D virStorageSourceGetActualType(src); + + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKJOB_BACKING_MASK_PROTOCOL= )) + return true; + + if (src->format !=3D VIR_STORAGE_FILE_RAW) + return true; + + if (src->encryption && + src->encryption->format =3D=3D VIR_STORAGE_ENCRYPTION_FORMAT_LUKS) + return true; + + /* when passing a FD to qemu via the /dev/fdset mechanism qemu + * fetches the appropriate FD from the fdset by checking that it has + * the correct accessmode. Now if a user passes an explicitly read-wri= te fd + * but intends to use the disk in read-only mode we need to install a + * read-only raw driver on top as qemu wouldn't be able to pick the co= rrect + * fd. */ + if ((actualType =3D=3D VIR_STORAGE_TYPE_FILE || actualType =3D=3D VIR_= STORAGE_TYPE_BLOCK) && + src->fdtuple && + src->fdtuple->nfds =3D=3D 1 && + src->fdtuple->writable) + return true; + + return false; } diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h index 0eab0d822c..be8f11651e 100644 --- a/src/qemu/qemu_block.h +++ b/src/qemu/qemu_block.h @@ -271,7 +271,8 @@ bool qemuBlockStorageSourceNeedsStorageSliceLayer(const virStorageSource *src); bool -qemuBlockStorageSourceNeedsFormatLayer(const virStorageSource *src); +qemuBlockStorageSourceNeedsFormatLayer(const virStorageSource *src, + virQEMUCaps *qemuCaps); char * qemuBlockStorageSourceGetCookieString(virStorageSource *src); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 953808fcfe..7026c59fa8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -11113,7 +11113,7 @@ qemuDomainPrepareStorageSourceBlockdevNodename(virD= omainDiskDef *disk, /* qemuBlockStorageSourceSetStorageNodename steals 'nodestorage' */ qemuBlockStorageSourceSetStorageNodename(src, nodestorage); - if (qemuBlockStorageSourceNeedsFormatLayer(src)) { + if (qemuBlockStorageSourceNeedsFormatLayer(src, priv->qemuCaps)) { char *nodeformat =3D g_strdup_printf("%s-format", nodenameprefix); qemuBlockStorageSourceSetFormatNodename(src, nodeformat); diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 98f68ce3f4..961a7a3c64 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -581,7 +581,6 @@ mymain(void) "chardev-remove", QMP_OK, "query-fdsets", "{\"return\":= []}"); DO_TEST_ATTACH("x86_64", "base-live", "disk-virtio", false, true, - "blockdev-add", QMP_OK, "blockdev-add", QMP_OK, "device_add", QMP_OK, "query-block", QMP_EMPTY_ARRAY); @@ -589,11 +588,9 @@ mymain(void) "device_del", QMP_OK); DO_TEST_DETACH("x86_64", "base-live", "disk-virtio", false, false, "device_del", QMP_DEVICE_DELETED("virtio-disk4") QMP_OK, - "blockdev-del", QMP_OK, "blockdev-del", QMP_OK); DO_TEST_ATTACH("x86_64", "base-live", "disk-usb", false, true, - "blockdev-add", QMP_OK, "blockdev-add", QMP_OK, "device_add", QMP_OK, "query-block", QMP_EMPTY_ARRAY); @@ -601,11 +598,9 @@ mymain(void) "device_del", QMP_OK); DO_TEST_DETACH("x86_64", "base-live", "disk-usb", false, false, "device_del", QMP_DEVICE_DELETED("usb-disk16") QMP_OK, - "blockdev-del", QMP_OK, "blockdev-del", QMP_OK); DO_TEST_ATTACH("x86_64", "base-live", "disk-scsi", false, true, - "blockdev-add", QMP_OK, "blockdev-add", QMP_OK, "device_add", QMP_OK, "query-block", QMP_EMPTY_ARRAY); @@ -613,7 +608,6 @@ mymain(void) "device_del", QMP_OK); DO_TEST_DETACH("x86_64", "base-live", "disk-scsi", false, false, "device_del", QMP_DEVICE_DELETED("scsi0-0-0-5") QMP_OK, - "blockdev-del", QMP_OK, "blockdev-del", QMP_OK); DO_TEST_ATTACH("x86_64", "base-without-scsi-controller-live", "disk-sc= si-2", false, true, @@ -623,20 +617,17 @@ mymain(void) "device_add", QMP_OK, "device_add", QMP_OK, "blockdev-add", QMP_OK, - "blockdev-add", QMP_OK, "device_add", QMP_OK, "query-block", QMP_EMPTY_ARRAY); DO_TEST_DETACH("x86_64", "base-with-scsi-controller-live", "disk-scsi-= 2", true, true, "device_del", QMP_OK); DO_TEST_DETACH("x86_64", "base-with-scsi-controller-live", "disk-scsi-= 2", false, false, "device_del", QMP_DEVICE_DELETED("scsi3-0-6") QMP_OK, - "blockdev-del", QMP_OK, "blockdev-del", QMP_OK); DO_TEST_ATTACH("x86_64", "base-live", "disk-scsi-multipath", false, tr= ue, "object-add", QMP_OK, "blockdev-add", QMP_OK, - "blockdev-add", QMP_OK, "device_add", QMP_OK, "query-block", QMP_EMPTY_ARRAY); DO_TEST_DETACH("x86_64", "base-live", "disk-scsi-multipath", true, tru= e, @@ -644,7 +635,6 @@ mymain(void) DO_TEST_DETACH("x86_64", "base-live", "disk-scsi-multipath", false, fa= lse, "device_del", QMP_DEVICE_DELETED("scsi0-0-0-0") QMP_OK, "blockdev-del", QMP_OK, - "blockdev-del", QMP_OK, "object-del", QMP_OK); DO_TEST_ATTACH("x86_64", "base-live", "qemu-agent", false, true, @@ -718,7 +708,6 @@ mymain(void) DO_TEST_ATTACH("x86_64", "base-live+disk-scsi-wwn", "disk-scsi-duplicate-wwn", false, false, "blockdev-add", QMP_OK, - "blockdev-add", QMP_OK, "device_add", QMP_OK, "query-block", QMP_EMPTY_ARRAY); @@ -766,7 +755,6 @@ mymain(void) "netdev_del", QMP_OK); DO_TEST_ATTACH("x86_64", "base-live", "cdrom-usb", false, true, - "blockdev-add", QMP_OK, "blockdev-add", QMP_OK, "device_add", QMP_OK, "query-block", QMP_EMPTY_ARRAY); @@ -774,11 +762,9 @@ mymain(void) "device_del", QMP_OK); DO_TEST_DETACH("x86_64", "base-live", "cdrom-usb", false, false, "device_del", QMP_DEVICE_DELETED("usb-disk4") QMP_OK, - "blockdev-del", QMP_OK, "blockdev-del", QMP_OK); DO_TEST_ATTACH("x86_64", "base-live", "cdrom-scsi", false, true, - "blockdev-add", QMP_OK, "blockdev-add", QMP_OK, "device_add", QMP_OK, "query-block", QMP_EMPTY_ARRAY); @@ -786,7 +772,6 @@ mymain(void) "device_del", QMP_OK); DO_TEST_DETACH("x86_64", "base-live", "cdrom-scsi", false, false, "device_del", QMP_DEVICE_DELETED("scsi0-0-0-4") QMP_OK, - "blockdev-del", QMP_OK, "blockdev-del", QMP_OK); #define DO_TEST_CPU_GROUP(archname, prefix, vcpus, expectfail) \ diff --git a/tests/qemuxml2argvdata/async-teardown.x86_64-latest.args b/tes= ts/qemuxml2argvdata/async-teardown.x86_64-latest.args index 455382f1f0..406617d2f3 100644 --- a/tests/qemuxml2argvdata/async-teardown.x86_64-latest.args +++ b/tests/qemuxml2argvdata/async-teardown.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args index 2cb964d70e..6c4d890220 100644 --- a/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"alsa","timer-period":50,"in":{"mixing-= engine":true,"fixed-settings":true,"voices":1,"frequency":44100,"channels":= 2,"format":"s16","dev":"/dev/dsp0"},"out":{"mixing-engine":true,"fixed-sett= ings":true,"voices":2,"frequency":22050,"channels":4,"format":"f32","dev":"= /dev/dsp1"}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args index b3592ec0c4..64bf9e72ff 100644 --- a/tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"alsa","in":{"mixing-engine":true,"fixe= d-settings":true,"voices":1,"buffer-length":100,"frequency":44100,"channels= ":2,"format":"s16","dev":"/dev/dsp0"},"out":{"mixing-engine":true,"fixed-se= ttings":true,"voices":2,"buffer-length":200,"frequency":22050,"channels":4,= "format":"f32","dev":"/dev/dsp1"}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args b= /tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args index d0c07fa3b0..2968f01550 100644 --- a/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"alsa"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args= b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args index ed450cba46..abb15b5f42 100644 --- a/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"coreaudio","timer-period":50,"in":{"mi= xing-engine":true,"fixed-settings":true,"voices":1,"frequency":44100,"chann= els":2,"format":"s16"},"out":{"mixing-engine":true,"fixed-settings":true,"v= oices":2,"buffer-length":200,"frequency":22050,"channels":4,"format":"f32",= "buffer-count":42}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args= b/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args index 48e838a3d5..5d3297951d 100644 --- a/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"coreaudio","in":{"mixing-engine":true,= "fixed-settings":true,"voices":1,"buffer-length":100,"frequency":44100,"cha= nnels":2,"format":"s16","buffer-count":50},"out":{"mixing-engine":true,"fix= ed-settings":true,"voices":2,"buffer-length":200,"frequency":22050,"channel= s":4,"format":"f32","buffer-count":42}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args index babd5620e6..6ae129ed23 100644 --- a/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"coreaudio"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.= args b/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args index d0c07fa3b0..2968f01550 100644 --- a/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"alsa"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args b/= tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args index acee10ba84..07f3bcfce8 100644 --- a/tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args @@ -27,9 +27,8 @@ SDL_AUDIODRIVER=3Desd \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"sdl"}' \ -display sdl \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ diff --git a/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args = b/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args index 000b7496ff..5aef24f473 100644 --- a/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,seamless-migration=3Don \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ diff --git a/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args b/= tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args index bdaead9f7f..2c43d097e5 100644 --- a/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"alsa"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ diff --git a/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-file-best.x86_64-latest.args index 5eba814a4d..2ac8073b4d 100644 --- a/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"wav","timer-period":50,"path":"audio.w= av","in":{"mixing-engine":true,"fixed-settings":true,"voices":1,"frequency"= :44100,"channels":2,"format":"s16"},"out":{"mixing-engine":true,"fixed-sett= ings":true,"voices":2,"frequency":22050,"channels":4,"format":"f32"}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-file-full.x86_64-latest.args index 8ef2fb5bb4..b51662bb63 100644 --- a/tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"wav","path":"audio.wav","in":{"mixing-= engine":true,"fixed-settings":true,"voices":1,"buffer-length":100,"frequenc= y":44100,"channels":2,"format":"s16"},"out":{"mixing-engine":true,"fixed-se= ttings":true,"voices":2,"buffer-length":200,"frequency":22050,"channels":4,= "format":"f32"}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args b= /tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args index 73eea94863..499cf08c52 100644 --- a/tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"wav"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-jack-full.x86_64-latest.args index 8906e1c8bc..a68e5fa7f7 100644 --- a/tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"jack","in":{"mixing-engine":true,"fixe= d-settings":true,"voices":1,"buffer-length":100,"frequency":44100,"channels= ":2,"format":"s16","server-name":"fish","client-name":"food","connect-ports= ":"yum"},"out":{"mixing-engine":true,"fixed-settings":true,"voices":2,"buff= er-length":200,"frequency":22050,"channels":4,"format":"f32","server-name":= "fish","client-name":"food","connect-ports":"yum"}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args b= /tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args index dcf4cd3e2b..5b5f887f6e 100644 --- a/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"jack"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args = b/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args index 0bdc75689f..bedbbac483 100644 --- a/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args @@ -27,9 +27,8 @@ PIPEWIRE_RUNTIME_DIR=3D/run/user/1000 \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -audiodev '{"id":"audio2","driver":"alsa"}' \ -audiodev '{"id":"audio3","driver":"pa"}' \ diff --git a/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-none-best.x86_64-latest.args index 34aba833fb..deaad5cbd8 100644 --- a/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none","timer-period":50,"in":{"mixing-= engine":true,"fixed-settings":true,"voices":1,"frequency":44100,"channels":= 2,"format":"s16"},"out":{"mixing-engine":true,"fixed-settings":true,"voices= ":2,"frequency":22050,"channels":4,"format":"f32"}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-none-full.x86_64-latest.args index bede8ff152..c0f069cb15 100644 --- a/tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none","in":{"mixing-engine":true,"fixe= d-settings":true,"voices":1,"buffer-length":100,"frequency":44100,"channels= ":2,"format":"s16"},"out":{"mixing-engine":true,"fixed-settings":true,"voic= es":2,"buffer-length":200,"frequency":22050,"channels":4,"format":"f32"}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args b= /tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args index f42d868627..9e0524bbd8 100644 --- a/tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args b/tes= ts/qemuxml2argvdata/audio-oss-best.x86_64-latest.args index ac4e9c24ec..6ab36ccd1f 100644 --- a/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"oss","timer-period":50,"in":{"mixing-e= ngine":true,"fixed-settings":true,"voices":1,"frequency":44100,"channels":2= ,"format":"s16","dev":"/dev/dsp0","buffer-count":30,"try-poll":true},"out":= {"mixing-engine":true,"fixed-settings":true,"voices":2,"frequency":22050,"c= hannels":4,"format":"f32","dev":"/dev/dsp1","buffer-count":30,"try-poll":fa= lse}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args b/tes= ts/qemuxml2argvdata/audio-oss-full.x86_64-latest.args index bac5bed56b..eb2b12400c 100644 --- a/tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"oss","try-mmap":true,"exclusive":true,= "dsp-policy":3,"in":{"mixing-engine":true,"fixed-settings":true,"voices":1,= "buffer-length":100,"frequency":44100,"channels":2,"format":"s16","dev":"/d= ev/dsp0","buffer-count":50,"try-poll":true},"out":{"mixing-engine":true,"fi= xed-settings":true,"voices":2,"buffer-length":200,"frequency":22050,"channe= ls":4,"format":"f32","dev":"/dev/dsp1","buffer-count":30,"try-poll":false}}= ' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args b/= tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args index 0ad8999b88..9f1fa67875 100644 --- a/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"oss"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-pipewire-best.x86_64-latest.args = b/tests/qemuxml2argvdata/audio-pipewire-best.x86_64-latest.args index d94bd6a09e..f4a2ac2f57 100644 --- a/tests/qemuxml2argvdata/audio-pipewire-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-pipewire-best.x86_64-latest.args @@ -28,9 +28,8 @@ PIPEWIRE_RUNTIME_DIR=3D/run/user/1000 \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"pipewire","timer-period":50,"in":{"mix= ing-engine":true,"fixed-settings":true,"voices":1,"buffer-length":200,"freq= uency":44100,"channels":2,"format":"s16","name":"fish"},"out":{"mixing-engi= ne":true,"fixed-settings":true,"voices":2,"buffer-length":200,"frequency":2= 2050,"channels":4,"format":"f32","name":"fish"}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-pipewire-full.x86_64-latest.args = b/tests/qemuxml2argvdata/audio-pipewire-full.x86_64-latest.args index dd97b462fb..fb6d4d7f00 100644 --- a/tests/qemuxml2argvdata/audio-pipewire-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-pipewire-full.x86_64-latest.args @@ -28,9 +28,8 @@ PIPEWIRE_RUNTIME_DIR=3D/run/user/1000 \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"pipewire","timer-period":50,"in":{"mix= ing-engine":true,"fixed-settings":true,"voices":1,"buffer-length":100,"freq= uency":44100,"channels":2,"format":"s16","name":"fish","stream-name":"food"= ,"latency":100},"out":{"mixing-engine":true,"fixed-settings":true,"voices":= 2,"buffer-length":200,"frequency":22050,"channels":4,"format":"f32","name":= "fish","stream-name":"food","latency":200}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-pipewire-minimal.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/audio-pipewire-minimal.x86_64-latest.args index 90951a3219..f88def88df 100644 --- a/tests/qemuxml2argvdata/audio-pipewire-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-pipewire-minimal.x86_64-latest.args @@ -28,9 +28,8 @@ PIPEWIRE_RUNTIME_DIR=3D/run/user/1000 \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"pipewire"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.arg= s b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args index ace202ac13..7d58af65d4 100644 --- a/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"pa","timer-period":50,"server":"acme.e= xample.org","in":{"mixing-engine":true,"fixed-settings":true,"voices":1,"bu= ffer-length":200,"frequency":44100,"channels":2,"format":"s16","name":"fish= "},"out":{"mixing-engine":true,"fixed-settings":true,"voices":2,"buffer-len= gth":200,"frequency":22050,"channels":4,"format":"f32","name":"fish"}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.arg= s b/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args index 32b870128c..818d071aa6 100644 --- a/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"pa","server":"acme.example.org","in":{= "mixing-engine":true,"fixed-settings":true,"voices":1,"buffer-length":100,"= frequency":44100,"channels":2,"format":"s16","name":"fish","stream-name":"f= ood","latency":100},"out":{"mixing-engine":true,"fixed-settings":true,"voic= es":2,"buffer-length":200,"frequency":22050,"channels":4,"format":"f32","na= me":"fish","stream-name":"food","latency":200}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.= args b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args index c2f9c81843..6e70e93ee8 100644 --- a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"pa"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args b/tes= ts/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args index d8850ba71a..be566e7a14 100644 --- a/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args @@ -28,9 +28,8 @@ SDL_AUDIODRIVER=3Dpulseaudio \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"sdl","timer-period":50,"in":{"mixing-e= ngine":true,"fixed-settings":true,"voices":1,"frequency":44100,"channels":2= ,"format":"s16"},"out":{"mixing-engine":true,"fixed-settings":true,"voices"= :2,"buffer-length":200,"frequency":22050,"channels":4,"format":"f32"}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args b/tes= ts/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args index 2ea427e293..8c18ece7f9 100644 --- a/tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args @@ -28,9 +28,8 @@ SDL_AUDIODRIVER=3Dpulseaudio \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"sdl","in":{"mixing-engine":true,"fixed= -settings":true,"voices":1,"buffer-length":100,"frequency":44100,"channels"= :2,"format":"s16","buffer-count":40},"out":{"mixing-engine":true,"fixed-set= tings":true,"voices":2,"buffer-length":200,"frequency":22050,"channels":4,"= format":"f32","buffer-count":50}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args b/= tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args index 3f3a4d843f..55fc86f9f4 100644 --- a/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"sdl"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args b/t= ests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args index 98ad1a31a4..20c47c9111 100644 --- a/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"spice","timer-period":50,"in":{"mixing= -engine":true,"fixed-settings":true,"voices":1,"frequency":44100,"channels"= :2,"format":"s16"},"out":{"mixing-engine":true,"fixed-settings":true,"voice= s":2,"frequency":22050,"channels":4,"format":"f32"}}' \ -spice port=3D0,seamless-migration=3Don \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ diff --git a/tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args b/t= ests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args index 1bc37f63e3..73382c6a74 100644 --- a/tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"spice","in":{"mixing-engine":true,"fix= ed-settings":true,"voices":1,"buffer-length":100,"frequency":44100,"channel= s":2,"format":"s16"},"out":{"mixing-engine":true,"fixed-settings":true,"voi= ces":2,"buffer-length":200,"frequency":22050,"channels":4,"format":"f32"}}'= \ -spice port=3D0,seamless-migration=3Don \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ diff --git a/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args = b/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args index 000b7496ff..5aef24f473 100644 --- a/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,seamless-migration=3Don \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ diff --git a/tests/qemuxml2argvdata/autoindex.x86_64-latest.args b/tests/qe= muxml2argvdata/autoindex.x86_64-latest.args index e712a324d8..68b871cb50 100644 --- a/tests/qemuxml2argvdata/autoindex.x86_64-latest.args +++ b/tests/qemuxml2argvdata/autoindex.x86_64-latest.args @@ -55,9 +55,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"ich9-usb-uhci2","masterbus":"usb4.0","firstport":2,"bu= s":"pci.2","addr":"0x2.0x1"}' \ -device '{"driver":"ich9-usb-uhci3","masterbus":"usb4.0","firstport":4,"bu= s":"pci.2","addr":"0x2.0x2"}' \ -device '{"driver":"ich9-usb-ehci1","id":"usb4","bus":"pci.2","addr":"0x2.= 0x7"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":= "sata0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-storage","id"= :"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ diff --git a/tests/qemuxml2argvdata/balloon-device-auto.x86_64-latest.args = b/tests/qemuxml2argvdata/balloon-device-auto.x86_64-latest.args index 486a07b157..23beb54806 100644 --- a/tests/qemuxml2argvdata/balloon-device-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/balloon-device-auto.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.x86_64-lates= t.args b/tests/qemuxml2argvdata/balloon-device-deflate-off.x86_64-latest.ar= gs index ac7af1019f..023a29f22e 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","deflate-on-oom":f= alse,"bus":"pci.0","addr":"0x12"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/balloon-device-deflate.x86_64-latest.args index 474d0f8b8d..32de9a4a85 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate.x86_64-latest.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","deflate-on-oom":t= rue,"bus":"pci.0","addr":"0x12"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/balloon-device-period.x86_64-latest.arg= s b/tests/qemuxml2argvdata/balloon-device-period.x86_64-latest.args index b597723509..0763a63f3c 100644 --- a/tests/qemuxml2argvdata/balloon-device-period.x86_64-latest.args +++ b/tests/qemuxml2argvdata/balloon-device-period.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x12"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/balloon-device.x86_64-latest.args b/tes= ts/qemuxml2argvdata/balloon-device.x86_64-latest.args index b597723509..0763a63f3c 100644 --- a/tests/qemuxml2argvdata/balloon-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/balloon-device.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x12"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/blkiotune-device.x86_64-latest.args b/t= ests/qemuxml2argvdata/blkiotune-device.x86_64-latest.args index 486a07b157..23beb54806 100644 --- a/tests/qemuxml2argvdata/blkiotune-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkiotune-device.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/blkiotune.x86_64-latest.args b/tests/qe= muxml2argvdata/blkiotune.x86_64-latest.args index 486a07b157..23beb54806 100644 --- a/tests/qemuxml2argvdata/blkiotune.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkiotune.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/boot-cdrom.x86_64-latest.args b/tests/q= emuxml2argvdata/boot-cdrom.x86_64-latest.args index f42d868627..9e0524bbd8 100644 --- a/tests/qemuxml2argvdata/boot-cdrom.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-cdrom.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-complex.x86_64-latest.args b/tests= /qemuxml2argvdata/boot-complex.x86_64-latest.args index 277bd0029f..447897a657 100644 --- a/tests/qemuxml2argvdata/boot-complex.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-complex.x86_64-latest.args @@ -28,27 +28,20 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -global isa-fdc.bootindexA=3D4 \ --blockdev '{"driver":"file","filename":"/tmp/vda.img","node-name":"libvirt= -7-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"raw= ","file":"libvirt-7-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-7-format","id":"virtio-disk0","bootindex":3}' \ --blockdev '{"driver":"file","filename":"/tmp/vdb.img","node-name":"libvirt= -6-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ","file":"libvirt-6-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-6-format","id":"virtio-disk1"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/hda","node-name= ":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ","file":"libvirt-5-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-5-form= at","id":"ide0-0-0"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/hdb","node-name= ":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-4-form= at","id":"ide0-0-1"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/hdc","node-name= ":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-3-form= at","id":"ide0-1-0","bootindex":1}' \ --blockdev '{"driver":"host_device","filename":"/dev/fd0","node-name":"libv= irt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"floppy","unit":0,"drive":"libvirt-2-format","id":"fdc0= -0-0"}' \ --blockdev '{"driver":"host_device","filename":"/dev/fd1","node-name":"libv= irt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ +-blockdev '{"driver":"file","filename":"/tmp/vda.img","node-name":"libvirt= -7-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-7-storage","id":"virtio-disk0","bootindex":3}' \ +-blockdev '{"driver":"file","filename":"/tmp/vdb.img","node-name":"libvirt= -6-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-6-storage","id":"virtio-disk1"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/hda","node-name= ":"libvirt-5-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-5-stor= age","id":"ide0-0-0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/hdb","node-name= ":"libvirt-4-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-4-stor= age","id":"ide0-0-1"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/hdc","node-name= ":"libvirt-3-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-3-stor= age","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/fd0","node-name":"libv= irt-2-storage","read-only":false}' \ +-device '{"driver":"floppy","unit":0,"drive":"libvirt-2-storage","id":"fdc= 0-0-0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/fd1","node-name":"libv= irt-1-storage","read-only":false}' \ +-device '{"driver":"floppy","unit":1,"drive":"libvirt-1-storage","id":"fdc= 0-0-1"}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:11","bootindex":2,"bus":"pci.0","addr":"0x2"}' \ -netdev '{"type":"user","id":"hostnet1"}' \ diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.x86_64-latest.args b/te= sts/qemuxml2argvdata/boot-floppy-q35.x86_64-latest.args index 4f015c4c28..3c7c21c22f 100644 --- a/tests/qemuxml2argvdata/boot-floppy-q35.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-floppy-q35.x86_64-latest.args @@ -30,9 +30,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ -device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ -device '{"driver":"isa-fdc","bootindexA":1}' \ --blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"floppy","unit":0,"drive":"libvirt-1-format","id":"fdc0= -0-0"}' \ +-blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-1-storage","read-only":false}' \ +-device '{"driver":"floppy","unit":0,"drive":"libvirt-1-storage","id":"fdc= 0-0-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ diff --git a/tests/qemuxml2argvdata/boot-floppy.x86_64-latest.args b/tests/= qemuxml2argvdata/boot-floppy.x86_64-latest.args index 4900408e8c..7233a55760 100644 --- a/tests/qemuxml2argvdata/boot-floppy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-floppy.x86_64-latest.args @@ -28,12 +28,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -global isa-fdc.bootindexA=3D1 \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0"}' \ --blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"floppy","unit":0,"drive":"libvirt-1-format","id":"fdc0= -0-0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-stor= age","id":"ide0-0-0"}' \ +-blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-1-storage","read-only":false}' \ +-device '{"driver":"floppy","unit":0,"drive":"libvirt-1-storage","id":"fdc= 0-0-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/boot-menu-disable-drive.x86_64-latest.args index 0831ef754c..75241ab120 100644 --- a/tests/qemuxml2argvdata/boot-menu-disable-drive.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot menu=3Doff,strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/boot-menu-disable.x86_64-latest.args b/= tests/qemuxml2argvdata/boot-menu-disable.x86_64-latest.args index 0831ef754c..75241ab120 100644 --- a/tests/qemuxml2argvdata/boot-menu-disable.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-menu-disable.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot menu=3Doff,strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.x86_64-la= test.args b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.x86_64-lat= est.args index 7f022efde1..fddb55c66c 100644 --- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.x86_64-latest.ar= gs @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot menu=3Don,splash-time=3D3000,strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/boot-menu-enable.x86_64-latest.args b/t= ests/qemuxml2argvdata/boot-menu-enable.x86_64-latest.args index 00e095b286..c84c68f76e 100644 --- a/tests/qemuxml2argvdata/boot-menu-enable.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-menu-enable.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot menu=3Don,strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/boot-multi.x86_64-latest.args b/tests/q= emuxml2argvdata/boot-multi.x86_64-latest.args index 00e095b286..c84c68f76e 100644 --- a/tests/qemuxml2argvdata/boot-multi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-multi.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot menu=3Don,strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/boot-network.x86_64-latest.args b/tests= /qemuxml2argvdata/boot-network.x86_64-latest.args index c2d266bddd..4c83ca3ee4 100644 --- a/tests/qemuxml2argvdata/boot-network.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-network.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-order.x86_64-latest.args b/tests/q= emuxml2argvdata/boot-order.x86_64-latest.args index be2af49b34..0dfff1924f 100644 --- a/tests/qemuxml2argvdata/boot-order.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-order.x86_64-latest.args @@ -28,18 +28,14 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -global isa-fdc.bootindexB=3D4 \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-4-form= at","id":"ide0-0-0"}' \ --blockdev '{"driver":"file","filename":"/root/boot.iso","node-name":"libvi= rt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-3-form= at","id":"ide0-1-0","bootindex":1}' \ --blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"export":"image","node-name":"libvirt-2-storage","auto-read-on= ly":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-2-format","id":"virtio-disk0","bootindex":3}' \ --blockdev '{"driver":"file","filename":"/dev/null","node-name":"libvirt-1-= storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-4-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-4-stor= age","id":"ide0-0-0"}' \ +-blockdev '{"driver":"file","filename":"/root/boot.iso","node-name":"libvi= rt-3-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-3-stor= age","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"export":"image","node-name":"libvirt-2-storage","read-only":f= alse}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-2-storage","id":"virtio-disk0","bootindex":3}' \ +-blockdev '{"driver":"file","filename":"/dev/null","node-name":"libvirt-1-= storage","read-only":false}' \ +-device '{"driver":"floppy","unit":1,"drive":"libvirt-1-storage","id":"fdc= 0-0-1"}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:55","bootindex":2,"bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/channel-guestfwd.x86_64-latest.args b/t= ests/qemuxml2argvdata/channel-guestfwd.x86_64-latest.args index 98a7b2435b..03533b358b 100644 --- a/tests/qemuxml2argvdata/channel-guestfwd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-guestfwd.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev pipe,id=3Dcharchannel0,path=3D/tmp/guestfwd \ -netdev '{"type":"user","guestfwd":[{"str":"tcp:10.0.2.1:4600-chardev:char= channel0"}],"id":"channel0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/channel-qemu-vdagent-features.x86_64-la= test.args b/tests/qemuxml2argvdata/channel-qemu-vdagent-features.x86_64-lat= est.args index 45061da7e6..cd81e6989d 100644 --- a/tests/qemuxml2argvdata/channel-qemu-vdagent-features.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/channel-qemu-vdagent-features.x86_64-latest.ar= gs @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev qemu-vdagent,id=3Dcharchannel0,name=3Dvdagent,clipboard=3Don,mous= e=3Don \ -device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chard= ev":"charchannel0","id":"channel0","name":"com.redhat.spice.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/channel-qemu-vdagent.x86_64-latest.args= b/tests/qemuxml2argvdata/channel-qemu-vdagent.x86_64-latest.args index 3e62f30248..3edcb4c9f8 100644 --- a/tests/qemuxml2argvdata/channel-qemu-vdagent.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-qemu-vdagent.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev qemu-vdagent,id=3Dcharchannel0,name=3Dvdagent,clipboard=3Doff,mou= se=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chard= ev":"charchannel0","id":"channel0","name":"com.redhat.spice.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/channel-spicevmc.x86_64-latest.args b/t= ests/qemuxml2argvdata/channel-spicevmc.x86_64-latest.args index c2b657ee80..78ace7047a 100644 --- a/tests/qemuxml2argvdata/channel-spicevmc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-spicevmc.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev spicevmc,id=3Dcharchannel0,name=3Dvdagent \ -device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chard= ev":"charchannel0","id":"channel0","name":"com.redhat.spice.0"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.x86_64-latest.args = b/tests/qemuxml2argvdata/channel-virtio-auto.x86_64-latest.args index 17365abcd9..1b223fe845 100644 --- a/tests/qemuxml2argvdata/channel-virtio-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-virtio-auto.x86_64-latest.args @@ -30,9 +30,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","max_ports":1= 6,"vectors":4,"bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial2","bus":"pci.0"= ,"addr":"0x3"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=3Dcharchannel0 \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.linux-kvm.port.0"}' \ -chardev pty,id=3Dcharchannel1 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/channel-virtio-autoadd.x86_64-latest.args index 6c134b2d88..2e6b1d9dbc 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoadd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.x86_64-latest.args @@ -29,9 +29,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","max_ports":4= ,"vectors":4,"bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0x3"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=3Dcharchannel0 \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.linux-kvm.port.0"}' \ -chardev pty,id=3Dcharchannel1 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.x86_64-latest= .args b/tests/qemuxml2argvdata/channel-virtio-autoassign.x86_64-latest.args index 389509a1fb..ad1a195275 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoassign.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.x86_64-latest.args @@ -29,9 +29,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","max_ports":4= ,"vectors":4,"bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=3Dcharchannel0 \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chard= ev":"charchannel0","id":"channel0","name":"org.linux-kvm.port.0"}' \ -chardev pty,id=3Dcharchannel1 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-default.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/channel-virtio-default.x86_64-latest.args index aec67fe1ae..4adccaa588 100644 --- a/tests/qemuxml2argvdata/channel-virtio-default.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-virtio-default.x86_64-latest.args @@ -28,9 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x3"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=3Dcharchannel0 \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0"}' \ -chardev spicevmc,id=3Dcharchannel1,name=3Dvdagent \ diff --git a/tests/qemuxml2argvdata/channel-virtio-state.x86_64-latest.args= b/tests/qemuxml2argvdata/channel-virtio-state.x86_64-latest.args index 840f62591a..e3dd3add7d 100644 --- a/tests/qemuxml2argvdata/channel-virtio-state.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-virtio-state.x86_64-latest.args @@ -28,9 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=3Dcharchannel0 \ -device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chard= ev":"charchannel0","id":"channel0","name":"org.linux-kvm.port.foo"}' \ -chardev pty,id=3Dcharchannel1 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.x86_64-latest.args = b/tests/qemuxml2argvdata/channel-virtio-unix.x86_64-latest.args index 131508cd9a..1f64478afd 100644 --- a/tests/qemuxml2argvdata/channel-virtio-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-virtio-unix.x86_64-latest.args @@ -29,9 +29,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -chardev socket,id=3Dcharchannel1,fd=3D1729,server=3Don,wait=3Doff \ diff --git a/tests/qemuxml2argvdata/channel-virtio.x86_64-latest.args b/tes= ts/qemuxml2argvdata/channel-virtio.x86_64-latest.args index e6bd85ef41..c402b515dd 100644 --- a/tests/qemuxml2argvdata/channel-virtio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-virtio.x86_64-latest.args @@ -28,9 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=3Dcharchannel0 \ -device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chard= ev":"charchannel0","id":"channel0","name":"org.linux-kvm.port.foo"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/clock-absolute.x86_64-latest.args b/tes= ts/qemuxml2argvdata/clock-absolute.x86_64-latest.args index fca1ad7385..f46415b903 100644 --- a/tests/qemuxml2argvdata/clock-absolute.x86_64-latest.args +++ b/tests/qemuxml2argvdata/clock-absolute.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-catchup.x86_64-latest.args b/test= s/qemuxml2argvdata/clock-catchup.x86_64-latest.args index 05f88d296b..c1191ba50a 100644 --- a/tests/qemuxml2argvdata/clock-catchup.x86_64-latest.args +++ b/tests/qemuxml2argvdata/clock-catchup.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/clock-france.x86_64-latest.args b/tests= /qemuxml2argvdata/clock-france.x86_64-latest.args index a4ed6011fd..d8a5cf89b2 100644 --- a/tests/qemuxml2argvdata/clock-france.x86_64-latest.args +++ b/tests/qemuxml2argvdata/clock-france.x86_64-latest.args @@ -28,9 +28,8 @@ TZ=3DEurope/Paris \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/clock-hpet-off.x86_64-latest.args b/tes= ts/qemuxml2argvdata/clock-hpet-off.x86_64-latest.args index bbaae52aff..8b9b2cf1c3 100644 --- a/tests/qemuxml2argvdata/clock-hpet-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/clock-hpet-off.x86_64-latest.args @@ -28,9 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.x86_64-= latest.args b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.x86_64= -latest.args index e130f7fdbe..617b31aea6 100644 --- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.x86_64-latest.= args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/clock-localtime.x86_64-latest.args b/te= sts/qemuxml2argvdata/clock-localtime.x86_64-latest.args index 367855a784..eb66aadb79 100644 --- a/tests/qemuxml2argvdata/clock-localtime.x86_64-latest.args +++ b/tests/qemuxml2argvdata/clock-localtime.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-realtime.x86_64-latest.args b/tes= ts/qemuxml2argvdata/clock-realtime.x86_64-latest.args index 94f18cf183..d95b17493b 100644 --- a/tests/qemuxml2argvdata/clock-realtime.x86_64-latest.args +++ b/tests/qemuxml2argvdata/clock-realtime.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/clock-utc.x86_64-latest.args b/tests/qe= muxml2argvdata/clock-utc.x86_64-latest.args index 38145b85d2..9493ded1c7 100644 --- a/tests/qemuxml2argvdata/clock-utc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/clock-utc.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-variable.x86_64-latest.args b/tes= ts/qemuxml2argvdata/clock-variable.x86_64-latest.args index df000ead6e..338db8d409 100644 --- a/tests/qemuxml2argvdata/clock-variable.x86_64-latest.args +++ b/tests/qemuxml2argvdata/clock-variable.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args = b/tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args index e2853ca15f..8b128669d1 100644 --- a/tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/console-compat.x86_64-latest.args b/tes= ts/qemuxml2argvdata/console-compat.x86_64-latest.args index 848cf478f5..1ea5610b58 100644 --- a/tests/qemuxml2argvdata/console-compat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-compat.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/console-virtio-many.x86_64-latest.args = b/tests/qemuxml2argvdata/console-virtio-many.x86_64-latest.args index 8578fd003b..d0536011ec 100644 --- a/tests/qemuxml2argvdata/console-virtio-many.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-virtio-many.x86_64-latest.args @@ -28,9 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -chardev pty,id=3Dcharconsole1 \ diff --git a/tests/qemuxml2argvdata/console-virtio.x86_64-latest.args b/tes= ts/qemuxml2argvdata/console-virtio.x86_64-latest.args index bdfc636f1c..9bde4b53b1 100644 --- a/tests/qemuxml2argvdata/console-virtio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-virtio.x86_64-latest.args @@ -28,9 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=3Dcharconsole0 \ -device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/controller-order.x86_64-latest.args b/t= ests/qemuxml2argvdata/controller-order.x86_64-latest.args index d01831aaa6..a052f4fb8f 100644 --- a/tests/qemuxml2argvdata/controller-order.x86_64-latest.args +++ b/tests/qemuxml2argvdata/controller-order.x86_64-latest.args @@ -29,12 +29,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr/.= config \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x7"}' \ -device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1.1"}' \ --blockdev '{"driver":"file","filename":"/tmp/fdr.img","aio":"native","node= -name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap","cache":= {"direct":true,"no-flush":false}}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"raw","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","share-rw":= true,"drive":"libvirt-2-format","id":"virtio-disk0","bootindex":1,"write-ca= che":"on"}' \ --blockdev '{"driver":"file","filename":"/tmp/Fedora-17-x86_64-Live-Desktop= .iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unma= p"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ +-blockdev '{"driver":"file","filename":"/tmp/fdr.img","aio":"native","node= -name":"libvirt-2-storage","read-only":false,"cache":{"direct":true,"no-flu= sh":false}}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","share-rw":= true,"drive":"libvirt-2-storage","id":"virtio-disk0","bootindex":1,"write-c= ache":"on"}' \ +-blockdev '{"driver":"file","filename":"/tmp/Fedora-17-x86_64-Live-Desktop= .iso","node-name":"libvirt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0"}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:4d:4b:19","bootindex":2,"bus":"pci.0","addr":"0x3"}' \ -chardev spicevmc,id=3Dcharsmartcard0,name=3Dsmartcard \ diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args index a33be05e8b..e7f7c2819b 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args @@ -32,21 +32,16 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -device '{"driver":"virtio-scsi-pci","id":"scsi2","cmd_per_lun":50,"bus":"= pci.0","addr":"0x4"}' \ -device '{"driver":"virtio-scsi-pci","id":"scsi3","max_sectors":512,"bus":= "pci.0","addr":"0x5"}' \ -device '{"driver":"virtio-scsi-pci","id":"scsi4","ioeventfd":true,"bus":"= pci.0","addr":"0x6"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ","file":"libvirt-5-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-5-format","id":"scsi0-0= -0-0","bootindex":1}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi1.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi1-0-0-0","drive":"libvirt-4-format","id":"scsi1-0= -0-0"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest3","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi2.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi2-0-0-0","drive":"libvirt-3-format","id":"scsi2-0= -0-0"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest4","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi3.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi3-0-0-0","drive":"libvirt-2-format","id":"scsi3-0= -0-0"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest5","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi4.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi4-0-0-0","drive":"libvirt-1-format","id":"scsi4-0= -0-0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-5-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-5-storage","id":"scsi0-= 0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-4-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi1.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi1-0-0-0","drive":"libvirt-4-storage","id":"scsi1-= 0-0-0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest3","no= de-name":"libvirt-3-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi2.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi2-0-0-0","drive":"libvirt-3-storage","id":"scsi2-= 0-0-0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest4","no= de-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi3.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi3-0-0-0","drive":"libvirt-2-storage","id":"scsi3-= 0-0-0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest5","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi4.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi4-0-0-0","drive":"libvirt-1-storage","id":"scsi4-= 0-0-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x7"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.x86_64-la= test.args b/tests/qemuxml2argvdata/cpu-host-passthrough-features.x86_64-lat= est.args index 2eedf77cad..efd481e58c 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.x86_64-latest.ar= gs @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.arg= s b/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args index 1b8182a82a..724c036155 100644 --- a/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.x86_64-latest.args = b/tests/qemuxml2argvdata/cputune-zero-shares.x86_64-latest.args index 1b8182a82a..724c036155 100644 --- a/tests/qemuxml2argvdata/cputune-zero-shares.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cputune-zero-shares.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/cputune.x86_64-latest.args b/tests/qemu= xml2argvdata/cputune.x86_64-latest.args index cb05f8c2a5..68abff6420 100644 --- a/tests/qemuxml2argvdata/cputune.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cputune.x86_64-latest.args @@ -31,9 +31,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args b= /tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args index cdbcd1755c..b58a078370 100644 --- a/tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args +++ b/tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args @@ -27,12 +27,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-b= r/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test.img",= "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","acpi-index= ":1,"drive":"libvirt-2-format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test1.img"= ,"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","acpi-index= ":42,"drive":"libvirt-1-format","id":"virtio-disk1"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test.img",= "node-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","acpi-index= ":1,"drive":"libvirt-2-storage","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test1.img"= ,"node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","acpi-index= ":42,"drive":"libvirt-1-storage","id":"virtio-disk1"}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:55","bus":"pci.0","addr":"0x5","acpi-index":100}' \ -netdev '{"type":"user","id":"hostnet1"}' \ diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args b/tests/qem= uxml2argvdata/disk-aio.x86_64-latest.args index caf6f6eac6..ed398f9fca 100644 --- a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args @@ -30,9 +30,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","ai= o":"native","node-name":"libvirt-2-storage","auto-read-only":true,"discard"= :"unmap","cache":{"direct":true,"no-flush":false}}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-2-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","ai= o":"threads","node-name":"libvirt-1-storage","auto-read-only":true,"discard= ":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","ai= o":"threads","node-name":"libvirt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-late= st.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.= args index 98d261f272..59b7843796 100644 --- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args @@ -32,10 +32,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -blockdev '{"driver":"gluster","volume":"Volume2","path":"Image","server":= [{"type":"unix","path":"/path/to/sock"}],"debug":4,"node-name":"libvirt-24-= storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-24-format","read-only":false,"driver":"qc= ow2","file":"libvirt-24-storage","backing":"libvirt-25-format"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-24-format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"file","filename":"/tmp/Fedora-17-x86_64-Live-KDE.iso= ","node-name":"libvirt-23-storage","auto-read-only":true,"discard":"unmap"}= ' \ --blockdev '{"node-name":"libvirt-23-format","read-only":true,"driver":"raw= ","file":"libvirt-23-storage"}' \ +-blockdev '{"driver":"file","filename":"/tmp/Fedora-17-x86_64-Live-KDE.iso= ","node-name":"libvirt-23-storage","read-only":true}' \ -blockdev '{"driver":"file","filename":"/tmp/image5.qcow","node-name":"lib= virt-22-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-22-format","read-only":true,"driver":"qco= w2","file":"libvirt-22-storage","backing":"libvirt-23-format"}' \ +-blockdev '{"node-name":"libvirt-22-format","read-only":true,"driver":"qco= w2","file":"libvirt-22-storage","backing":"libvirt-23-storage"}' \ -blockdev '{"driver":"file","filename":"/tmp/image4.qcow","node-name":"lib= virt-21-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-21-format","read-only":true,"driver":"qco= w2","file":"libvirt-21-storage","backing":"libvirt-22-format"}' \ -blockdev '{"driver":"file","filename":"/tmp/image3.qcow","node-name":"lib= virt-20-storage","auto-read-only":true,"discard":"unmap"}' \ @@ -47,9 +46,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/run/nbdsoc= k"},"export":"bar","node-name":"libvirt-17-storage","auto-read-only":true,"= discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-17-format","read-only":false,"driver":"qc= ow2","file":"libvirt-17-storage","backing":"libvirt-18-format"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-17-format","id":"virtio-disk1"}' \ --blockdev '{"driver":"gluster","volume":"Volume1","path":"Image","server":= [{"type":"inet","host":"example.org","port":"6000"}],"debug":4,"node-name":= "libvirt-16-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-16-format","read-only":false,"driver":"ra= w","file":"libvirt-16-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-16-format","id":"virtio-disk2"}' \ +-blockdev '{"driver":"gluster","volume":"Volume1","path":"Image","server":= [{"type":"inet","host":"example.org","port":"6000"}],"debug":4,"node-name":= "libvirt-16-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-16-storage","id":"virtio-disk2"}' \ -blockdev '{"driver":"file","filename":"/tmp/image.qcow","node-name":"libv= irt-15-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-15-format","read-only":true,"driver":"qco= w2","file":"libvirt-15-storage","backing":null}' \ -object '{"qom-type":"secret","id":"libvirt-14-storage-auth-secret0","data= ":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid= ":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ diff --git a/tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args b/tests= /qemuxml2argvdata/disk-blockio.x86_64-latest.args index 15f31ae60d..997bd13e56 100644 --- a/tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args @@ -27,12 +27,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-2-form= at","id":"ide0-0-1"}' \ --blockdev '{"driver":"file","filename":"/tmp/idedisk.img","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":2,"drive":"libvirt-1-form= at","id":"ide0-0-2","bootindex":1,"logical_block_size":512,"physical_block_= size":512,"discard_granularity":4096}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-2-stor= age","id":"ide0-0-1"}' \ +-blockdev '{"driver":"file","filename":"/tmp/idedisk.img","node-name":"lib= virt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":2,"drive":"libvirt-1-stor= age","id":"ide0-0-2","bootindex":1,"logical_block_size":512,"physical_block= _size":512,"discard_granularity":4096}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args b/te= sts/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args index d3d888f4a4..1d36f4f9ee 100644 --- a/tests/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args @@ -27,12 +27,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-stor= age","id":"ide0-0-0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args index eddd3d5474..ce8d057ca0 100644 --- a/tests/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args @@ -27,12 +27,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-stor= age","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args index de5fa083d8..e0d2452a10 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"file","filename":"/root/boot.iso","node-name":"libvi= rt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device '{"driver":"usb-storage","bus":"usb.0","port":"1","drive":"libvirt= -2-format","id":"usb-disk0","removable":false}' \ +-blockdev '{"driver":"file","filename":"/root/boot.iso","node-name":"libvi= rt-2-storage","read-only":true}' \ +-device '{"driver":"usb-storage","bus":"usb.0","port":"1","drive":"libvirt= -2-storage","id":"usb-disk0","removable":false}' \ -device '{"driver":"usb-storage","bus":"usb.0","port":"2","id":"usb-disk1"= ,"removable":false}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-nbdkit.x86_64-latest= .args b/tests/qemuxml2argvdata/disk-cdrom-network-nbdkit.x86_64-latest.args index 637f47bf2b..7cb4915e65 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network-nbdkit.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network-nbdkit.x86_64-latest.args @@ -27,15 +27,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-3-storage.socket"},"node-name":"= libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":1}' \ --blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-2-storage.socket"},"node-name":"= libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-2-form= at","id":"ide0-0-1"}' \ --blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-1-storage.socket"},"node-name":"= libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ +-blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-3-storage.socket"},"node-name":"= libvirt-3-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.0","unit":0,"drive":"libvirt-3-stor= age","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-2-storage.socket"},"node-name":"= libvirt-2-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-2-stor= age","id":"ide0-0-1"}' \ +-blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-1-storage.socket"},"node-name":"= libvirt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args index 26a233f3d4..00a82b0178 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args @@ -27,17 +27,14 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"ftp","url":"ftp://host.name:21/url/path/file.iso","n= ode-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"ftp","url":"ftp://host.name:21/url/path/file.iso","n= ode-name":"libvirt-3-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.0","unit":0,"drive":"libvirt-3-stor= age","id":"ide0-0-0","bootindex":1}' \ -object '{"qom-type":"secret","id":"libvirt-2-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ --blockdev '{"driver":"ftps","url":"ftps://host.name:990/url/path/file.iso"= ,"username":"testuser","password-secret":"libvirt-2-storage-auth-secret0","= node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-2-form= at","id":"ide0-0-1"}' \ +-blockdev '{"driver":"ftps","url":"ftps://host.name:990/url/path/file.iso"= ,"username":"testuser","password-secret":"libvirt-2-storage-auth-secret0","= node-name":"libvirt-2-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-2-stor= age","id":"ide0-0-1"}' \ -object '{"qom-type":"secret","id":"libvirt-1-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ --blockdev '{"driver":"https","url":"https://host.name:443/url/path/file.is= o?test=3Dval","username":"testuser","password-secret":"libvirt-1-storage-au= th-secret0","node-name":"libvirt-1-storage","auto-read-only":true,"discard"= :"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ +-blockdev '{"driver":"https","url":"https://host.name:443/url/path/file.is= o?test=3Dval","username":"testuser","password-secret":"libvirt-1-storage-au= th-secret0","node-name":"libvirt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args b/te= sts/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args index d20d9c0f8c..9619d41e79 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args @@ -30,12 +30,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/= .config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","= node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"qco= w2","file":"libvirt-3-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-3-format","id":"virtio-disk0","bootindex":2}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-2-storage","auto-read-only":true,"discar= d":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-2-form= at","id":"ide0-1-0","bootindex":1}' \ --blockdev '{"driver":"file","filename":"/tmp/cdrom.img","node-name":"libvi= rt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":1,"drive":"libvirt-1-form= at","id":"ide0-1-1"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-2-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-2-stor= age","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/tmp/cdrom.img","node-name":"libvi= rt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":1,"drive":"libvirt-1-stor= age","id":"ide0-1-1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args b/tests/q= emuxml2argvdata/disk-cdrom.x86_64-latest.args index 59a8ef1b75..9e3fe36d91 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args @@ -27,12 +27,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-4-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-4-format","read-only":true,"driver":"raw"= ,"file":"libvirt-4-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.0","unit":0,"drive":"libvirt-4-form= at","id":"ide0-0-0"}' \ --blockdev '{"driver":"file","filename":"/root/boot.iso","node-name":"libvi= rt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-3-form= at","id":"ide0-0-1"}' \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-4-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.0","unit":0,"drive":"libvirt-4-stor= age","id":"ide0-0-0"}' \ +-blockdev '{"driver":"file","filename":"/root/boot.iso","node-name":"libvi= rt-3-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-3-stor= age","id":"ide0-0-1"}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"id":"ide0-1-0","write-= cache":"on"}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":1,"id":"ide0-1-1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args index e6dcdd7fcc..4bdaf22de8 100644 --- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args @@ -32,9 +32,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qco= w2","file":"libvirt-2-storage"}' \ -blockdev '{"driver":"copy-on-read","node-name":"libvirt-CoR-vda","file":"= libvirt-2-format","discard":"unmap"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-CoR-vda","id":"virtio-disk0","bootindex":2}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discar= d":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args index c62b077d81..07acc46113 100644 --- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args @@ -30,9 +30,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","= node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"discard":"un= map","detect-zeroes":"unmap","driver":"qcow2","file":"libvirt-2-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-2-format","id":"virtio-disk0","bootindex":2}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discar= d":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"discard":"ign= ore","detect-zeroes":"on","driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","read-only":true,"discard":"i= gnore","detect-zeroes":"on"}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-device-removable.x86_64-latest.arg= s b/tests/qemuxml2argvdata/disk-device-removable.x86_64-latest.args index 80e08eafe2..e0701f4bd2 100644 --- a/tests/qemuxml2argvdata/disk-device-removable.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-device-removable.x86_64-latest.args @@ -28,15 +28,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":1}' \ --blockdev '{"driver":"file","filename":"/tmp/usbdisk.img","node-name":"lib= virt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"usb-storage","bus":"usb.0","port":"1","drive":"libvirt= -2-format","id":"usb-disk0","removable":true}' \ --blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :1,"device_id":"drive-scsi0-0-0-1","drive":"libvirt-1-format","id":"scsi0-0= -0-1","removable":true}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-stor= age","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/tmp/usbdisk.img","node-name":"lib= virt-2-storage","read-only":false}' \ +-device '{"driver":"usb-storage","bus":"usb.0","port":"1","drive":"libvirt= -2-storage","id":"usb-disk0","removable":true}' \ +-blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-1-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :1,"device_id":"drive-scsi0-0-0-1","drive":"libvirt-1-storage","id":"scsi0-= 0-0-1","removable":true}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args b/tests= /qemuxml2argvdata/disk-discard.x86_64-latest.args index 7f0e92f1d1..43e516f097 100644 --- a/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args @@ -30,9 +30,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","= node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"discard":"un= map","driver":"qcow2","file":"libvirt-2-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-2-format","id":"virtio-disk0","bootindex":2}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discar= d":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"discard":"ign= ore","driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","read-only":true,"discard":"i= gnore"}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args b/te= sts/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args index b5daffdb5c..14679f3737 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args @@ -30,9 +30,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ -device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ -device '{"driver":"isa-fdc","bootindexA":1}' \ --blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"floppy","unit":0,"drive":"libvirt-2-format","id":"fdc0= -0-0"}' \ +-blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-2-storage","read-only":false}' \ +-device '{"driver":"floppy","unit":0,"drive":"libvirt-2-storage","id":"fdc= 0-0-0"}' \ -blockdev '{"driver":"file","filename":"/tmp/data.img","node-name":"libvir= t-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ -device '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args index 24f8f7d77d..d9f8689e1a 100644 --- a/tests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args @@ -27,15 +27,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":1}' \ --blockdev '{"driver":"host_device","filename":"/dev/fd0","node-name":"libv= irt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"floppy","unit":0,"drive":"libvirt-2-format","id":"fdc0= -0-0"}' \ --blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-stor= age","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/fd0","node-name":"libv= irt-2-storage","read-only":false}' \ +-device '{"driver":"floppy","unit":0,"drive":"libvirt-2-storage","id":"fdc= 0-0-0"}' \ +-blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-1-storage","read-only":false}' \ +-device '{"driver":"floppy","unit":1,"drive":"libvirt-1-storage","id":"fdc= 0-0-1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-floppy.x86_64-latest.args index fc5f693a8e..3a6bbe8689 100644 --- a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args @@ -27,15 +27,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":1}' \ --blockdev '{"driver":"host_device","filename":"/dev/fd0","node-name":"libv= irt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"floppy","unit":0,"drive":"libvirt-2-format","id":"fdc0= -0-0"}' \ --blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-stor= age","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/fd0","node-name":"libv= irt-2-storage","read-only":false}' \ +-device '{"driver":"floppy","unit":0,"drive":"libvirt-2-storage","id":"fdc= 0-0-0"}' \ +-blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-1-storage","read-only":false}' \ +-device '{"driver":"floppy","unit":1,"drive":"libvirt-1-storage","id":"fdc= 0-0-1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args b/test= s/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args index 90f633752f..78f30ea750 100644 --- a/tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args @@ -30,9 +30,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qco= w2","file":"libvirt-2-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-geometry.x86_64-latest.args b/test= s/qemuxml2argvdata/disk-geometry.x86_64-latest.args index 535a5cd5e8..139df58254 100644 --- a/tests/qemuxml2argvdata/disk-geometry.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-geometry.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1,"cyls":16383,"heads":16,"secs":63,"bios-c= hs-trans":"lba"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1,"cyls":16383,"heads":16,"secs":63,"bios-= chs-trans":"lba"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-ide-split.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-ide-split.x86_64-latest.args index 29e00d1fa2..58d782729f 100644 --- a/tests/qemuxml2argvdata/disk-ide-split.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-ide-split.x86_64-latest.args @@ -27,12 +27,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-2-form= at","id":"ide0-0-1"}' \ --blockdev '{"driver":"file","filename":"/tmp/idedisk.img","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":2,"drive":"libvirt-1-form= at","id":"ide0-0-2","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-2-stor= age","id":"ide0-0-1"}' \ +-blockdev '{"driver":"file","filename":"/tmp/idedisk.img","node-name":"lib= virt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":2,"drive":"libvirt-1-stor= age","id":"ide0-0-2","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args b/tests= /qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args index ef7edcce8b..d1013cf7ae 100644 --- a/tests/qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-1-form= at","id":"ide0-0-1","bootindex":1,"wwn":5764824127192592813,"serial":"WD-WM= AP9A966149"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-1-stor= age","id":"ide0-0-1","bootindex":1,"wwn":5764824127192592813,"serial":"WD-W= MAP9A966149"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args index 9ce8bf97b0..c508cf41ab 100644 --- a/tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args @@ -31,9 +31,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","= node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qco= w2","file":"libvirt-2-storage"}' \ -device '{"driver":"virtio-blk-pci","ioeventfd":true,"bus":"pci.0","addr":= "0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discar= d":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","tx":"bh","ioeventfd":false,"netdev":"= hostnet0","id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args index 4d3c184806..786917ef88 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args @@ -27,12 +27,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"gluster","volume":"Volume1","path":"Image","server":= [{"type":"inet","host":"example.org","port":"6000"}],"debug":4,"node-name":= "libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-3-format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"gluster","volume":"Volume2","path":"Image","server":= [{"type":"unix","path":"/path/to/sock"}],"debug":4,"node-name":"libvirt-2-s= torage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-2-format","id":"virtio-disk1"}' \ +-blockdev '{"driver":"gluster","volume":"Volume1","path":"Image","server":= [{"type":"inet","host":"example.org","port":"6000"}],"debug":4,"node-name":= "libvirt-3-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-3-storage","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"gluster","volume":"Volume2","path":"Image","server":= [{"type":"unix","path":"/path/to/sock"}],"debug":4,"node-name":"libvirt-2-s= torage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-2-storage","id":"virtio-disk1"}' \ -blockdev '{"driver":"gluster","volume":"Volume3","path":"Image.qcow2","se= rver":[{"type":"inet","host":"example.org","port":"6000"},{"type":"inet","h= ost":"example.org","port":"24007"},{"type":"unix","path":"/path/to/sock"}],= "debug":4,"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"= unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-1-format","id":"virtio-disk2"}' \ diff --git a/tests/qemuxml2argvdata/disk-network-http-nbdkit.x86_64-latest.= args b/tests/qemuxml2argvdata/disk-network-http-nbdkit.x86_64-latest.args index 37e46dfc20..8cb7feec1e 100644 --- a/tests/qemuxml2argvdata/disk-network-http-nbdkit.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-http-nbdkit.x86_64-latest.args @@ -27,18 +27,14 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-4-storage.socket"},"node-name":"= libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-4-format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-3-storage.socket"},"node-name":"= libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-3-format","id":"virtio-disk1"}' \ --blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-2-storage.socket"},"node-name":"= libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-2-format","id":"virtio-disk2"}' \ --blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-1-storage.socket"},"node-name":"= libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-1-format","id":"virtio-disk3"}' \ +-blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-4-storage.socket"},"node-name":"= libvirt-4-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-4-storage","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-3-storage.socket"},"node-name":"= libvirt-3-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-3-storage","id":"virtio-disk1"}' \ +-blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-2-storage.socket"},"node-name":"= libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-2-storage","id":"virtio-disk2"}' \ +-blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-1-storage.socket"},"node-name":"= libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-1-storage","id":"virtio-disk3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args index 47eee61a78..854a1154ac 100644 --- a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args @@ -27,20 +27,16 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"http","url":"http://example.org:80/test.img","timeou= t":1234,"node-name":"libvirt-4-storage","auto-read-only":true,"discard":"un= map"}' \ --blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-4-format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"https","url":"https://example.org:443/test2.img","re= adahead":1024,"node-name":"libvirt-3-storage","auto-read-only":true,"discar= d":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-3-format","id":"virtio-disk1"}' \ +-blockdev '{"driver":"http","url":"http://example.org:80/test.img","timeou= t":1234,"node-name":"libvirt-4-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-4-storage","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"https","url":"https://example.org:443/test2.img","re= adahead":1024,"node-name":"libvirt-3-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-3-storage","id":"virtio-disk1"}' \ -object '{"qom-type":"secret","id":"libvirt-2-storage-httpcookie-secret0",= "data":"DrPR9NA6GKJb7qi1KbjHaealKEMVtOWUl2h3yvO5lgIh6cyLHemmlg+h9fcgwREA","= keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}'= \ --blockdev '{"driver":"http","url":"http://example.org:1234/test3.img","coo= kie-secret":"libvirt-2-storage-httpcookie-secret0","node-name":"libvirt-2-s= torage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-2-format","id":"virtio-disk2"}' \ +-blockdev '{"driver":"http","url":"http://example.org:1234/test3.img","coo= kie-secret":"libvirt-2-storage-httpcookie-secret0","node-name":"libvirt-2-s= torage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-2-storage","id":"virtio-disk2"}' \ -object '{"qom-type":"secret","id":"libvirt-1-storage-httpcookie-secret0",= "data":"DrPR9NA6GKJb7qi1KbjHaealKEMVtOWUl2h3yvO5lgIh6cyLHemmlg+h9fcgwREA","= keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}'= \ --blockdev '{"driver":"https","url":"https://example.org:1234/test4.img?par= =3Dval&other=3Dble","sslverify":false,"cookie-secret":"libvirt-1-storage-ht= tpcookie-secret0","node-name":"libvirt-1-storage","auto-read-only":true,"di= scard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-1-format","id":"virtio-disk3"}' \ +-blockdev '{"driver":"https","url":"https://example.org:1234/test4.img?par= =3Dval&other=3Dble","sslverify":false,"cookie-secret":"libvirt-1-storage-ht= tpcookie-secret0","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-1-storage","id":"virtio-disk3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args index ef772b045e..1423b02223 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args @@ -28,30 +28,23 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ --blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example","lun":0,"transport":"tcp","node-name":"libvirt-7-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"raw= ","file":"libvirt-7-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-7-format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example","lun":1,"transport":"tcp","node-name":"libvirt-6-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ","file":"libvirt-6-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-6-format","id":"virtio-disk1"}' \ +-blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example","lun":0,"transport":"tcp","node-name":"libvirt-7-storage"= ,"read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-7-storage","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example","lun":1,"transport":"tcp","node-name":"libvirt-6-storage"= ,"read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-6-storage","id":"virtio-disk1"}' \ -object '{"qom-type":"secret","id":"libvirt-5-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ --blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-5-storage-auth-secret0","node-name":"libvirt-5-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ","file":"libvirt-5-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-5-format","id":"virtio-disk2"}' \ +-blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-5-storage-auth-secret0","node-name":"libvirt-5-storage"= ,"read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-5-storage","id":"virtio-disk2"}' \ -object '{"qom-type":"secret","id":"libvirt-4-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ --blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example:storage","lun":2,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-4-storage-auth-secret0","node-name":"libvirt-4-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-4-format","id":"virtio-disk3"}' \ --blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example","lun":0,"transport":"tcp","node-name":"libvirt-3-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":0,"drive":"libvirt-3-format","id":"scsi0-0-0-0"}' \ --blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example:server","lun":0,"transport":"tcp","initiator-name":"iqn.19= 92-01.com.example:client","node-name":"libvirt-2-storage","auto-read-only":= true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":1,"drive":"libvirt-2-format","id":"scsi0-0-0-1"}' \ +-blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example:storage","lun":2,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-4-storage-auth-secret0","node-name":"libvirt-4-storage"= ,"read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-4-storage","id":"virtio-disk3"}' \ +-blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example","lun":0,"transport":"tcp","node-name":"libvirt-3-storage"= ,"read-only":false}' \ +-device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":0,"drive":"libvirt-3-storage","id":"scsi0-0-0-0"}' \ +-blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example:server","lun":0,"transport":"tcp","initiator-name":"iqn.19= 92-01.com.example:client","node-name":"libvirt-2-storage","read-only":false= }' \ +-device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":1,"drive":"libvirt-2-storage","id":"scsi0-0-0-1"}' \ -object '{"qom-type":"secret","id":"libvirt-1-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ --blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example:server","lun":0,"transport":"tcp","user":"myname","passwor= d-secret":"libvirt-1-storage-auth-secret0","initiator-name":"iqn.1992-01.co= m.example:client","node-name":"libvirt-1-storage","auto-read-only":true,"di= scard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":2,"drive":"libvirt-1-format","id":"scsi0-0-0-2"}' \ +-blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example:server","lun":0,"transport":"tcp","user":"myname","passwor= d-secret":"libvirt-1-storage-auth-secret0","initiator-name":"iqn.1992-01.co= m.example:client","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":2,"drive":"libvirt-1-storage","id":"scsi0-0-0-2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args index 0eab774035..c47595e861 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args @@ -27,24 +27,18 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"node-name":"libvirt-6-storage","auto-read-only":true,"discard= ":"unmap"}' \ --blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ","file":"libvirt-6-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-6-format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"export":"bar","node-name":"libvirt-5-storage","auto-read-only= ":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ","file":"libvirt-5-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-5-format","id":"virtio-disk1"}' \ --blockdev '{"driver":"nbd","server":{"type":"inet","host":"::1","port":"60= 00"},"node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-4-format","id":"virtio-disk2"}' \ --blockdev '{"driver":"nbd","server":{"type":"inet","host":"::1","port":"60= 00"},"export":"bar","node-name":"libvirt-3-storage","auto-read-only":true,"= discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-3-format","id":"virtio-disk3"}' \ --blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/run/nbdsoc= k"},"export":"bar","node-name":"libvirt-2-storage","auto-read-only":true,"d= iscard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-2-format","id":"virtio-disk4"}' \ --blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"export":"foo","reconnect-delay":10,"node-name":"libvirt-1-sto= rage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-format","id":"virtio-disk5"}' \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"node-name":"libvirt-6-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-6-storage","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"export":"bar","node-name":"libvirt-5-storage","read-only":fal= se}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-5-storage","id":"virtio-disk1"}' \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"::1","port":"60= 00"},"node-name":"libvirt-4-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-4-storage","id":"virtio-disk2"}' \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"::1","port":"60= 00"},"export":"bar","node-name":"libvirt-3-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-3-storage","id":"virtio-disk3"}' \ +-blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/run/nbdsoc= k"},"export":"bar","node-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-2-storage","id":"virtio-disk4"}' \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"export":"foo","reconnect-delay":10,"node-name":"libvirt-1-sto= rage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-storage","id":"virtio-disk5"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args index 1db2f5d30a..a32475eadf 100644 --- a/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"nfs","server":{"host":"example.com","type":"inet"},"= path":"/foo/bar/baz","user":6234,"group":12354,"node-name":"libvirt-3-stora= ge","auto-read-only":true,"discard":"unmap","cache":{"direct":true,"no-flus= h":false}}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"raw","file":"libvirt-3-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-3-format","id":"virtio-disk0","bootindex":1,"write-cache":"on","seria= l":"eb90327c-8302-4725-9e1b-4e85ed4dc251"}' \ +-blockdev '{"driver":"nfs","server":{"host":"example.com","type":"inet"},"= path":"/foo/bar/baz","user":6234,"group":12354,"node-name":"libvirt-3-stora= ge","read-only":false,"cache":{"direct":true,"no-flush":false}}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-3-storage","id":"virtio-disk0","bootindex":1,"write-cache":"on","seri= al":"eb90327c-8302-4725-9e1b-4e85ed4dc251"}' \ -blockdev '{"driver":"nfs","server":{"host":"example.org","type":"inet"},"= path":"/backing/store/nfs","user":1234,"group":5678,"node-name":"libvirt-2-= storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"qcow= 2","file":"libvirt-2-storage","backing":null}' \ -blockdev '{"driver":"gluster","volume":"Volume2","path":"Image","server":= [{"type":"unix","path":"/path/to/sock"}],"debug":4,"node-name":"libvirt-1-s= torage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/disk-network-rbd-encryption-luks-any.x8= 6_64-latest.args b/tests/qemuxml2argvdata/disk-network-rbd-encryption-luks-= any.x86_64-latest.args index 18c2c66074..734f63b31e 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd-encryption-luks-any.x86_64-la= test.args +++ b/tests/qemuxml2argvdata/disk-network-rbd-encryption-luks-any.x86_64-la= test.args @@ -27,10 +27,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encryp= tdisk/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --object '{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ --blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"encrypt":{"format":"luks-any"= ,"key-secret":"libvirt-1-format-encryption-secret0"},"node-name":"libvirt-1= -storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-object '{"qom-type":"secret","id":"libvirt-1-storage-encryption-secret0",= "data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","= keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}'= \ +-blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"encrypt":{"format":"luks-any"= ,"key-secret":"libvirt-1-storage-encryption-secret0"},"node-name":"libvirt-= 1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest= .args b/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args index 2c30671514..ca081c7fc1 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args @@ -27,12 +27,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1}' \ --blockdev '{"driver":"rbd","pool":"poolname","image":"imagename:rbd_cache= =3D1:rbd_cache_size=3D67108864:rbd_cache_max_dirty=3D0","server":[{"host":"= mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"},= {"host":"mon3.example.org","port":"6322"}],"node-name":"libvirt-1-storage",= "auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-stor= age","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"rbd","pool":"poolname","image":"imagename:rbd_cache= =3D1:rbd_cache_size=3D67108864:rbd_cache_max_dirty=3D0","server":[{"host":"= mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"},= {"host":"mon3.example.org","port":"6322"}],"node-name":"libvirt-1-storage",= "read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-storage","id":"virtio-disk0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args index 735e6dcf3c..f344b57371 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args @@ -27,25 +27,19 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"node-name":"libvirt-6-storage= ","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ","file":"libvirt-6-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-6-format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"rbd","pool":"pool","image":"image","snapshot":"asdf"= ,"node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ","file":"libvirt-5-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-5-format","id":"virtio-disk1"}' \ --blockdev '{"driver":"rbd","pool":"pool","image":"image","snapshot":"foo",= "server":[{"host":"mon1.example.org","port":"6321"},{"host":"mon2.example.o= rg","port":"6322"},{"host":"mon3.example.org","port":"6322"}],"node-name":"= libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-4-format","id":"virtio-disk2"}' \ --blockdev '{"driver":"rbd","pool":"pool","image":"image","snapshot":"foo",= "conf":"/blah/test.conf","node-name":"libvirt-3-storage","auto-read-only":t= rue,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-3-format","id":"virtio-disk3"}' \ +-blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"node-name":"libvirt-6-storage= ","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-6-storage","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"rbd","pool":"pool","image":"image","snapshot":"asdf"= ,"node-name":"libvirt-5-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-5-storage","id":"virtio-disk1"}' \ +-blockdev '{"driver":"rbd","pool":"pool","image":"image","snapshot":"foo",= "server":[{"host":"mon1.example.org","port":"6321"},{"host":"mon2.example.o= rg","port":"6322"},{"host":"mon3.example.org","port":"6322"}],"node-name":"= libvirt-4-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-4-storage","id":"virtio-disk2"}' \ +-blockdev '{"driver":"rbd","pool":"pool","image":"image","snapshot":"foo",= "conf":"/blah/test.conf","node-name":"libvirt-3-storage","read-only":false}= ' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-3-storage","id":"virtio-disk3"}' \ -object '{"qom-type":"secret","id":"libvirt-2-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ --blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"user":"myname","auth-client-r= equired":["cephx","none"],"key-secret":"libvirt-2-storage-auth-secret0","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-2-format","id":"virtio-disk4"}' \ --blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"::1","port":"6321"},{"host":"example.org","port":"6789"},{"host":"ffff:12= 34:567:abc::0f","port":"6322"},{"host":"2001:db8::ff00:42:8329","port":"632= 2"}],"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-format","id":"virtio-disk5"}' \ +-blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"user":"myname","auth-client-r= equired":["cephx","none"],"key-secret":"libvirt-2-storage-auth-secret0","no= de-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-2-storage","id":"virtio-disk4"}' \ +-blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"::1","port":"6321"},{"host":"example.org","port":"6789"},{"host":"ffff:12= 34:567:abc::0f","port":"6322"},{"host":"2001:db8::ff00:42:8329","port":"632= 2"}],"node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-storage","id":"virtio-disk5"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.= args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args index 1e9eeb2ac8..8ba9fbf79f 100644 --- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args @@ -28,17 +28,14 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -object '{"qom-type":"secret","id":"libvirt-3-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ --blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-3-storage-auth-secret0","node-name":"libvirt-3-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-3-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-3-storage-auth-secret0","node-name":"libvirt-3-storage"= ,"read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-3-storage","id":"virtio-disk0","bootindex":1}' \ -object '{"qom-type":"secret","id":"libvirt-2-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ --blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"user":"myname","auth-client-r= equired":["cephx","none"],"key-secret":"libvirt-2-storage-auth-secret0","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-2-format","id":"virtio-disk1"}' \ +-blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"user":"myname","auth-client-r= equired":["cephx","none"],"key-secret":"libvirt-2-storage-auth-secret0","no= de-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-2-storage","id":"virtio-disk1"}' \ -object '{"qom-type":"secret","id":"libvirt-1-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ --blockdev '{"driver":"rbd","pool":"pool","image":"image2","server":[{"host= ":"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322= "},{"host":"mon3.example.org","port":"6322"}],"user":"myname","auth-client-= required":["cephx","none"],"key-secret":"libvirt-1-storage-auth-secret0","n= ode-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-1-format","id":"virtio-disk2"}' \ +-blockdev '{"driver":"rbd","pool":"pool","image":"image2","server":[{"host= ":"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322= "},{"host":"mon3.example.org","port":"6322"}],"user":"myname","auth-client-= required":["cephx","none"],"key-secret":"libvirt-1-storage-auth-secret0","n= ode-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-1-storage","id":"virtio-disk2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-source-curl-nbdkit.x86_64-= latest.args b/tests/qemuxml2argvdata/disk-network-source-curl-nbdkit.x86_64= -latest.args index c88661f369..031f1c45f9 100644 --- a/tests/qemuxml2argvdata/disk-network-source-curl-nbdkit.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/disk-network-source-curl-nbdkit.x86_64-latest.= args @@ -28,22 +28,18 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"ahci","id":"sata0","bus":"pci.0","addr":"0x2"}' \ --blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-5-storage.socket"},"node-name":"= libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-5-format","read-only":true,"driver":"raw"= ,"file":"libvirt-5-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-5-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-5-storage.socket"},"node-name":"= libvirt-5-storage","read-only":true}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-5-storage","id":"virtio-disk0","bootindex":1}' \ -object '{"qom-type":"secret","id":"libvirt-4-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-4-storage.socket"},"node-name":"= libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"luk= s","key-secret":"libvirt-4-format-encryption-secret0","file":"libvirt-4-sto= rage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-4-format","id":"virtio-disk4"}' \ --blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-3-storage.socket"},"node-name":"= libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ --device '{"driver":"ide-cd","bus":"sata0.1","drive":"libvirt-3-format","id= ":"sata0-0-1"}' \ --blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-2-storage.socket"},"node-name":"= libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device '{"driver":"ide-cd","bus":"sata0.2","drive":"libvirt-2-format","id= ":"sata0-0-2"}' \ --blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-1-storage.socket"},"node-name":"= libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"sata0.3","drive":"libvirt-1-format","id= ":"sata0-0-3"}' \ +-blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-3-storage.socket"},"node-name":"= libvirt-3-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"sata0.1","drive":"libvirt-3-storage","i= d":"sata0-0-1"}' \ +-blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-2-storage.socket"},"node-name":"= libvirt-2-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"sata0.2","drive":"libvirt-2-storage","i= d":"sata0-0-2"}' \ +-blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-1-storage.socket"},"node-name":"= libvirt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"sata0.3","drive":"libvirt-1-storage","i= d":"sata0-0-3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-source-curl.x86_64-latest.= args b/tests/qemuxml2argvdata/disk-network-source-curl.x86_64-latest.args index f6ab5532cc..55574bc153 100644 --- a/tests/qemuxml2argvdata/disk-network-source-curl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-source-curl.x86_64-latest.args @@ -29,9 +29,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"ahci","id":"sata0","bus":"pci.0","addr":"0x2"}' \ -object '{"qom-type":"secret","id":"libvirt-5-storage-httpcookie-secret0",= "data":"BUU0KmnWfonHdjzhYhwVQZ5iTI1KweTJ22q8XWUVoBCVu1z70reDuczPBIabZtC3","= keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}'= \ --blockdev '{"driver":"https","url":"https://https.example.org:8443/path/to= /disk1.iso","cookie-secret":"libvirt-5-storage-httpcookie-secret0","node-na= me":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-5-format","read-only":true,"driver":"raw"= ,"file":"libvirt-5-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-5-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"https","url":"https://https.example.org:8443/path/to= /disk1.iso","cookie-secret":"libvirt-5-storage-httpcookie-secret0","node-na= me":"libvirt-5-storage","read-only":true}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-5-storage","id":"virtio-disk0","bootindex":1}' \ -object '{"qom-type":"secret","id":"libvirt-4-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -object '{"qom-type":"secret","id":"libvirt-4-storage-httpcookie-secret0",= "data":"BUU0KmnWfonHdjzhYhwVQZ5iTI1KweTJ22q8XWUVoBCVu1z70reDuczPBIabZtC3","= keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}'= \ -object '{"qom-type":"secret","id":"libvirt-4-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ @@ -39,15 +38,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"luk= s","key-secret":"libvirt-4-format-encryption-secret0","file":"libvirt-4-sto= rage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-4-format","id":"virtio-disk4"}' \ -object '{"qom-type":"secret","id":"libvirt-3-storage-httpcookie-secret0",= "data":"BUU0KmnWfonHdjzhYhwVQZ5iTI1KweTJ22q8XWUVoBBv7TuTgTkyAyOPpC2P5qLbOIy= pLoHpppjz+u5O+X8oT+jA1m7q/OJQ8dk2EFD5c0A=3D","keyid":"masterKey0","iv":"AAE= CAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ --blockdev '{"driver":"http","url":"http://http.example.org:8080/path/to/di= sk2.iso","cookie-secret":"libvirt-3-storage-httpcookie-secret0","node-name"= :"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ --device '{"driver":"ide-cd","bus":"sata0.1","drive":"libvirt-3-format","id= ":"sata0-0-1"}' \ --blockdev '{"driver":"ftp","url":"ftp://ftp.example.org:20/path/to/disk3.i= so","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device '{"driver":"ide-cd","bus":"sata0.2","drive":"libvirt-2-format","id= ":"sata0-0-2"}' \ --blockdev '{"driver":"ftps","url":"ftps://ftps.example.org:22/path/to/disk= 4.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unm= ap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"sata0.3","drive":"libvirt-1-format","id= ":"sata0-0-3"}' \ +-blockdev '{"driver":"http","url":"http://http.example.org:8080/path/to/di= sk2.iso","cookie-secret":"libvirt-3-storage-httpcookie-secret0","node-name"= :"libvirt-3-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"sata0.1","drive":"libvirt-3-storage","i= d":"sata0-0-1"}' \ +-blockdev '{"driver":"ftp","url":"ftp://ftp.example.org:20/path/to/disk3.i= so","node-name":"libvirt-2-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"sata0.2","drive":"libvirt-2-storage","i= d":"sata0-0-2"}' \ +-blockdev '{"driver":"ftps","url":"ftps://ftps.example.org:22/path/to/disk= 4.iso","node-name":"libvirt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"sata0.3","drive":"libvirt-1-storage","i= d":"sata0-0-3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-ssh-nbdkit.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/disk-network-ssh-nbdkit.x86_64-latest.args index fd24e51570..00a7b523b0 100644 --- a/tests/qemuxml2argvdata/disk-network-ssh-nbdkit.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-ssh-nbdkit.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-1-storage.socket"},"node-name":"= libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-1-storage.socket"},"node-name":"= libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-ssh-password.x86_64-latest= .args b/tests/qemuxml2argvdata/disk-network-ssh-password.x86_64-latest.args index fd24e51570..00a7b523b0 100644 --- a/tests/qemuxml2argvdata/disk-network-ssh-password.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-ssh-password.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-1-storage.socket"},"node-name":"= libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/lib/libvir= t/qemu/domain--1-QEMUGuest1/nbdkit-libvirt-1-storage.socket"},"node-name":"= libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-ssh.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-network-ssh.x86_64-latest.args index b7fd30032b..ba5f59643f 100644 --- a/tests/qemuxml2argvdata/disk-network-ssh.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-ssh.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"ssh","path":"test.img","server":{"host":"example.org= ","port":"2222"},"node-name":"libvirt-1-storage","auto-read-only":true,"dis= card":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"ssh","path":"test.img","server":{"host":"example.org= ","port":"2222"},"node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_6= 4-latest.args b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x8= 6_64-latest.args index 5030e76a75..4ee9a0631b 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-lates= t.args @@ -29,9 +29,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -object '{"qom-type":"secret","id":"objlibvirt-1-storage_tls0-secret0","da= ta":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","key= id":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -object '{"qom-type":"tls-creds-x509","id":"objlibvirt-1-storage_tls0","di= r":"/etc/pki/libvirt-nbd","endpoint":"client","verify-peer":true,"passwordi= d":"objlibvirt-1-storage_tls0-secret0"}' \ --blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.com","p= ort":"1234"},"tls-creds":"objlibvirt-1-storage_tls0","tls-hostname":"test-h= ostname","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"u= nmap","cache":{"direct":true,"no-flush":false}}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-format","id":"virtio-disk3","bootindex":1,"write-cache":"on"}' \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.com","p= ort":"1234"},"tls-creds":"objlibvirt-1-storage_tls0","tls-hostname":"test-h= ostname","node-name":"libvirt-1-storage","read-only":false,"cache":{"direct= ":true,"no-flush":false}}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-storage","id":"virtio-disk3","bootindex":1,"write-cache":"on"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.= args b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args index 905d8c2451..fb68ac54fb 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args @@ -29,9 +29,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -object '{"qom-type":"secret","id":"objlibvirt-1-storage_tls0-secret0","da= ta":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","key= id":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -object '{"qom-type":"tls-creds-x509","id":"objlibvirt-1-storage_tls0","di= r":"/etc/pki/libvirt-nbd","endpoint":"client","verify-peer":true,"passwordi= d":"objlibvirt-1-storage_tls0-secret0"}' \ --blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.com","p= ort":"1234"},"tls-creds":"objlibvirt-1-storage_tls0","node-name":"libvirt-1= -storage","auto-read-only":true,"discard":"unmap","cache":{"direct":true,"n= o-flush":false}}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-format","id":"virtio-disk3","bootindex":1,"write-cache":"on"}' \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.com","p= ort":"1234"},"tls-creds":"objlibvirt-1-storage_tls0","node-name":"libvirt-1= -storage","read-only":false,"cache":{"direct":true,"no-flush":false}}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-storage","id":"virtio-disk3","bootindex":1,"write-cache":"on"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-no-boot.x86_64-latest.args b/tests= /qemuxml2argvdata/disk-no-boot.x86_64-latest.args index 1d1375910f..7f007f6c4d 100644 --- a/tests/qemuxml2argvdata/disk-no-boot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-no-boot.x86_64-latest.args @@ -28,15 +28,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -global isa-fdc.bootindexA=3D3 \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":2}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-2-form= at","id":"ide0-1-0","bootindex":1}' \ --blockdev '{"driver":"host_device","filename":"/dev/fd0","node-name":"libv= irt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"floppy","unit":0,"drive":"libvirt-1-format","id":"fdc0= -0-0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-stor= age","id":"ide0-0-0","bootindex":2}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-2-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-2-stor= age","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/fd0","node-name":"libv= irt-1-storage","read-only":false}' \ +-device '{"driver":"floppy","unit":0,"drive":"libvirt-1-storage","id":"fdc= 0-0-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args b/tests/qe= muxml2argvdata/disk-nvme.x86_64-latest.args index b4b8a62447..4bb7d67dc9 100644 --- a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args @@ -28,15 +28,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 3"}' \ --blockdev '{"driver":"nvme","device":"0000:01:00.0","namespace":1,"node-na= me":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-4-format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"nvme","device":"0000:01:00.0","namespace":2,"node-na= me":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-3-format","id":"virtio-disk1"}' \ --blockdev '{"driver":"nvme","device":"0000:02:00.0","namespace":1,"node-na= me":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-2-format","id":"virtio-disk2"}' \ +-blockdev '{"driver":"nvme","device":"0000:01:00.0","namespace":1,"node-na= me":"libvirt-4-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-4-storage","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"nvme","device":"0000:01:00.0","namespace":2,"node-na= me":"libvirt-3-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-3-storage","id":"virtio-disk1"}' \ +-blockdev '{"driver":"nvme","device":"0000:02:00.0","namespace":1,"node-na= me":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-2-storage","id":"virtio-disk2"}' \ -object '{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"nvme","device":"0001:02:00.0","namespace":2,"node-na= me":"libvirt-1-storage","auto-read-only":true,"discard":"unmap","cache":{"d= irect":true,"no-flush":false}}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","encrypt":{"format":"luks","ke= y-secret":"libvirt-1-format-encryption-secret0"},"file":"libvirt-1-storage"= }' \ diff --git a/tests/qemuxml2argvdata/disk-order.x86_64-latest.args b/tests/q= emuxml2argvdata/disk-order.x86_64-latest.args index c7da90fb5d..bf1d6983a4 100644 --- a/tests/qemuxml2argvdata/disk-order.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-order.x86_64-latest.args @@ -27,18 +27,14 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-4-form= at","id":"ide0-0-0","bootindex":1}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-3-form= at","id":"ide0-1-0"}' \ --blockdev '{"driver":"file","filename":"/tmp/data.img","node-name":"libvir= t-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-2-format","id":"virtio-disk0"}' \ --blockdev '{"driver":"file","filename":"/tmp/logs.img","node-name":"libvir= t-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-1-format","id":"virtio-disk1"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-4-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-4-stor= age","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-3-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-3-stor= age","id":"ide0-1-0"}' \ +-blockdev '{"driver":"file","filename":"/tmp/data.img","node-name":"libvir= t-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-2-storage","id":"virtio-disk0"}' \ +-blockdev '{"driver":"file","filename":"/tmp/logs.img","node-name":"libvir= t-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-1-storage","id":"virtio-disk1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args index d952469bff..41d9f53b3b 100644 --- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args @@ -27,12 +27,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1}' \ --blockdev '{"driver":"host_device","filename":"/dev/sr0","node-name":"libv= irt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-stor= age","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/sr0","node-name":"libv= irt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-rotation.x86_64-latest.args b/test= s/qemuxml2argvdata/disk-rotation.x86_64-latest.args index 5245491e23..f66c6ad412 100644 --- a/tests/qemuxml2argvdata/disk-rotation.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-rotation.x86_64-latest.args @@ -28,15 +28,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-3-format","id":"scsi0-0= -0-0","bootindex":1,"rotation_rate":7200}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :1,"device_id":"drive-scsi0-0-0-1","drive":"libvirt-2-format","id":"scsi0-0= -0-1","rotation_rate":1}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest3","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","rotation_rate":4500}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-3-storage","id":"scsi0-= 0-0-0","bootindex":1,"rotation_rate":7200}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :1,"device_id":"drive-scsi0-0-0-1","drive":"libvirt-2-storage","id":"scsi0-= 0-0-1","rotation_rate":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest3","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","rotation_rate":4500}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args index b60d9b16d4..bd02898f37 100644 --- a/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args @@ -28,9 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"ahci","id":"sata0","bus":"pci.0","addr":"0x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUG uest1","n= ode-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"sata0.0","drive":"libvirt-1-format","id= ":"sata0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUG uest1","n= ode-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"sata0.0","drive":"libvirt-1-storage","i= d":"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.arg= s b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args index 2fb582630f..f8399e3032 100644 --- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args @@ -28,12 +28,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"lsi","id":"scsi0","bus":"pci.0","addr":"0x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1}' \ --blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi0.0","scsi-id":0,"device_id":"driv= e-scsi0-0-0","drive":"libvirt-1-format","id":"scsi0-0-0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-stor= age","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-1-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","scsi-id":0,"device_id":"driv= e-scsi0-0-0","drive":"libvirt-1-storage","id":"scsi0-0-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args index de25fffade..9ca00368e9 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args @@ -31,18 +31,14 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -device '{"driver":"lsi","id":"scsi1","bus":"pci.0","addr":"0x3"}' \ -device '{"driver":"lsi","id":"scsi2","bus":"pci.0","addr":"0x4"}' \ -device '{"driver":"virtio-scsi-pci","id":"scsi3","bus":"pci.0","addr":"0x= 5"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-4-format","read-only":true,"driver":"raw"= ,"file":"libvirt-4-storage"}' \ --device '{"driver":"scsi-cd","bus":"scsi0.0","channel":0,"scsi-id":1,"lun"= :0,"device_id":"drive-scsi0-0-1-0","drive":"libvirt-4-format","id":"scsi0-0= -1-0"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ --device '{"driver":"scsi-cd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-3-format","id":"scsi0-0= -0-0"}' \ --blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :1,"device_id":"drive-scsi0-0-0-1","drive":"libvirt-2-format","id":"scsi0-0= -0-1","bootindex":1}' \ --blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":1,"lun"= :1,"device_id":"drive-scsi0-0-1-1","drive":"libvirt-1-format","id":"scsi0-0= -1-1"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-4-storage","read-only":true}' \ +-device '{"driver":"scsi-cd","bus":"scsi0.0","channel":0,"scsi-id":1,"lun"= :0,"device_id":"drive-scsi0-0-1-0","drive":"libvirt-4-storage","id":"scsi0-= 0-1-0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-3-storage","read-only":true}' \ +-device '{"driver":"scsi-cd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-3-storage","id":"scsi0-= 0-0-0"}' \ +-blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-2-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :1,"device_id":"drive-scsi0-0-0-1","drive":"libvirt-2-storage","id":"scsi0-= 0-0-1","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-1-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":1,"lun"= :1,"device_id":"drive-scsi0-0-1-1","drive":"libvirt-1-storage","id":"scsi0-= 0-1-1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args index 8cee3f6b83..4234a7e677 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args @@ -29,12 +29,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ -device '{"driver":"lsi","id":"scsi1","bus":"pci.0","addr":"0x3"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device '{"driver":"scsi-cd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-2-format","id":"scsi0-0= -0-0","vendor":"SEAGATE","product":"ST3146707LC"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi1.0","scsi-id":0,"device_id":"driv= e-scsi1-0-0","drive":"libvirt-1-format","id":"scsi1-0-0","bootindex":1,"ven= dor":"SEA GATE","product":"ST67 807GD"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","read-only":true}' \ +-device '{"driver":"scsi-cd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-2-storage","id":"scsi0-= 0-0-0","vendor":"SEAGATE","product":"ST3146707LC"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","read-only":true}' \ +-device '{"driver":"scsi-hd","bus":"scsi1.0","scsi-id":0,"device_id":"driv= e-scsi1-0-0","drive":"libvirt-1-storage","id":"scsi1-0-0","bootindex":1,"ve= ndor":"SEA GATE","product":"ST67 807GD"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args index 77c63b72cc..b9897f748c 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args @@ -29,12 +29,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ -device '{"driver":"lsi","id":"scsi1","bus":"pci.0","addr":"0x3"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device '{"driver":"scsi-cd","bus":"scsi0.0","channel":0,"scsi-id":1,"lun"= :0,"device_id":"WD-WMAP9A966149","drive":"libvirt-2-format","id":"scsi0-0-1= -0","wwn":5764824127192592812,"serial":"WD-WMAP9A966149"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-1-format","id":"scsi0-0= -0-0","bootindex":1,"wwn":5764824127192592813}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","read-only":true}' \ +-device '{"driver":"scsi-cd","bus":"scsi0.0","channel":0,"scsi-id":1,"lun"= :0,"device_id":"WD-WMAP9A966149","drive":"libvirt-2-storage","id":"scsi0-0-= 1-0","wwn":5764824127192592812,"serial":"WD-WMAP9A966149"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-1-storage","id":"scsi0-= 0-0-0","bootindex":1,"wwn":5764824127192592813}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest= .args b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest.args index fe17ce224f..eacf10b64f 100644 --- a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest.args @@ -29,12 +29,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ -device '{"driver":"lsi","id":"scsi1","bus":"pci.0","addr":"0x3"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":0,"drive":"libvirt-2-format","id":"scsi0-0-0-0","bootindex":1}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":1,"l= un":1,"drive":"libvirt-1-format","id":"scsi0-0-1-1"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":0,"drive":"libvirt-2-storage","id":"scsi0-0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":1,"l= un":1,"drive":"libvirt-1-storage","id":"scsi0-0-1-1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args b/tests/qe= muxml2argvdata/disk-scsi.x86_64-latest.args index b9f485ff09..1b8150f4d4 100644 --- a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args @@ -32,24 +32,18 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -device '{"driver":"mptsas1068","id":"scsi2","bus":"pci.0","addr":"0x4"}' \ -device '{"driver":"spapr-vscsi","id":"scsi3","reg":8192}' \ -device '{"driver":"pvscsi","id":"scsi4","bus":"pci.0","addr":"0x5"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ","file":"libvirt-6-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-6-form= at","id":"ide0-0-0","bootindex":1}' \ --blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ","file":"libvirt-5-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi0.0","scsi-id":0,"device_id":"driv= e-scsi0-0-0","drive":"libvirt-5-format","id":"scsi0-0-0"}' \ --blockdev '{"driver":"file","filename":"/tmp/scsidisk2.img","node-name":"l= ibvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi1.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"abcdefghijklmn","drive":"libvirt-4-format","id":"scsi1-0-0-= 0","serial":"abcdefghijklmn"}' \ --blockdev '{"driver":"file","filename":"/tmp/scsidisk3.img","node-name":"l= ibvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi2.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi2-0-0-0","drive":"libvirt-3-format","id":"scsi2-0= -0-0","wwn":5764824127192592812}' \ --blockdev '{"driver":"file","filename":"/tmp/scsidisk4.img","node-name":"l= ibvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi3.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi3-0-0-0","drive":"libvirt-2-format","id":"scsi3-0= -0-0"}' \ --blockdev '{"driver":"file","filename":"/tmp/scsidisk5.img","node-name":"l= ibvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi4.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi4-0-0-0","drive":"libvirt-1-format","id":"scsi4-0= -0-0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-6-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-6-stor= age","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-5-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","scsi-id":0,"device_id":"driv= e-scsi0-0-0","drive":"libvirt-5-storage","id":"scsi0-0-0"}' \ +-blockdev '{"driver":"file","filename":"/tmp/scsidisk2.img","node-name":"l= ibvirt-4-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi1.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"abcdefghijklmn","drive":"libvirt-4-storage","id":"scsi1-0-0= -0","serial":"abcdefghijklmn"}' \ +-blockdev '{"driver":"file","filename":"/tmp/scsidisk3.img","node-name":"l= ibvirt-3-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi2.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi2-0-0-0","drive":"libvirt-3-storage","id":"scsi2-= 0-0-0","wwn":5764824127192592812}' \ +-blockdev '{"driver":"file","filename":"/tmp/scsidisk4.img","node-name":"l= ibvirt-2-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi3.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi3-0-0-0","drive":"libvirt-2-storage","id":"scsi3-= 0-0-0"}' \ +-blockdev '{"driver":"file","filename":"/tmp/scsidisk5.img","node-name":"l= ibvirt-1-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi4.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi4-0-0-0","drive":"libvirt-1-storage","id":"scsi4-= 0-0-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-serial.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-serial.x86_64-latest.args index f0f03b5ff2..626900f130 100644 --- a/tests/qemuxml2argvdata/disk-serial.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-serial.x86_64-latest.args @@ -27,12 +27,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-2-form= at","id":"ide0-0-1","bootindex":1,"serial":"\\ \\ WD-WMAP9A966149"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/AllSerialChars"= ,"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":2,"drive":"libvirt-1-form= at","id":"ide0-0-2","serial":"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRS= TUVWXYZ0123456789-_\\ .+"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-2-stor= age","id":"ide0-0-1","bootindex":1,"serial":"\\ \\ WD-WMAP9A966149"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/AllSerialChars"= ,"node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":2,"drive":"libvirt-1-stor= age","id":"ide0-0-2","serial":"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQR= STUVWXYZ0123456789-_\\ .+"}' \ -drive file=3D/some/file,format=3Draw,if=3Dsd,index=3D0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-shared.x86_64-latest.args index 9ef920d1e9..c990126d13 100644 --- a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args @@ -28,18 +28,14 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap","cache= ":{"direct":true,"no-flush":false}}' \ --blockdev '{"node-name":"libvirt-4-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"raw","file":"libvirt-4-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"share-rw":true,"drive"= :"libvirt-4-format","id":"ide0-0-0","bootindex":1,"write-cache":"on","seria= l":"XYZXYZXYZYXXYZYZYXYZY"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-3-form= at","id":"ide0-1-0"}' \ --blockdev '{"driver":"host_device","filename":"/dev/scsi","node-name":"lib= virt-2-storage","auto-read-only":true,"discard":"unmap","cache":{"direct":t= rue,"no-flush":false}}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"raw","file":"libvirt-2-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","share-rw":true,"drive":"libvirt-2-forma= t","id":"scsi0-0-0-0","write-cache":"on"}' \ --blockdev '{"driver":"host_device","filename":"/dev/virtio","node-name":"l= ibvirt-1-storage","auto-read-only":true,"discard":"unmap","cache":{"direct"= :true,"no-flush":false}}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","share-rw":= true,"drive":"libvirt-1-format","id":"virtio-disk0","write-cache":"on"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-4-storage","read-only":false,"cache":{"direct":true,"no-f= lush":false}}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"share-rw":true,"drive"= :"libvirt-4-storage","id":"ide0-0-0","bootindex":1,"write-cache":"on","seri= al":"XYZXYZXYZYXXYZYZYXYZY"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-3-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-3-stor= age","id":"ide0-1-0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/scsi","node-name":"lib= virt-2-storage","read-only":false,"cache":{"direct":true,"no-flush":false}}= ' \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","share-rw":true,"drive":"libvirt-2-stora= ge","id":"scsi0-0-0-0","write-cache":"on"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/virtio","node-name":"l= ibvirt-1-storage","read-only":false,"cache":{"direct":true,"no-flush":false= }}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","share-rw":= true,"drive":"libvirt-1-storage","id":"virtio-disk0","write-cache":"on"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-slices.x86_64-latest.args index b2c49a2df4..c28eeb827e 100644 --- a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args @@ -28,9 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/raw.img","= node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"driver":"raw","offset":0,"size":321,"file":"libvirt-6-storage= ","node-name":"libvirt-6-slice-sto","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ","file":"libvirt-6-slice-sto"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-6-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"raw","offset":0,"size":321,"file":"libvirt-6-storage= ","node-name":"libvirt-6-slice-sto","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-6-slice-sto","id":"virtio-disk0","bootindex":1}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/raw.img","= node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"driver":"raw","offset":9876,"size":123456789,"file":"libvirt-= 5-storage","node-name":"libvirt-5-slice-sto","auto-read-only":true,"discard= ":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":true,"driver":"qcow= 2","file":"libvirt-5-slice-sto","backing":null}' \ @@ -43,9 +42,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"luk= s","key-secret":"libvirt-3-format-encryption-secret0","file":"libvirt-3-sli= ce-sto"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-3-format","id":"virtio-disk2"}' \ -blockdev '{"driver":"nvme","device":"0000:02:00.0","namespace":1,"node-na= me":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"driver":"raw","offset":1234,"size":321,"file":"libvirt-2-stor= age","node-name":"libvirt-2-slice-sto","auto-read-only":true,"discard":"unm= ap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-slice-sto"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-2-format","id":"virtio-disk3"}' \ +-blockdev '{"driver":"raw","offset":1234,"size":321,"file":"libvirt-2-stor= age","node-name":"libvirt-2-slice-sto","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-2-slice-sto","id":"virtio-disk3"}' \ -object '{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"nvme","device":"0001:02:00.0","namespace":2,"node-na= me":"libvirt-1-storage","auto-read-only":true,"discard":"unmap","cache":{"d= irect":true,"no-flush":false}}' \ -blockdev '{"driver":"raw","offset":1234,"size":321,"file":"libvirt-1-stor= age","node-name":"libvirt-1-slice-sto","auto-read-only":true,"discard":"unm= ap","cache":{"direct":true,"no-flush":false}}' \ diff --git a/tests/qemuxml2argvdata/disk-snapshot.x86_64-latest.args b/test= s/qemuxml2argvdata/disk-snapshot.x86_64-latest.args index 67584ad565..69e7ebb14e 100644 --- a/tests/qemuxml2argvdata/disk-snapshot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-snapshot.x86_64-latest.args @@ -33,9 +33,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest3","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap","cache= ":{"direct":true,"no-flush":false}}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-2-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.2","unit":0,"drive":"libvirt-2-form= at","id":"ide0-2-0","write-cache":"on"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.arg= s b/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.args index 24c6d68e2f..2f41b255b4 100644 --- a/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.args @@ -27,18 +27,14 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/some/block/device/unit:0:0= :1","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-4-format","read-only":true,"driver":"raw"= ,"file":"libvirt-4-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-4-form= at","id":"ide0-0-1"}' \ --blockdev '{"driver":"iscsi","portal":"iscsi.example.com:3260","target":"d= emo-target","lun":2,"transport":"tcp","node-name":"libvirt-3-storage","auto= -read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.0","unit":2,"drive":"libvirt-3-form= at","id":"ide0-0-2"}' \ --blockdev '{"driver":"file","filename":"/tmp/idedisk.img","node-name":"lib= virt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":3,"drive":"libvirt-2-form= at","id":"ide0-0-3","bootindex":1}' \ --blockdev '{"driver":"iscsi","portal":"iscsi.example.com:3260","target":"d= emo-target","lun":3,"transport":"tcp","node-name":"libvirt-1-storage","auto= -read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.0","unit":4,"drive":"libvirt-1-form= at","id":"ide0-0-4"}' \ +-blockdev '{"driver":"host_device","filename":"/some/block/device/unit:0:0= :1","node-name":"libvirt-4-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-4-stor= age","id":"ide0-0-1"}' \ +-blockdev '{"driver":"iscsi","portal":"iscsi.example.com:3260","target":"d= emo-target","lun":2,"transport":"tcp","node-name":"libvirt-3-storage","read= -only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.0","unit":2,"drive":"libvirt-3-stor= age","id":"ide0-0-2"}' \ +-blockdev '{"driver":"file","filename":"/tmp/idedisk.img","node-name":"lib= virt-2-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":3,"drive":"libvirt-2-stor= age","id":"ide0-0-3","bootindex":1}' \ +-blockdev '{"driver":"iscsi","portal":"iscsi.example.com:3260","target":"d= emo-target","lun":3,"transport":"tcp","node-name":"libvirt-1-storage","read= -only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.0","unit":4,"drive":"libvirt-1-stor= age","id":"ide0-0-4"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args index 35106d86e7..b4fc6841db 100644 --- a/tests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args @@ -27,13 +27,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/some/block/device/cdrom","= node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-5-format","read-only":true,"driver":"raw"= ,"file":"libvirt-5-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-5-form= at","id":"ide0-0-1"}' \ +-blockdev '{"driver":"host_device","filename":"/some/block/device/cdrom","= node-name":"libvirt-5-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-5-stor= age","id":"ide0-0-1"}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"id":"ide0-1-0"}' \ --blockdev '{"driver":"file","filename":"/tmp/idedisk.img","node-name":"lib= virt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":2,"drive":"libvirt-3-form= at","id":"ide0-0-2","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/tmp/idedisk.img","node-name":"lib= virt-3-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":2,"drive":"libvirt-3-stor= age","id":"ide0-0-2","bootindex":1}' \ -blockdev '{"driver":"vvfat","dir":"/some/dir/device/vol1","floppy":false,= "rw":false,"node-name":"libvirt-2-storage","auto-read-only":true,"discard":= "unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-2-format","id":"virtio-disk0"}' \ diff --git a/tests/qemuxml2argvdata/disk-usb-device.x86_64-latest.args b/te= sts/qemuxml2argvdata/disk-usb-device.x86_64-latest.args index a7e42e9e93..0fd7e755b1 100644 --- a/tests/qemuxml2argvdata/disk-usb-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-usb-device.x86_64-latest.args @@ -27,12 +27,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1}' \ --blockdev '{"driver":"file","filename":"/tmp/usbdisk.img","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"usb-storage","bus":"usb.0","port":"1","drive":"libvirt= -1-format","id":"usb-disk0","removable":false}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-stor= age","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/tmp/usbdisk.img","node-name":"lib= virt-1-storage","read-only":false}' \ +-device '{"driver":"usb-storage","bus":"usb.0","port":"1","drive":"libvirt= -1-storage","id":"usb-disk0","removable":false}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-vhostvdpa.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-vhostvdpa.x86_64-latest.args index 1281cda933..93d2ef0d98 100644 --- a/tests/qemuxml2argvdata/disk-vhostvdpa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-vhostvdpa.x86_64-latest.args @@ -28,9 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -add-fd set=3D0,fd=3D201,opaque=3Dlibvirt-1-storage-vdpa \ --blockdev '{"driver":"virtio-blk-vhost-vdpa","path":"/dev/fdset/0","node-n= ame":"libvirt-1-storage","auto-read-only":true,"discard":"unmap","cache":{"= direct":true,"no-flush":false}}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1,"write-cache":"on"}' \ +-blockdev '{"driver":"virtio-blk-vhost-vdpa","path":"/dev/fdset/0","node-n= ame":"libvirt-1-storage","read-only":false,"cache":{"direct":true,"no-flush= ":false}}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-storage","id":"virtio-disk0","bootindex":1,"write-cache":"on"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args index 35e76658e2..fa074e0211 100644 --- a/tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args @@ -27,15 +27,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"file","filename":"/tmp/data.img","node-name":"libvir= t-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"virtio-blk-pci","num-queues":4,"bus":"pci.0","addr":"0= x3","drive":"libvirt-3-format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"file","filename":"/tmp/data1.img","node-name":"libvi= rt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","queue-size":256,"bus":"pci.0","addr":= "0x4","drive":"libvirt-2-format","id":"virtio-disk1"}' \ --blockdev '{"driver":"file","filename":"/tmp/data2.img","node-name":"libvi= rt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","num-queues":4,"queue-size":256,"bus":= "pci.0","addr":"0x5","drive":"libvirt-1-format","id":"virtio-disk2"}' \ +-blockdev '{"driver":"file","filename":"/tmp/data.img","node-name":"libvir= t-3-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","num-queues":4,"bus":"pci.0","addr":"0= x3","drive":"libvirt-3-storage","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/tmp/data1.img","node-name":"libvi= rt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","queue-size":256,"bus":"pci.0","addr":= "0x4","drive":"libvirt-2-storage","id":"virtio-disk1"}' \ +-blockdev '{"driver":"file","filename":"/tmp/data2.img","node-name":"libvi= rt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","num-queues":4,"queue-size":256,"bus":= "pci.0","addr":"0x5","drive":"libvirt-1-storage","id":"virtio-disk2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-la= test.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-lat= est.args index 2d8ed07e8c..cbc2a0f398 100644 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.ar= gs @@ -29,13 +29,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-scsi-pci","id":"scsi0","num_queues":8,"bus":"pc= i.0","addr":"0x3"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","pr= -manager":"pr-helper0","node-name":"libvirt-2-storage","auto-read-only":tru= e,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":0,"drive":"libvirt-2-format","id":"scsi0-0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","pr= -manager":"pr-helper0","node-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":0,"drive":"libvirt-2-storage","id":"scsi0-0-0-0","bootindex":1}' \ -object '{"qom-type":"pr-manager-helper","id":"pr-helper-libvirt-1-storage= ","path":"/path/to/qemu-pr-helper.sock"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","pr= -manager":"pr-helper-libvirt-1-storage","node-name":"libvirt-1-storage","au= to-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":1,"drive":"libvirt-1-format","id":"scsi0-0-0-1"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","pr= -manager":"pr-helper-libvirt-1-storage","node-name":"libvirt-1-storage","re= ad-only":false}' \ +-device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":1,"drive":"libvirt-1-storage","id":"scsi0-0-0-1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-virtio.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-virtio.x86_64-latest.args index fb4f81a6a5..ae88d8d6e3 100644 --- a/tests/qemuxml2argvdata/disk-virtio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio.x86_64-latest.args @@ -27,18 +27,14 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-4-form= at","id":"ide0-0-0","bootindex":1}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-3-form= at","id":"ide0-1-0"}' \ --blockdev '{"driver":"file","filename":"/tmp/data.img","node-name":"libvir= t-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-2-format","id":"virtio-disk0"}' \ --blockdev '{"driver":"file","filename":"/tmp/logs.img","node-name":"libvir= t-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-1-format","id":"virtio-disk1"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-4-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-4-stor= age","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-3-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-3-stor= age","id":"ide0-1-0"}' \ +-blockdev '{"driver":"file","filename":"/tmp/data.img","node-name":"libvir= t-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-2-storage","id":"virtio-disk0"}' \ +-blockdev '{"driver":"file","filename":"/tmp/logs.img","node-name":"libvir= t-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-1-storage","id":"virtio-disk1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/event_idx.x86_64-latest.args b/tests/qe= muxml2argvdata/event_idx.x86_64-latest.args index 1ee5c22628..88161667e0 100644 --- a/tests/qemuxml2argvdata/event_idx.x86_64-latest.args +++ b/tests/qemuxml2argvdata/event_idx.x86_64-latest.args @@ -31,9 +31,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","= node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qco= w2","file":"libvirt-2-storage"}' \ -device '{"driver":"virtio-blk-pci","event_idx":true,"bus":"pci.0","addr":= "0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discar= d":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","event_idx":false,"netdev":"hostnet0",= "id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args b/tests= /qemuxml2argvdata/fips-enabled.x86_64-latest.args index 486a07b157..23beb54806 100644 --- a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-= latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64= -latest.args index 48f357cbf9..1bdd482d71 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.= args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-insecure.x86_6= 4-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-loader-insecure.x8= 6_64-latest.args index 1dc1993285..0ecac2fda1 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-insecure.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-insecure.x86_64-lates= t.args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi=3D= on \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ -accel kvm \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.x86_64-la= test.args b/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.x86_64-lat= est.args index 1dc1993285..0ecac2fda1 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.x86_64-latest.ar= gs @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi=3D= on \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ -accel kvm \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-= latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64= -latest.args index 48f357cbf9..1bdd482d71 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.= args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_= 64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.= x86_64-latest.args index 48f357cbf9..1bdd482d71 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-late= st.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-late= st.args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-lat= est.args b/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-lates= t.args index 1dc1993285..0ecac2fda1 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi=3D= on \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ -accel kvm \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-file.x86_64-lat= est.args b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-file.x86_64-lates= t.args index 2268372cd8..42e075b1b6 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-file.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-file.x86_64-latest.args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi= =3Don \ +-blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acp= i=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-iscsi.x= 86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-= iscsi.x86_64-latest.args index 9c1460f53e..8a85bbacce 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-iscsi.x86_64-l= atest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-iscsi.x86_64-l= atest.args @@ -13,9 +13,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -object '{"qom-type":"secret","id":"libvirt-pflash1-storage-auth-secret0",= "data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","= keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}'= \ --blockdev '{"driver":"iscsi","portal":"example.com:6000","target":"iqn.201= 3-07.com.example:iscsi-nopool","lun":0,"transport":"tcp","user":"myname","p= assword-secret":"libvirt-pflash1-storage-auth-secret0","node-name":"libvirt= -pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi= =3Don \ +-blockdev '{"driver":"iscsi","portal":"example.com:6000","target":"iqn.201= 3-07.com.example:iscsi-nopool","lun":0,"transport":"tcp","user":"myname","p= assword-secret":"libvirt-pflash1-storage-auth-secret0","node-name":"libvirt= -pflash1-storage","read-only":false}' \ +-machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acp= i=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-nbd.x86= _64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-nb= d.x86_64-latest.args index b68fb184dd..086bfa1ee2 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-nbd.x86_64-lat= est.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-nbd.x86_64-lat= est.args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"export":"bar","node-name":"libvirt-pflash1-storage","auto-rea= d-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi= =3Don \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"export":"bar","node-name":"libvirt-pflash1-storage","read-onl= y":false}' \ +-machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acp= i=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-path.x86_64-lat= est.args b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-path.x86_64-lates= t.args index 5c75c9bcca..f453e5117d 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-path.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-path.x86_64-latest.args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-template.x86_64= -latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-template.x86_= 64-latest.args index 48f357cbf9..1bdd482d71 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-template.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-template.x86_64-latest= .args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest= .args b/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args index 48f357cbf9..1bdd482d71 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-smm-off.x86_64-latest= .args b/tests/qemuxml2argvdata/firmware-auto-efi-smm-off.x86_64-latest.args index b04293c6d2..23d9ea98ab 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-smm-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-smm-off.x86_64-latest.args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Doff,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-form= at,acpi=3Don \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-4.0,usb=3Doff,smm=3Doff,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stor= age,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args b/= tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args index 48f357cbf9..1bdd482d71 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-lat= est.args b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-lates= t.args index 776ac9ea7c..d2e2f9c0f3 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-latest.args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi=3D= on \ +-blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-features.x86_64-lat= est.args b/tests/qemuxml2argvdata/firmware-manual-efi-features.x86_64-lates= t.args index 0943f3c656..90f8b15b9b 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-features.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-features.x86_64-latest.args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi= =3Don \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acp= i=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-loader-path-nonstan= dard.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-loader= -path-nonstandard.x86_64-latest.args index 4e989344b3..f702d80818 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-loader-path-nonstandard.x8= 6_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-loader-path-nonstandard.x8= 6_64-latest.args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/path/to/OVMF_CODE.fd","node-name"= :"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi=3D= on \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-loader-secure.x86_6= 4-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-loader-secure.x8= 6_64-latest.args index 2b998868f4..307832a354 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-loader-secure.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-loader-secure.x86_64-lates= t.args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ -accel tcg \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys-le= gacy-paths.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-= no-enrolled-keys-legacy-paths.x86_64-latest.args index cc4a935474..da5f53f733 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys-legacy-pa= ths.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys-legacy-pa= ths.x86_64-latest.args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.= fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"= unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ -accel tcg \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys.x8= 6_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-k= eys.x86_64-latest.args index 2b998868f4..307832a354 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys.x86_64-la= test.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys.x86_64-la= test.args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ -accel tcg \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot-legacy-p= aths.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-no-sec= boot-legacy-paths.x86_64-latest.args index ccc279e4e3..e35cbd4f16 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot-legacy-paths.x8= 6_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot-legacy-paths.x8= 6_64-latest.args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","nod= e-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'= \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi=3D= on \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot.x86_64-l= atest.args b/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot.x86_64-l= atest.args index 776ac9ea7c..d2e2f9c0f3 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot.x86_64-latest.a= rgs @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi=3D= on \ +-blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-l= atest.args b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-l= atest.args index 2268372cd8..42e075b1b6 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-latest.a= rgs @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi= =3Don \ +-blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acp= i=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi= .x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-netw= ork-iscsi.x86_64-latest.args index 9c1460f53e..8a85bbacce 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64= -latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64= -latest.args @@ -13,9 +13,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -object '{"qom-type":"secret","id":"libvirt-pflash1-storage-auth-secret0",= "data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","= keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}'= \ --blockdev '{"driver":"iscsi","portal":"example.com:6000","target":"iqn.201= 3-07.com.example:iscsi-nopool","lun":0,"transport":"tcp","user":"myname","p= assword-secret":"libvirt-pflash1-storage-auth-secret0","node-name":"libvirt= -pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi= =3Don \ +-blockdev '{"driver":"iscsi","portal":"example.com:6000","target":"iqn.201= 3-07.com.example:iscsi-nopool","lun":0,"transport":"tcp","user":"myname","p= assword-secret":"libvirt-pflash1-storage-auth-secret0","node-name":"libvirt= -pflash1-storage","read-only":false}' \ +-machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acp= i=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x= 86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-networ= k-nbd.x86_64-latest.args index b68fb184dd..086bfa1ee2 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_64-l= atest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_64-l= atest.args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"export":"bar","node-name":"libvirt-pflash1-storage","auto-rea= d-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi= =3Don \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"export":"bar","node-name":"libvirt-pflash1-storage","read-onl= y":false}' \ +-machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acp= i=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-nons= tandard.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-nvr= am-template-nonstandard.x86_64-latest.args index 1dc1993285..0ecac2fda1 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-nonstandard= .x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-nonstandard= .x86_64-latest.args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi=3D= on \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ -accel kvm \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_= 64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.= x86_64-latest.args index 0943f3c656..90f8b15b9b 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-late= st.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-late= st.args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi= =3Don \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acp= i=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secboot-legacy-path= s.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-secboot-l= egacy-paths.x86_64-latest.args index cc4a935474..da5f53f733 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-secboot-legacy-paths.x86_6= 4-latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-secboot-legacy-paths.x86_6= 4-latest.args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.= fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"= unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ -accel tcg \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secboot.x86_64-late= st.args b/tests/qemuxml2argvdata/firmware-manual-efi-secboot.x86_64-latest.= args index 2b998868f4..307832a354 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-secboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-secboot.x86_64-latest.args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-forma= t,acpi=3Don \ +-blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backen= d=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stora= ge,acpi=3Don \ -accel tcg \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args = b/tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args index 2268372cd8..42e075b1b6 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args @@ -12,9 +12,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi= =3Don \ +-blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acp= i=3Don \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxml2argvdata/graphics-dbus-audio.x86_64-latest.args = b/tests/qemuxml2argvdata/graphics-dbus-audio.x86_64-latest.args index a484978d1a..19d1ac7a0a 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-audio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-dbus-audio.x86_64-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"dbus","in":{"mixing-engine":false},"ou= t":{"mixing-engine":false}}' \ -display dbus,p2p=3Don,audiodev=3Daudio1 \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ diff --git a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64= -latest.args b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_= 64-latest.args index 9ec5d8c688..97996f30fc 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest= .args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -display egl-headless,rendernode=3D/dev/dri/foo \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.arg= s b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args index 9ec5d8c688..97996f30fc 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -display egl-headless,rendernode=3D/dev/dri/foo \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.x86_64-latest.args index d219893190..9a103b069a 100644 --- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.x86_64-latest.args @@ -28,9 +28,8 @@ DISPLAY=3D:0.1 \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -full-screen \ -display sdl \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ diff --git a/tests/qemuxml2argvdata/graphics-sdl.x86_64-latest.args b/tests= /qemuxml2argvdata/graphics-sdl.x86_64-latest.args index 255c72aca7..82366b1297 100644 --- a/tests/qemuxml2argvdata/graphics-sdl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-sdl.x86_64-latest.args @@ -28,9 +28,8 @@ DISPLAY=3D:0.1 \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -display sdl \ -device '{"driver":"VGA","id":"video0","vgamem_mb":16,"bus":"pci.0","addr"= :"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-lat= est.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-lates= t.args index 5afa817191..51d550e8c9 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc vnc=3Dunix:/var/lib/libvirt/qemu/domain--1-QEMUGuest1/vnc.sock,audiod= ev=3Daudio1 \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest= .args b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args index 8b93bd98db..bd1b4af92b 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc '[2001:1:2:3:4:5:1234:1234]:3,audiodev=3Daudio1' \ -display egl-headless,rendernode=3D/dev/dri/foo \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-late= st.args b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-latest.= args index 65e440ab21..4a7a409925 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc '[2001:1:2:3:4:5:1234:1234]:3,audiodev=3Daudio1' \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args = b/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args index 1c333bac5e..f53fefe2b3 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc '[::]:59630,share=3Dallow-exclusive,audiodev=3Daudio1' \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args b= /tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args index 36dbc2b973..5a81f148d6 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc '[::]:59630,power-control=3Don,audiodev=3Daudio1' \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x8= 6_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-soc= ket.x86_64-latest.args index c0126848db..854e3b9637 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-la= test.args +++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-la= test.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args b/= tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args index 27477365d5..4570a7fa19 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args @@ -27,9 +27,8 @@ SASL_CONF_PATH=3D/etc/sasl2 \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:3,sasl=3Don,audiodev=3Daudio1 \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ diff --git a/tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args b/tests= /qemuxml2argvdata/graphics-vnc.x86_64-latest.args index 65e440ab21..4a7a409925 100644 --- a/tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc '[2001:1:2:3:4:5:1234:1234]:3,audiodev=3Daudio1' \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-lates= t.args b/tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-latest.ar= gs index f87ab084de..2a00147ae4 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","bus":= "pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args = b/tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args index 36eed8731a..f84904db82 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","bus":= "pci.0","addr":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args b/t= ests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args index 6c3e73d6d6..8f03d96ef4 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args @@ -28,9 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"lsi","id":"scsi0","bus":"pci.0","addr":"0x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -blockdev '{"driver":"host_device","filename":"/dev/sg0","node-name":"libv= irt-2-backend","read-only":false}' \ -device '{"driver":"scsi-generic","drive":"libvirt-2-backend","id":"hostde= v0","bus":"scsi0.0","scsi-id":7}' \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.x86_64-late= st.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.= args index e4f9fe26a1..abd57fceba 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.args @@ -28,9 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 3"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vhost-scsi-pci","wwpn":"naa.5123456789abcde0","vhostfd= ":"3","id":"hostdev0","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.= args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args index 414496c712..d7a3c658d8 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args @@ -28,9 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -blockdev '{"driver":"host_device","filename":"/dev/sg0","node-name":"libv= irt-2-backend","read-only":false}' \ -device '{"driver":"scsi-generic","drive":"libvirt-2-backend","id":"hostde= v0","bus":"scsi0.0","channel":0,"scsi-id":4,"lun":8}' \ diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64-= latest.args b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64= -latest.args index 56f9743bec..776eb24135 100644 --- a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64-latest.= args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"usb-host","hostdevice":"/dev/bus/usb/014/006","id":"ho= stdev0","bootindex":1,"bus":"usb.0","port":"1"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-lates= t.args b/tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-latest.ar= gs index f44a7c9cb0..5bae7acdc5 100644 --- a/tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"usb-host","hostdevice":"/dev/bus/usb/014/006","id":"ho= stdev0","bus":"usb.0","port":"1"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args = b/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args index cab9a4f258..fff0a672d7 100644 --- a/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"usb-host","hostdevice":"/dev/bus/usb/014/006","id":"ho= stdev0","guest-reset":true,"guest-resets-all":false,"bus":"usb.0","port":"1= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.x86_64-latest.= args b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.x86_64-latest.args index cad29ba6e1..fa3fd3aa99 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","host":"0021:de:1f.1","id":"hostdev0","bus":= "pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio.x86_64-latest.args b/tests= /qemuxml2argvdata/hostdev-vfio.x86_64-latest.args index c1f9258844..200ca70433 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-vfio.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","host":"0000:06:12.1","id":"hostdev0","bus":= "pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.x86_64-latest.args = b/tests/qemuxml2argvdata/hugepages-memaccess.x86_64-latest.args index e234b256a6..9aedba0539 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess.x86_64-latest.args @@ -41,9 +41,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object '{"qom-type":"thread-context","id":"tc-memdimm0","node-affinity":[= 0,1,2,3]}' \ -object '{"qom-type":"memory-backend-file","id":"memdimm0","mem-path":"/de= v/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,"prealloc":true,"siz= e":536870912,"host-nodes":[0,1,2,3],"policy":"bind","prealloc-context":"tc-= memdimm0"}' \ -device '{"driver":"pc-dimm","node":1,"memdev":"memdimm0","id":"dimm0","sl= ot":0,"addr":4294967296}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.x86_64-latest.args= b/tests/qemuxml2argvdata/hugepages-memaccess2.x86_64-latest.args index fd89b26dcf..2dd0bdc228 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess2.x86_64-latest.args @@ -38,9 +38,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object '{"qom-type":"thread-context","id":"tc-memdimm0","node-affinity":[= 0,1,2,3]}' \ -object '{"qom-type":"memory-backend-file","id":"memdimm0","mem-path":"/de= v/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,"prealloc":true,"siz= e":536870912,"host-nodes":[0,1,2,3],"policy":"bind","prealloc-context":"tc-= memdimm0"}' \ -device '{"driver":"pc-dimm","node":1,"memdev":"memdimm0","id":"dimm0","sl= ot":0,"addr":4294967296}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hugepages-shared.x86_64-latest.args b/t= ests/qemuxml2argvdata/hugepages-shared.x86_64-latest.args index 2267ec2911..27c76dcdd3 100644 --- a/tests/qemuxml2argvdata/hugepages-shared.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-shared.x86_64-latest.args @@ -38,9 +38,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.x86_64-latest.args = b/tests/qemuxml2argvdata/input-usbmouse-addr.x86_64-latest.args index dbbbab5541..6da9a65429 100644 --- a/tests/qemuxml2argvdata/input-usbmouse-addr.x86_64-latest.args +++ b/tests/qemuxml2argvdata/input-usbmouse-addr.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/input-usbmouse.x86_64-latest.args b/tes= ts/qemuxml2argvdata/input-usbmouse.x86_64-latest.args index cf82d4f852..aca72a88a0 100644 --- a/tests/qemuxml2argvdata/input-usbmouse.x86_64-latest.args +++ b/tests/qemuxml2argvdata/input-usbmouse.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/input-usbtablet.x86_64-latest.args b/te= sts/qemuxml2argvdata/input-usbtablet.x86_64-latest.args index fa7e8ccf50..16b4a8babb 100644 --- a/tests/qemuxml2argvdata/input-usbtablet.x86_64-latest.args +++ b/tests/qemuxml2argvdata/input-usbtablet.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/iothreads-disk.x86_64-latest.args b/tes= ts/qemuxml2argvdata/iothreads-disk.x86_64-latest.args index fb732129d1..56101389a3 100644 --- a/tests/qemuxml2argvdata/iothreads-disk.x86_64-latest.args +++ b/tests/qemuxml2argvdata/iothreads-disk.x86_64-latest.args @@ -29,12 +29,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/iothrtest1= .img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unma= p"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","iothread":"iothread1","bus":"pci.0","= addr":"0x4","drive":"libvirt-2-format","id":"virtio-disk1","bootindex":1}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/iothrtest2= .img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unma= p"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","iothread":"iothread2","bus":"pci.0","= addr":"0x2","drive":"libvirt-1-format","id":"virtio-disk2"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/iothrtest1= .img","node-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","iothread":"iothread1","bus":"pci.0","= addr":"0x4","drive":"libvirt-2-storage","id":"virtio-disk1","bootindex":1}'= \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/iothrtest2= .img","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","iothread":"iothread2","bus":"pci.0","= addr":"0x2","drive":"libvirt-1-storage","id":"virtio-disk2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest= .args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args index b64b67e7d2..e52ef3ba53 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args @@ -30,12 +30,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-scsi-pci","iothread":"iothread2","id":"scsi0","= bus":"pci.0","addr":"0xb"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/iothrtest1= .img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unma= p"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","iothread":"iothread1","bus":"pci.0","= addr":"0x4","drive":"libvirt-2-format","id":"virtio-disk1","bootindex":1}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/iothrtest2= .img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unma= p"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :3,"device_id":"drive-scsi0-0-0-3","drive":"libvirt-1-format","id":"scsi0-0= -0-3"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/iothrtest1= .img","node-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","iothread":"iothread1","bus":"pci.0","= addr":"0x4","drive":"libvirt-2-storage","id":"virtio-disk1","bootindex":1}'= \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/iothrtest2= .img","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :3,"device_id":"drive-scsi0-0-0-3","drive":"libvirt-1-storage","id":"scsi0-= 0-0-3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.x86_64-latest.args b/test= s/qemuxml2argvdata/kvm-pit-delay.x86_64-latest.args index a8a2f92aba..8d4981b6cf 100644 --- a/tests/qemuxml2argvdata/kvm-pit-delay.x86_64-latest.args +++ b/tests/qemuxml2argvdata/kvm-pit-delay.x86_64-latest.args @@ -28,9 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.x86_64-latest.args b/te= sts/qemuxml2argvdata/kvm-pit-discard.x86_64-latest.args index ee46d0698f..469ccac8ee 100644 --- a/tests/qemuxml2argvdata/kvm-pit-discard.x86_64-latest.args +++ b/tests/qemuxml2argvdata/kvm-pit-discard.x86_64-latest.args @@ -28,9 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/launch-security-sev-direct.x86_64-lates= t.args b/tests/qemuxml2argvdata/launch-security-sev-direct.x86_64-latest.ar= gs index 25a22b2682..09df8a7cb6 100644 --- a/tests/qemuxml2argvdata/launch-security-sev-direct.x86_64-latest.args +++ b/tests/qemuxml2argvdata/launch-security-sev-direct.x86_64-latest.args @@ -30,9 +30,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -initrd /initrd \ -append runme \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -object '{"qom-type":"sev-guest","id":"lsec0","cbitpos":47,"reduced-phys-b= its":1,"policy":1,"dh-cert-file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/dh_cert.base64","session-file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest= 1/session.base64","kernel-hashes":true}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/machine-aliases1.x86_64-latest.args b/t= ests/qemuxml2argvdata/machine-aliases1.x86_64-latest.args index 486a07b157..23beb54806 100644 --- a/tests/qemuxml2argvdata/machine-aliases1.x86_64-latest.args +++ b/tests/qemuxml2argvdata/machine-aliases1.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/machine-aliases2.x86_64-latest.args b/t= ests/qemuxml2argvdata/machine-aliases2.x86_64-latest.args index be6040c0dd..91bb98f2e6 100644 --- a/tests/qemuxml2argvdata/machine-aliases2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/machine-aliases2.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/machine-core-off.x86_64-latest.args b/t= ests/qemuxml2argvdata/machine-core-off.x86_64-latest.args index 38145b85d2..9493ded1c7 100644 --- a/tests/qemuxml2argvdata/machine-core-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/machine-core-off.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-core-on.x86_64-latest.args b/te= sts/qemuxml2argvdata/machine-core-on.x86_64-latest.args index 38b6fcec4f..22aefe66ec 100644 --- a/tests/qemuxml2argvdata/machine-core-on.x86_64-latest.args +++ b/tests/qemuxml2argvdata/machine-core-on.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.x86_64-latest.args b= /tests/qemuxml2argvdata/machine-vmport-opt.x86_64-latest.args index 93fe6e7f45..105e64618a 100644 --- a/tests/qemuxml2argvdata/machine-vmport-opt.x86_64-latest.args +++ b/tests/qemuxml2argvdata/machine-vmport-opt.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.= args b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args index 6ae1fd1b98..6a3ade6b06 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args @@ -33,9 +33,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"pc-dimm","node":0,"memdev":"memdimm0","id":"dimm0","sl= ot":0,"addr":4294967296}' \ -object '{"qom-type":"memory-backend-ram","id":"memdimm2","size":536870912= }' \ -device '{"driver":"pc-dimm","node":0,"memdev":"memdimm2","id":"dimm2","sl= ot":2}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args = b/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args index 71817da309..77bfbb1604 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args @@ -32,9 +32,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"pc-dimm","node":0,"memdev":"memdimm0","id":"dimm0","sl= ot":0}' \ -object '{"qom-type":"memory-backend-file","id":"memdimm1","mem-path":"/de= v/hugepages2M/libvirt/qemu/-1-QEMUGuest1","prealloc":true,"size":536870912,= "host-nodes":[1,2,3],"policy":"bind"}' \ -device '{"driver":"pc-dimm","node":0,"memdev":"memdimm1","id":"dimm1","sl= ot":1}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.args index ad1dad01ac..78bc041ae1 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.args @@ -37,9 +37,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"request= ed-size":1073741824,"memdev":"memvirtiomem1","prealloc":true,"memaddr":5637= 144576,"id":"virtiomem1","bus":"pci.1","addr":"0x1"}' \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","prealloc":true,"size":536870912}' \ -device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0",= "slot":0}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-lat= est.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-lates= t.args index f09ae22927..d3d866713b 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args @@ -30,9 +30,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ -device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0",= "slot":0}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-late= st.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.= args index 6cfe4b8263..13b0afd36a 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args @@ -30,9 +30,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","share":false,"prealloc":true,"size":536870912,"align":2097152}= ' \ -device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0",= "slot":0}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-late= st.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.= args index 4041c15b2b..737aa8bbe7 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args @@ -30,9 +30,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ -device '{"driver":"nvdimm","node":0,"label-size":131072,"memdev":"memnvdi= mm0","id":"nvdimm0","slot":0}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-lates= t.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.ar= gs index 3547e96c00..2d2753089a 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args @@ -30,9 +30,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","share":false,"size":536870912,"pmem":true}' \ -device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0",= "slot":0}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-l= atest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-l= atest.args index 17bacfb2f6..8ce8594e32 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.a= rgs @@ -30,9 +30,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ -device '{"driver":"nvdimm","node":0,"unarmed":true,"memdev":"memnvdimm0",= "id":"nvdimm0","slot":0}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.arg= s b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args index 1321e5556e..5c877a11e4 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args @@ -30,9 +30,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","prealloc":true,"size":536870912}' \ -device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0",= "slot":0}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest= .args b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args index 607ce9b0e8..d12e065080 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args @@ -33,9 +33,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"request= ed-size":536870912,"memdev":"memvirtiomem0","id":"virtiomem0","bus":"pci.0"= ,"addr":"0x2"}' \ -object '{"qom-type":"memory-backend-file","id":"memvirtiomem1","mem-path"= :"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","reserve":false,"size":21474= 83648,"host-nodes":[1,2,3],"policy":"bind"}' \ -device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"request= ed-size":1073741824,"memdev":"memvirtiomem1","prealloc":true,"memaddr":5637= 144576,"id":"virtiomem1","bus":"pci.1","addr":"0x1"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-lates= t.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.ar= gs index 9bbde420a9..2041a3b209 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args @@ -30,9 +30,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -object '{"qom-type":"memory-backend-file","id":"memvirtiopmem0","mem-path= ":"/tmp/virtio_pmem","share":true,"size":536870912}' \ -device '{"driver":"virtio-pmem-pci","memdev":"memvirtiopmem0","memaddr":5= 368709120,"id":"virtiopmem0","bus":"pci.0","addr":"0x5"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args b/tes= ts/qemuxml2argvdata/memory-hotplug.x86_64-latest.args index 53f0fbc68f..a826a269b7 100644 --- a/tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args @@ -28,9 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/memtune-unlimited.x86_64-latest.args b/= tests/qemuxml2argvdata/memtune-unlimited.x86_64-latest.args index 486a07b157..23beb54806 100644 --- a/tests/qemuxml2argvdata/memtune-unlimited.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memtune-unlimited.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/memtune.x86_64-latest.args b/tests/qemu= xml2argvdata/memtune.x86_64-latest.args index 486a07b157..23beb54806 100644 --- a/tests/qemuxml2argvdata/memtune.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memtune.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/migrate.x86_64-latest.args b/tests/qemu= xml2argvdata/migrate.x86_64-latest.args index 7cbd26463a..83ab8fbdf4 100644 --- a/tests/qemuxml2argvdata/migrate.x86_64-latest.args +++ b/tests/qemuxml2argvdata/migrate.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -incoming tcp:10.0.0.1:5000 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/minimal.x86_64-latest.args b/tests/qemu= xml2argvdata/minimal.x86_64-latest.args index 486a07b157..23beb54806 100644 --- a/tests/qemuxml2argvdata/minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/minimal.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/misc-acpi.x86_64-latest.args b/tests/qe= muxml2argvdata/misc-acpi.x86_64-latest.args index 01ba4f69b3..c4e09c0af2 100644 --- a/tests/qemuxml2argvdata/misc-acpi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/misc-acpi.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-disable-s3.x86_64-latest.args b/te= sts/qemuxml2argvdata/misc-disable-s3.x86_64-latest.args index 2602394562..0420f7779b 100644 --- a/tests/qemuxml2argvdata/misc-disable-s3.x86_64-latest.args +++ b/tests/qemuxml2argvdata/misc-disable-s3.x86_64-latest.args @@ -28,9 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -global PIIX4_PM.disable_s3=3D1 \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.x86_64-latest.arg= s b/tests/qemuxml2argvdata/misc-disable-suspends.x86_64-latest.args index 668951a215..32f953a49d 100644 --- a/tests/qemuxml2argvdata/misc-disable-suspends.x86_64-latest.args +++ b/tests/qemuxml2argvdata/misc-disable-suspends.x86_64-latest.args @@ -29,9 +29,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -global PIIX4_PM.disable_s4=3D1 \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-enable-s4.x86_64-latest.args b/tes= ts/qemuxml2argvdata/misc-enable-s4.x86_64-latest.args index 68aa8860ee..c83f8106e1 100644 --- a/tests/qemuxml2argvdata/misc-enable-s4.x86_64-latest.args +++ b/tests/qemuxml2argvdata/misc-enable-s4.x86_64-latest.args @@ -28,9 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -global PIIX4_PM.disable_s4=3D0 \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-no-reboot.x86_64-latest.args b/tes= ts/qemuxml2argvdata/misc-no-reboot.x86_64-latest.args index 38145b85d2..9493ded1c7 100644 --- a/tests/qemuxml2argvdata/misc-no-reboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/misc-no-reboot.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-uuid.x86_64-latest.args b/tests/qe= muxml2argvdata/misc-uuid.x86_64-latest.args index 01ba4f69b3..c4e09c0af2 100644 --- a/tests/qemuxml2argvdata/misc-uuid.x86_64-latest.args +++ b/tests/qemuxml2argvdata/misc-uuid.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.x86_64-latest.= args b/tests/qemuxml2argvdata/multifunction-pci-device.x86_64-latest.args index c76b9aacdd..cb74747589 100644 --- a/tests/qemuxml2argvdata/multifunction-pci-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/multifunction-pci-device.x86_64-latest.args @@ -36,9 +36,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"lsi","id":"scsi6","bus":"pci.0","addr":"0x4.0x5"}' \ -device '{"driver":"lsi","id":"scsi7","bus":"pci.0","addr":"0x4.0x6"}' \ -device '{"driver":"lsi","id":"scsi8","bus":"pci.0","addr":"0x4.0x7"}' \ --blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi0.0","scsi-id":0,"device_id":"driv= e-scsi0-0-0","drive":"libvirt-1-format","id":"scsi0-0-0","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-1-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","scsi-id":0,"device_id":"driv= e-scsi0-0-0","drive":"libvirt-1-storage","id":"scsi0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/net-client.x86_64-latest.args b/tests/q= emuxml2argvdata/net-client.x86_64-latest.args index e386caf152..4ddfd46e3b 100644 --- a/tests/qemuxml2argvdata/net-client.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-client.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -netdev '{"type":"socket","connect":"192.168.0.1:5558","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:8c:b9:05","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-eth-hostip.x86_64-latest.args b/tes= ts/qemuxml2argvdata/net-eth-hostip.x86_64-latest.args index c7f830fd30..6ffc956ab1 100644 --- a/tests/qemuxml2argvdata/net-eth-hostip.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-eth-hostip.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -netdev '{"type":"tap","fd":"3","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-eth-ifname.x86_64-latest.args b/tes= ts/qemuxml2argvdata/net-eth-ifname.x86_64-latest.args index c7f830fd30..6ffc956ab1 100644 --- a/tests/qemuxml2argvdata/net-eth-ifname.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-eth-ifname.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -netdev '{"type":"tap","fd":"3","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-eth-names.x86_64-latest.args b/test= s/qemuxml2argvdata/net-eth-names.x86_64-latest.args index 4dd39e2288..44e9aa530f 100644 --- a/tests/qemuxml2argvdata/net-eth-names.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-eth-names.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -netdev '{"type":"tap","fd":"3","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -netdev '{"type":"tap","fd":"3","id":"hostnet1"}' \ diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.x86_64-latest.arg= s b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.x86_64-latest.args index 7feec2486b..a7b163bcf5 100644 --- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -netdev '{"type":"tap","fd":"3","vhost":true,"vhostfd":"44","id":"hostnet0= "}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "fe:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-eth.x86_64-latest.args b/tests/qemu= xml2argvdata/net-eth.x86_64-latest.args index c7f830fd30..6ffc956ab1 100644 --- a/tests/qemuxml2argvdata/net-eth.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-eth.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -netdev '{"type":"tap","fd":"3","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.x86_64-latest.arg= s b/tests/qemuxml2argvdata/net-hostdev-bootorder.x86_64-latest.args index d513ae5aff..26c61e29e2 100644 --- a/tests/qemuxml2argvdata/net-hostdev-bootorder.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":2}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":2}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","host":"0000:03:07.1","id":"hostdev0","booti= ndex":1,"bus":"pci.0","addr":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/net-hostdev-multidomain.x86_64-latest.args index cb4b415a25..2e94db50a1 100644 --- a/tests/qemuxml2argvdata/net-hostdev-multidomain.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","host":"2424:21:1c.6","id":"hostdev0","bus":= "pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.x86_64-lat= est.args b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.x86_64-lates= t.args index aa98d9306a..c0e17fb91c 100644 --- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","host":"0021:de:1f.1","id":"hostdev0","bus":= "pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.x86_64-latest.args b/t= ests/qemuxml2argvdata/net-hostdev-vfio.x86_64-latest.args index bf05456345..051afb53ac 100644 --- a/tests/qemuxml2argvdata/net-hostdev-vfio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-hostdev-vfio.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","host":"0000:06:12.1","id":"hostdev0","bus":= "pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/net-hostdev.x86_64-latest.args b/tests/= qemuxml2argvdata/net-hostdev.x86_64-latest.args index 8f5a476873..8ee253826e 100644 --- a/tests/qemuxml2argvdata/net-hostdev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-hostdev.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","host":"0000:03:07.1","id":"hostdev0","bus":= "pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/net-mcast.x86_64-latest.args b/tests/qe= muxml2argvdata/net-mcast.x86_64-latest.args index 3f596dbc34..9caba36642 100644 --- a/tests/qemuxml2argvdata/net-mcast.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-mcast.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -netdev '{"type":"socket","mcast":"192.0.0.1:5558","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:8c:b9:05","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-server.x86_64-latest.args b/tests/q= emuxml2argvdata/net-server.x86_64-latest.args index 60bb8a9201..ea3213d508 100644 --- a/tests/qemuxml2argvdata/net-server.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-server.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -netdev '{"type":"socket","listen":"192.168.0.1:5558","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:8c:b9:05","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-udp.x86_64-latest.args b/tests/qemu= xml2argvdata/net-udp.x86_64-latest.args index 8a6ea654ba..abd141af85 100644 --- a/tests/qemuxml2argvdata/net-udp.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-udp.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -netdev '{"type":"socket","udp":"192.168.10.1:5555","localaddr":"192.168.1= 0.1:5556","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:8c:b9:05","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-user-addr.x86_64-latest.args b/test= s/qemuxml2argvdata/net-user-addr.x86_64-latest.args index df5b4c63ab..4383a8c115 100644 --- a/tests/qemuxml2argvdata/net-user-addr.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-user-addr.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -netdev '{"type":"user","net":"172.17.2.0/24","ipv6-prefix":"2001:db8:ac10= :fd01::","ipv6-prefixlen":64,"id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-user-passt.x86_64-latest.args b/tes= ts/qemuxml2argvdata/net-user-passt.x86_64-latest.args index 59e1dfbfa0..38525fb2cc 100644 --- a/tests/qemuxml2argvdata/net-user-passt.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-user-passt.x86_64-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -netdev '{"type":"stream","addr":{"type":"unix","path":"/var/run/libvirt/q= emu/passt/-1-QEMUGuest1-net0.socket"},"server":false,"reconnect":5,"id":"ho= stnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-user.x86_64-latest.args b/tests/qem= uxml2argvdata/net-user.x86_64-latest.args index c81d582b97..919b5e3fc7 100644 --- a/tests/qemuxml2argvdata/net-user.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-user.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.x86_64-latest.args= b/tests/qemuxml2argvdata/net-vhostuser-multiq.x86_64-latest.args index 7a02434f23..bb1bf6d9ae 100644 --- a/tests/qemuxml2argvdata/net-vhostuser-multiq.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev socket,id=3Dcharnet0,path=3D/tmp/vhost0.sock,server=3Don \ -netdev '{"type":"vhost-user","chardev":"charnet0","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:ee:96:6b","bus":"pci.0","addr":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/net-virtio-device.x86_64-latest.args b/= tests/qemuxml2argvdata/net-virtio-device.x86_64-latest.args index c8fc920b97..2730412dc7 100644 --- a/tests/qemuxml2argvdata/net-virtio-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-virtio-device.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","tx":"bh","netdev":"hostnet0","id":"ne= t0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.x86_64-late= st.args b/tests/qemuxml2argvdata/net-virtio-disable-offloads.x86_64-latest.= args index 4050ce8c08..07640fe3ba 100644 --- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest7","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest7","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","csum":false,"gso":false,"host_tso4":f= alse,"host_tso6":false,"host_ecn":false,"host_ufo":false,"mrg_rxbuf":false,= "guest_csum":false,"guest_tso4":false,"guest_tso6":false,"guest_ecn":false,= "guest_ufo":false,"netdev":"hostnet0","id":"net0","mac":"00:22:44:66:88:aa"= ,"bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.x86_64-latest.args b/= tests/qemuxml2argvdata/net-virtio-netdev.x86_64-latest.args index 9c468be055..544a3303cf 100644 --- a/tests/qemuxml2argvdata/net-virtio-netdev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-virtio-netdev.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-virtio-rss.x86_64-latest.args b/tes= ts/qemuxml2argvdata/net-virtio-rss.x86_64-latest.args index 9c61aeb44c..4de0393a8a 100644 --- a/tests/qemuxml2argvdata/net-virtio-rss.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-virtio-rss.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","rss":true,"netdev":"hostnet0","id":"n= et0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -netdev '{"type":"user","id":"hostnet1"}' \ diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.x86_64-latest.= args b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.x86_64-latest.args index 6da39afcae..7fd596159a 100644 --- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","rx_queue_size":512,"tx_queue_size":10= 24,"netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0",= "addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.x86_64-lates= t.args b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.x86_64-latest.ar= gs index 517a6cea6e..a5cce0e27c 100644 --- a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -netdev '{"type":"user","id":"hostua-backup0"}' \ -device '{"driver":"virtio-net-pci","failover":true,"netdev":"hostua-backu= p0","id":"ua-backup0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x3"}= ' \ -netdev '{"type":"user","id":"hostua-backup1"}' \ diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.x86_64-latest.args b= /tests/qemuxml2argvdata/net-virtio-teaming.x86_64-latest.args index 459ab20f67..090bf2979d 100644 --- a/tests/qemuxml2argvdata/net-virtio-teaming.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-virtio-teaming.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -netdev '{"type":"user","id":"hostua-backup0"}' \ -device '{"driver":"virtio-net-pci","failover":true,"netdev":"hostua-backu= p0","id":"ua-backup0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}= ' \ -netdev '{"type":"user","id":"hostua-backup1"}' \ diff --git a/tests/qemuxml2argvdata/net-virtio.x86_64-latest.args b/tests/q= emuxml2argvdata/net-virtio.x86_64-latest.args index 5db6ae348b..3dc44b7c27 100644 --- a/tests/qemuxml2argvdata/net-virtio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-virtio.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/nosharepages.x86_64-latest.args b/tests= /qemuxml2argvdata/nosharepages.x86_64-latest.args index 4618ea0cf5..8ad57bfcbc 100644 --- a/tests/qemuxml2argvdata/nosharepages.x86_64-latest.args +++ b/tests/qemuxml2argvdata/nosharepages.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-la= test.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-lat= est.args index d4238f3d9e..a9f3c30eb9 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.ar= gs @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-pl= acement.x86_64-latest.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-= no-cpuset-and-placement.x86_64-latest.args index d4238f3d9e..a9f3c30eb9 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement= .x86_64-latest.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement= .x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-= latest.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64= -latest.args index 9ddfb286b5..7914b15db0 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.= args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-la= test.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-lat= est.args index d4238f3d9e..a9f3c30eb9 100644 --- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.ar= gs @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/numad.x86_64-latest.args b/tests/qemuxm= l2argvdata/numad.x86_64-latest.args index d4238f3d9e..a9f3c30eb9 100644 --- a/tests/qemuxml2argvdata/numad.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numad.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-la= test.args b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-lat= est.args index 57a2b893f1..707de60c87 100644 --- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.ar= gs @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/panic-no-address.x86_64-latest.args b/t= ests/qemuxml2argvdata/panic-no-address.x86_64-latest.args index 81eb59e4c0..b2ef8dd6ff 100644 --- a/tests/qemuxml2argvdata/panic-no-address.x86_64-latest.args +++ b/tests/qemuxml2argvdata/panic-no-address.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/panic.x86_64-latest.args b/tests/qemuxm= l2argvdata/panic.x86_64-latest.args index 61f84391e5..621daa8dab 100644 --- a/tests/qemuxml2argvdata/panic.x86_64-latest.args +++ b/tests/qemuxml2argvdata/panic.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.= args b/tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.args index c77e7e5b38..2cf5a66040 100644 --- a/tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev parallel,id=3Dcharparallel0,path=3D/dev/parport0 \ -device '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel= 0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.x86_64-latest.args= b/tests/qemuxml2argvdata/parallel-tcp-chardev.x86_64-latest.args index 747b64c8f3..4e433553e4 100644 --- a/tests/qemuxml2argvdata/parallel-tcp-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev socket,id=3Dcharparallel0,host=3D127.0.0.1,port=3D9999,server=3Do= n,wait=3Doff \ -device '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel= 0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.x86_64-latest.args b/t= ests/qemuxml2argvdata/pci-autoadd-addr.x86_64-latest.args index cc3f6a59f9..a13238efd8 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-addr.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pci-autoadd-addr.x86_64-latest.args @@ -34,9 +34,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/= .config \ -device '{"driver":"pci-bridge","chassis_nr":6,"id":"pci.6","bus":"pci.0",= "addr":"0x8"}' \ -device '{"driver":"pci-bridge","chassis_nr":7,"id":"pci.7","bus":"pci.0",= "addr":"0x9"}' \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"= libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ +-blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"= libvirt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.7","add= r":"0x6"}' \ diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.x86_64-latest.args b/te= sts/qemuxml2argvdata/pci-autoadd-idx.x86_64-latest.args index c4731e8e56..966494719b 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-idx.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pci-autoadd-idx.x86_64-latest.args @@ -35,9 +35,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/= .config \ -device '{"driver":"pci-bridge","chassis_nr":6,"id":"pci.6","bus":"pci.0",= "addr":"0x9"}' \ -device '{"driver":"pci-bridge","chassis_nr":7,"id":"pci.7","bus":"pci.0",= "addr":"0xa"}' \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"= libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ +-blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"= libvirt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.4","add= r":"0x6"}' \ diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.x86_64-latest.args b/= tests/qemuxml2argvdata/pci-autofill-addr.x86_64-latest.args index 16304a76ef..4f37de212b 100644 --- a/tests/qemuxml2argvdata/pci-autofill-addr.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pci-autofill-addr.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/= .config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"= libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"= libvirt-1-storage","read-only":true}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.x86_64-latest.arg= s b/tests/qemuxml2argvdata/pci-bridge-many-disks.x86_64-latest.args index cd39dbcaa1..c3e53eb0c0 100644 --- a/tests/qemuxml2argvdata/pci-bridge-many-disks.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.x86_64-latest.args @@ -30,321 +30,216 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-lot= s-of-disks/.config \ -device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.0",= "addr":"0x3"}' \ -device '{"driver":"pci-bridge","chassis_nr":3,"id":"pci.3","bus":"pci.0",= "addr":"0x4"}' \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test.img",= "node-name":"libvirt-105-storage","auto-read-only":true,"discard":"unmap"}'= \ --blockdev '{"node-name":"libvirt-105-format","read-only":false,"driver":"r= aw","file":"libvirt-105-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-105-format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-a.i= mg","node-name":"libvirt-104-storage","auto-read-only":true,"discard":"unma= p"}' \ --blockdev '{"node-name":"libvirt-104-format","read-only":false,"driver":"r= aw","file":"libvirt-104-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-104-format","id":"virtio-disk26"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-b.i= mg","node-name":"libvirt-103-storage","auto-read-only":true,"discard":"unma= p"}' \ --blockdev '{"node-name":"libvirt-103-format","read-only":false,"driver":"r= aw","file":"libvirt-103-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-103-format","id":"virtio-disk27"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-c.i= mg","node-name":"libvirt-102-storage","auto-read-only":true,"discard":"unma= p"}' \ --blockdev '{"node-name":"libvirt-102-format","read-only":false,"driver":"r= aw","file":"libvirt-102-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x8","drive":"li= bvirt-102-format","id":"virtio-disk28"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-d.i= mg","node-name":"libvirt-101-storage","auto-read-only":true,"discard":"unma= p"}' \ --blockdev '{"node-name":"libvirt-101-format","read-only":false,"driver":"r= aw","file":"libvirt-101-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x9","drive":"li= bvirt-101-format","id":"virtio-disk29"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-a.i= mg","node-name":"libvirt-100-storage","auto-read-only":true,"discard":"unma= p"}' \ --blockdev '{"node-name":"libvirt-100-format","read-only":false,"driver":"r= aw","file":"libvirt-100-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xa","drive":"li= bvirt-100-format","id":"virtio-disk52"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-b.i= mg","node-name":"libvirt-99-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-99-format","read-only":false,"driver":"ra= w","file":"libvirt-99-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xb","drive":"li= bvirt-99-format","id":"virtio-disk53"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-c.i= mg","node-name":"libvirt-98-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-98-format","read-only":false,"driver":"ra= w","file":"libvirt-98-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xc","drive":"li= bvirt-98-format","id":"virtio-disk54"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-d.i= mg","node-name":"libvirt-97-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-97-format","read-only":false,"driver":"ra= w","file":"libvirt-97-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xd","drive":"li= bvirt-97-format","id":"virtio-disk55"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-a.i= mg","node-name":"libvirt-96-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-96-format","read-only":false,"driver":"ra= w","file":"libvirt-96-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xe","drive":"li= bvirt-96-format","id":"virtio-disk78"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-b.i= mg","node-name":"libvirt-95-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-95-format","read-only":false,"driver":"ra= w","file":"libvirt-95-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xf","drive":"li= bvirt-95-format","id":"virtio-disk79"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-c.i= mg","node-name":"libvirt-94-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-94-format","read-only":false,"driver":"ra= w","file":"libvirt-94-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x10","drive":"l= ibvirt-94-format","id":"virtio-disk80"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-d.i= mg","node-name":"libvirt-93-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-93-format","read-only":false,"driver":"ra= w","file":"libvirt-93-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x11","drive":"l= ibvirt-93-format","id":"virtio-disk81"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-a.i= mg","node-name":"libvirt-92-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-92-format","read-only":false,"driver":"ra= w","file":"libvirt-92-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x12","drive":"l= ibvirt-92-format","id":"virtio-disk104"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-b.i= mg","node-name":"libvirt-91-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-91-format","read-only":false,"driver":"ra= w","file":"libvirt-91-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x13","drive":"l= ibvirt-91-format","id":"virtio-disk105"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-c.i= mg","node-name":"libvirt-90-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-90-format","read-only":false,"driver":"ra= w","file":"libvirt-90-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x14","drive":"l= ibvirt-90-format","id":"virtio-disk106"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-d.i= mg","node-name":"libvirt-89-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-89-format","read-only":false,"driver":"ra= w","file":"libvirt-89-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x15","drive":"l= ibvirt-89-format","id":"virtio-disk107"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-a.i= mg","node-name":"libvirt-88-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-88-format","read-only":false,"driver":"ra= w","file":"libvirt-88-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x16","drive":"l= ibvirt-88-format","id":"virtio-disk130"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-b.i= mg","node-name":"libvirt-87-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-87-format","read-only":false,"driver":"ra= w","file":"libvirt-87-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x17","drive":"l= ibvirt-87-format","id":"virtio-disk131"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-c.i= mg","node-name":"libvirt-86-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-86-format","read-only":false,"driver":"ra= w","file":"libvirt-86-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x18","drive":"l= ibvirt-86-format","id":"virtio-disk132"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-d.i= mg","node-name":"libvirt-85-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-85-format","read-only":false,"driver":"ra= w","file":"libvirt-85-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x19","drive":"l= ibvirt-85-format","id":"virtio-disk133"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-a.i= mg","node-name":"libvirt-84-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-84-format","read-only":false,"driver":"ra= w","file":"libvirt-84-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1a","drive":"l= ibvirt-84-format","id":"virtio-disk156"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-b.i= mg","node-name":"libvirt-83-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-83-format","read-only":false,"driver":"ra= w","file":"libvirt-83-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1b","drive":"l= ibvirt-83-format","id":"virtio-disk157"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-c.i= mg","node-name":"libvirt-82-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-82-format","read-only":false,"driver":"ra= w","file":"libvirt-82-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1c","drive":"l= ibvirt-82-format","id":"virtio-disk158"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-d.i= mg","node-name":"libvirt-81-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-81-format","read-only":false,"driver":"ra= w","file":"libvirt-81-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1d","drive":"l= ibvirt-81-format","id":"virtio-disk159"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-a.i= mg","node-name":"libvirt-80-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-80-format","read-only":false,"driver":"ra= w","file":"libvirt-80-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1e","drive":"l= ibvirt-80-format","id":"virtio-disk182"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-b.i= mg","node-name":"libvirt-79-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-79-format","read-only":false,"driver":"ra= w","file":"libvirt-79-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1f","drive":"l= ibvirt-79-format","id":"virtio-disk183"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-c.i= mg","node-name":"libvirt-78-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-78-format","read-only":false,"driver":"ra= w","file":"libvirt-78-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1","drive":"li= bvirt-78-format","id":"virtio-disk184"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-d.i= mg","node-name":"libvirt-77-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-77-format","read-only":false,"driver":"ra= w","file":"libvirt-77-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x2","drive":"li= bvirt-77-format","id":"virtio-disk185"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-a.i= mg","node-name":"libvirt-76-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-76-format","read-only":false,"driver":"ra= w","file":"libvirt-76-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x3","drive":"li= bvirt-76-format","id":"virtio-disk208"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-b.i= mg","node-name":"libvirt-75-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-75-format","read-only":false,"driver":"ra= w","file":"libvirt-75-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x4","drive":"li= bvirt-75-format","id":"virtio-disk209"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-c.i= mg","node-name":"libvirt-74-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-74-format","read-only":false,"driver":"ra= w","file":"libvirt-74-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x5","drive":"li= bvirt-74-format","id":"virtio-disk210"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-d.i= mg","node-name":"libvirt-73-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-73-format","read-only":false,"driver":"ra= w","file":"libvirt-73-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x6","drive":"li= bvirt-73-format","id":"virtio-disk211"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-a.i= mg","node-name":"libvirt-72-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-72-format","read-only":false,"driver":"ra= w","file":"libvirt-72-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x7","drive":"li= bvirt-72-format","id":"virtio-disk234"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-b.i= mg","node-name":"libvirt-71-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-71-format","read-only":false,"driver":"ra= w","file":"libvirt-71-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x8","drive":"li= bvirt-71-format","id":"virtio-disk235"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-c.i= mg","node-name":"libvirt-70-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-70-format","read-only":false,"driver":"ra= w","file":"libvirt-70-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x9","drive":"li= bvirt-70-format","id":"virtio-disk236"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-d.i= mg","node-name":"libvirt-69-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-69-format","read-only":false,"driver":"ra= w","file":"libvirt-69-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xa","drive":"li= bvirt-69-format","id":"virtio-disk237"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-a.i= mg","node-name":"libvirt-68-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-68-format","read-only":false,"driver":"ra= w","file":"libvirt-68-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xb","drive":"li= bvirt-68-format","id":"virtio-disk260"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-b.i= mg","node-name":"libvirt-67-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-67-format","read-only":false,"driver":"ra= w","file":"libvirt-67-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xc","drive":"li= bvirt-67-format","id":"virtio-disk261"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-c.i= mg","node-name":"libvirt-66-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-66-format","read-only":false,"driver":"ra= w","file":"libvirt-66-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xd","drive":"li= bvirt-66-format","id":"virtio-disk262"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-d.i= mg","node-name":"libvirt-65-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-65-format","read-only":false,"driver":"ra= w","file":"libvirt-65-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xe","drive":"li= bvirt-65-format","id":"virtio-disk263"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-a.i= mg","node-name":"libvirt-64-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-64-format","read-only":false,"driver":"ra= w","file":"libvirt-64-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xf","drive":"li= bvirt-64-format","id":"virtio-disk286"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-b.i= mg","node-name":"libvirt-63-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-63-format","read-only":false,"driver":"ra= w","file":"libvirt-63-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x10","drive":"l= ibvirt-63-format","id":"virtio-disk287"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-c.i= mg","node-name":"libvirt-62-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-62-format","read-only":false,"driver":"ra= w","file":"libvirt-62-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x11","drive":"l= ibvirt-62-format","id":"virtio-disk288"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-d.i= mg","node-name":"libvirt-61-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-61-format","read-only":false,"driver":"ra= w","file":"libvirt-61-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x12","drive":"l= ibvirt-61-format","id":"virtio-disk289"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-a.i= mg","node-name":"libvirt-60-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-60-format","read-only":false,"driver":"ra= w","file":"libvirt-60-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x13","drive":"l= ibvirt-60-format","id":"virtio-disk312"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-b.i= mg","node-name":"libvirt-59-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-59-format","read-only":false,"driver":"ra= w","file":"libvirt-59-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x14","drive":"l= ibvirt-59-format","id":"virtio-disk313"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-c.i= mg","node-name":"libvirt-58-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-58-format","read-only":false,"driver":"ra= w","file":"libvirt-58-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x15","drive":"l= ibvirt-58-format","id":"virtio-disk314"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-d.i= mg","node-name":"libvirt-57-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-57-format","read-only":false,"driver":"ra= w","file":"libvirt-57-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x16","drive":"l= ibvirt-57-format","id":"virtio-disk315"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-a.i= mg","node-name":"libvirt-56-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-56-format","read-only":false,"driver":"ra= w","file":"libvirt-56-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x17","drive":"l= ibvirt-56-format","id":"virtio-disk338"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-b.i= mg","node-name":"libvirt-55-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-55-format","read-only":false,"driver":"ra= w","file":"libvirt-55-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x18","drive":"l= ibvirt-55-format","id":"virtio-disk339"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-c.i= mg","node-name":"libvirt-54-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-54-format","read-only":false,"driver":"ra= w","file":"libvirt-54-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x19","drive":"l= ibvirt-54-format","id":"virtio-disk340"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-d.i= mg","node-name":"libvirt-53-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-53-format","read-only":false,"driver":"ra= w","file":"libvirt-53-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1a","drive":"l= ibvirt-53-format","id":"virtio-disk341"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-a.i= mg","node-name":"libvirt-52-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-52-format","read-only":false,"driver":"ra= w","file":"libvirt-52-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1b","drive":"l= ibvirt-52-format","id":"virtio-disk364"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-b.i= mg","node-name":"libvirt-51-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-51-format","read-only":false,"driver":"ra= w","file":"libvirt-51-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1c","drive":"l= ibvirt-51-format","id":"virtio-disk365"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-c.i= mg","node-name":"libvirt-50-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-50-format","read-only":false,"driver":"ra= w","file":"libvirt-50-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1d","drive":"l= ibvirt-50-format","id":"virtio-disk366"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-d.i= mg","node-name":"libvirt-49-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-49-format","read-only":false,"driver":"ra= w","file":"libvirt-49-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1e","drive":"l= ibvirt-49-format","id":"virtio-disk367"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-a.i= mg","node-name":"libvirt-48-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-48-format","read-only":false,"driver":"ra= w","file":"libvirt-48-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1f","drive":"l= ibvirt-48-format","id":"virtio-disk390"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-b.i= mg","node-name":"libvirt-47-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-47-format","read-only":false,"driver":"ra= w","file":"libvirt-47-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1","drive":"li= bvirt-47-format","id":"virtio-disk391"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-c.i= mg","node-name":"libvirt-46-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-46-format","read-only":false,"driver":"ra= w","file":"libvirt-46-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x2","drive":"li= bvirt-46-format","id":"virtio-disk392"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-d.i= mg","node-name":"libvirt-45-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-45-format","read-only":false,"driver":"ra= w","file":"libvirt-45-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x3","drive":"li= bvirt-45-format","id":"virtio-disk393"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-a.i= mg","node-name":"libvirt-44-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-44-format","read-only":false,"driver":"ra= w","file":"libvirt-44-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x4","drive":"li= bvirt-44-format","id":"virtio-disk416"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-b.i= mg","node-name":"libvirt-43-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-43-format","read-only":false,"driver":"ra= w","file":"libvirt-43-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x5","drive":"li= bvirt-43-format","id":"virtio-disk417"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-c.i= mg","node-name":"libvirt-42-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-42-format","read-only":false,"driver":"ra= w","file":"libvirt-42-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x6","drive":"li= bvirt-42-format","id":"virtio-disk418"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-d.i= mg","node-name":"libvirt-41-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-41-format","read-only":false,"driver":"ra= w","file":"libvirt-41-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x7","drive":"li= bvirt-41-format","id":"virtio-disk419"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-a.i= mg","node-name":"libvirt-40-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-40-format","read-only":false,"driver":"ra= w","file":"libvirt-40-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x8","drive":"li= bvirt-40-format","id":"virtio-disk442"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-b.i= mg","node-name":"libvirt-39-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-39-format","read-only":false,"driver":"ra= w","file":"libvirt-39-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x9","drive":"li= bvirt-39-format","id":"virtio-disk443"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-c.i= mg","node-name":"libvirt-38-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-38-format","read-only":false,"driver":"ra= w","file":"libvirt-38-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xa","drive":"li= bvirt-38-format","id":"virtio-disk444"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-d.i= mg","node-name":"libvirt-37-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-37-format","read-only":false,"driver":"ra= w","file":"libvirt-37-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xb","drive":"li= bvirt-37-format","id":"virtio-disk445"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-a.i= mg","node-name":"libvirt-36-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-36-format","read-only":false,"driver":"ra= w","file":"libvirt-36-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xc","drive":"li= bvirt-36-format","id":"virtio-disk468"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-b.i= mg","node-name":"libvirt-35-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-35-format","read-only":false,"driver":"ra= w","file":"libvirt-35-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xd","drive":"li= bvirt-35-format","id":"virtio-disk469"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-c.i= mg","node-name":"libvirt-34-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-34-format","read-only":false,"driver":"ra= w","file":"libvirt-34-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xe","drive":"li= bvirt-34-format","id":"virtio-disk470"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-d.i= mg","node-name":"libvirt-33-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-33-format","read-only":false,"driver":"ra= w","file":"libvirt-33-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xf","drive":"li= bvirt-33-format","id":"virtio-disk471"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-a.i= mg","node-name":"libvirt-32-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-32-format","read-only":false,"driver":"ra= w","file":"libvirt-32-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x10","drive":"l= ibvirt-32-format","id":"virtio-disk494"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-b.i= mg","node-name":"libvirt-31-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-31-format","read-only":false,"driver":"ra= w","file":"libvirt-31-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x11","drive":"l= ibvirt-31-format","id":"virtio-disk495"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-c.i= mg","node-name":"libvirt-30-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-30-format","read-only":false,"driver":"ra= w","file":"libvirt-30-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x12","drive":"l= ibvirt-30-format","id":"virtio-disk496"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-d.i= mg","node-name":"libvirt-29-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-29-format","read-only":false,"driver":"ra= w","file":"libvirt-29-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x13","drive":"l= ibvirt-29-format","id":"virtio-disk497"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-a.i= mg","node-name":"libvirt-28-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-28-format","read-only":false,"driver":"ra= w","file":"libvirt-28-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x14","drive":"l= ibvirt-28-format","id":"virtio-disk520"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-b.i= mg","node-name":"libvirt-27-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-27-format","read-only":false,"driver":"ra= w","file":"libvirt-27-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x15","drive":"l= ibvirt-27-format","id":"virtio-disk521"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-c.i= mg","node-name":"libvirt-26-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-26-format","read-only":false,"driver":"ra= w","file":"libvirt-26-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x16","drive":"l= ibvirt-26-format","id":"virtio-disk522"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-d.i= mg","node-name":"libvirt-25-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-25-format","read-only":false,"driver":"ra= w","file":"libvirt-25-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x17","drive":"l= ibvirt-25-format","id":"virtio-disk523"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-a.i= mg","node-name":"libvirt-24-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-24-format","read-only":false,"driver":"ra= w","file":"libvirt-24-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x18","drive":"l= ibvirt-24-format","id":"virtio-disk546"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-b.i= mg","node-name":"libvirt-23-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-23-format","read-only":false,"driver":"ra= w","file":"libvirt-23-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x19","drive":"l= ibvirt-23-format","id":"virtio-disk547"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-c.i= mg","node-name":"libvirt-22-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-22-format","read-only":false,"driver":"ra= w","file":"libvirt-22-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1a","drive":"l= ibvirt-22-format","id":"virtio-disk548"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-d.i= mg","node-name":"libvirt-21-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-21-format","read-only":false,"driver":"ra= w","file":"libvirt-21-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1b","drive":"l= ibvirt-21-format","id":"virtio-disk549"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-a.i= mg","node-name":"libvirt-20-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-20-format","read-only":false,"driver":"ra= w","file":"libvirt-20-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1c","drive":"l= ibvirt-20-format","id":"virtio-disk572"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-b.i= mg","node-name":"libvirt-19-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-19-format","read-only":false,"driver":"ra= w","file":"libvirt-19-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1d","drive":"l= ibvirt-19-format","id":"virtio-disk573"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-c.i= mg","node-name":"libvirt-18-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-18-format","read-only":false,"driver":"ra= w","file":"libvirt-18-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1e","drive":"l= ibvirt-18-format","id":"virtio-disk574"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-d.i= mg","node-name":"libvirt-17-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-17-format","read-only":false,"driver":"ra= w","file":"libvirt-17-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1f","drive":"l= ibvirt-17-format","id":"virtio-disk575"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-a.i= mg","node-name":"libvirt-16-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-16-format","read-only":false,"driver":"ra= w","file":"libvirt-16-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x1","drive":"li= bvirt-16-format","id":"virtio-disk598"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-b.i= mg","node-name":"libvirt-15-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-15-format","read-only":false,"driver":"ra= w","file":"libvirt-15-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x2","drive":"li= bvirt-15-format","id":"virtio-disk599"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-c.i= mg","node-name":"libvirt-14-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-14-format","read-only":false,"driver":"ra= w","file":"libvirt-14-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x3","drive":"li= bvirt-14-format","id":"virtio-disk600"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-d.i= mg","node-name":"libvirt-13-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-13-format","read-only":false,"driver":"ra= w","file":"libvirt-13-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x4","drive":"li= bvirt-13-format","id":"virtio-disk601"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-a.i= mg","node-name":"libvirt-12-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-12-format","read-only":false,"driver":"ra= w","file":"libvirt-12-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x5","drive":"li= bvirt-12-format","id":"virtio-disk624"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-b.i= mg","node-name":"libvirt-11-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-11-format","read-only":false,"driver":"ra= w","file":"libvirt-11-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x6","drive":"li= bvirt-11-format","id":"virtio-disk625"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-c.i= mg","node-name":"libvirt-10-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-10-format","read-only":false,"driver":"ra= w","file":"libvirt-10-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x7","drive":"li= bvirt-10-format","id":"virtio-disk626"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-d.i= mg","node-name":"libvirt-9-storage","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-9-format","read-only":false,"driver":"raw= ","file":"libvirt-9-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x8","drive":"li= bvirt-9-format","id":"virtio-disk627"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-a.i= mg","node-name":"libvirt-8-storage","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-8-format","read-only":false,"driver":"raw= ","file":"libvirt-8-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x9","drive":"li= bvirt-8-format","id":"virtio-disk650"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-b.i= mg","node-name":"libvirt-7-storage","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"raw= ","file":"libvirt-7-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xa","drive":"li= bvirt-7-format","id":"virtio-disk651"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-c.i= mg","node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ","file":"libvirt-6-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xb","drive":"li= bvirt-6-format","id":"virtio-disk652"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-d.i= mg","node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ","file":"libvirt-5-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xc","drive":"li= bvirt-5-format","id":"virtio-disk653"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-a.i= mg","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xd","drive":"li= bvirt-4-format","id":"virtio-disk676"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-b.i= mg","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xe","drive":"li= bvirt-3-format","id":"virtio-disk677"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-c.i= mg","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xf","drive":"li= bvirt-2-format","id":"virtio-disk678"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-d.i= mg","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x10","drive":"l= ibvirt-1-format","id":"virtio-disk679"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test.img",= "node-name":"libvirt-105-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-105-storage","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-a.i= mg","node-name":"libvirt-104-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-104-storage","id":"virtio-disk26"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-b.i= mg","node-name":"libvirt-103-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-103-storage","id":"virtio-disk27"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-c.i= mg","node-name":"libvirt-102-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x8","drive":"li= bvirt-102-storage","id":"virtio-disk28"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-d.i= mg","node-name":"libvirt-101-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x9","drive":"li= bvirt-101-storage","id":"virtio-disk29"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-a.i= mg","node-name":"libvirt-100-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xa","drive":"li= bvirt-100-storage","id":"virtio-disk52"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-b.i= mg","node-name":"libvirt-99-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xb","drive":"li= bvirt-99-storage","id":"virtio-disk53"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-c.i= mg","node-name":"libvirt-98-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xc","drive":"li= bvirt-98-storage","id":"virtio-disk54"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-d.i= mg","node-name":"libvirt-97-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xd","drive":"li= bvirt-97-storage","id":"virtio-disk55"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-a.i= mg","node-name":"libvirt-96-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xe","drive":"li= bvirt-96-storage","id":"virtio-disk78"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-b.i= mg","node-name":"libvirt-95-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xf","drive":"li= bvirt-95-storage","id":"virtio-disk79"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-c.i= mg","node-name":"libvirt-94-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x10","drive":"l= ibvirt-94-storage","id":"virtio-disk80"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-d.i= mg","node-name":"libvirt-93-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x11","drive":"l= ibvirt-93-storage","id":"virtio-disk81"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-a.i= mg","node-name":"libvirt-92-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x12","drive":"l= ibvirt-92-storage","id":"virtio-disk104"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-b.i= mg","node-name":"libvirt-91-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x13","drive":"l= ibvirt-91-storage","id":"virtio-disk105"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-c.i= mg","node-name":"libvirt-90-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x14","drive":"l= ibvirt-90-storage","id":"virtio-disk106"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-d.i= mg","node-name":"libvirt-89-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x15","drive":"l= ibvirt-89-storage","id":"virtio-disk107"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-a.i= mg","node-name":"libvirt-88-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x16","drive":"l= ibvirt-88-storage","id":"virtio-disk130"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-b.i= mg","node-name":"libvirt-87-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x17","drive":"l= ibvirt-87-storage","id":"virtio-disk131"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-c.i= mg","node-name":"libvirt-86-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x18","drive":"l= ibvirt-86-storage","id":"virtio-disk132"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-d.i= mg","node-name":"libvirt-85-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x19","drive":"l= ibvirt-85-storage","id":"virtio-disk133"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-a.i= mg","node-name":"libvirt-84-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1a","drive":"l= ibvirt-84-storage","id":"virtio-disk156"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-b.i= mg","node-name":"libvirt-83-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1b","drive":"l= ibvirt-83-storage","id":"virtio-disk157"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-c.i= mg","node-name":"libvirt-82-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1c","drive":"l= ibvirt-82-storage","id":"virtio-disk158"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-d.i= mg","node-name":"libvirt-81-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1d","drive":"l= ibvirt-81-storage","id":"virtio-disk159"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-a.i= mg","node-name":"libvirt-80-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1e","drive":"l= ibvirt-80-storage","id":"virtio-disk182"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-b.i= mg","node-name":"libvirt-79-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1f","drive":"l= ibvirt-79-storage","id":"virtio-disk183"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-c.i= mg","node-name":"libvirt-78-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1","drive":"li= bvirt-78-storage","id":"virtio-disk184"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-d.i= mg","node-name":"libvirt-77-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x2","drive":"li= bvirt-77-storage","id":"virtio-disk185"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-a.i= mg","node-name":"libvirt-76-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x3","drive":"li= bvirt-76-storage","id":"virtio-disk208"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-b.i= mg","node-name":"libvirt-75-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x4","drive":"li= bvirt-75-storage","id":"virtio-disk209"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-c.i= mg","node-name":"libvirt-74-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x5","drive":"li= bvirt-74-storage","id":"virtio-disk210"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-d.i= mg","node-name":"libvirt-73-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x6","drive":"li= bvirt-73-storage","id":"virtio-disk211"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-a.i= mg","node-name":"libvirt-72-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x7","drive":"li= bvirt-72-storage","id":"virtio-disk234"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-b.i= mg","node-name":"libvirt-71-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x8","drive":"li= bvirt-71-storage","id":"virtio-disk235"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-c.i= mg","node-name":"libvirt-70-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x9","drive":"li= bvirt-70-storage","id":"virtio-disk236"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-d.i= mg","node-name":"libvirt-69-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xa","drive":"li= bvirt-69-storage","id":"virtio-disk237"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-a.i= mg","node-name":"libvirt-68-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xb","drive":"li= bvirt-68-storage","id":"virtio-disk260"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-b.i= mg","node-name":"libvirt-67-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xc","drive":"li= bvirt-67-storage","id":"virtio-disk261"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-c.i= mg","node-name":"libvirt-66-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xd","drive":"li= bvirt-66-storage","id":"virtio-disk262"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-d.i= mg","node-name":"libvirt-65-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xe","drive":"li= bvirt-65-storage","id":"virtio-disk263"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-a.i= mg","node-name":"libvirt-64-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xf","drive":"li= bvirt-64-storage","id":"virtio-disk286"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-b.i= mg","node-name":"libvirt-63-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x10","drive":"l= ibvirt-63-storage","id":"virtio-disk287"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-c.i= mg","node-name":"libvirt-62-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x11","drive":"l= ibvirt-62-storage","id":"virtio-disk288"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-d.i= mg","node-name":"libvirt-61-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x12","drive":"l= ibvirt-61-storage","id":"virtio-disk289"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-a.i= mg","node-name":"libvirt-60-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x13","drive":"l= ibvirt-60-storage","id":"virtio-disk312"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-b.i= mg","node-name":"libvirt-59-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x14","drive":"l= ibvirt-59-storage","id":"virtio-disk313"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-c.i= mg","node-name":"libvirt-58-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x15","drive":"l= ibvirt-58-storage","id":"virtio-disk314"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-d.i= mg","node-name":"libvirt-57-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x16","drive":"l= ibvirt-57-storage","id":"virtio-disk315"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-a.i= mg","node-name":"libvirt-56-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x17","drive":"l= ibvirt-56-storage","id":"virtio-disk338"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-b.i= mg","node-name":"libvirt-55-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x18","drive":"l= ibvirt-55-storage","id":"virtio-disk339"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-c.i= mg","node-name":"libvirt-54-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x19","drive":"l= ibvirt-54-storage","id":"virtio-disk340"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-d.i= mg","node-name":"libvirt-53-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1a","drive":"l= ibvirt-53-storage","id":"virtio-disk341"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-a.i= mg","node-name":"libvirt-52-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1b","drive":"l= ibvirt-52-storage","id":"virtio-disk364"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-b.i= mg","node-name":"libvirt-51-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1c","drive":"l= ibvirt-51-storage","id":"virtio-disk365"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-c.i= mg","node-name":"libvirt-50-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1d","drive":"l= ibvirt-50-storage","id":"virtio-disk366"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-d.i= mg","node-name":"libvirt-49-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1e","drive":"l= ibvirt-49-storage","id":"virtio-disk367"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-a.i= mg","node-name":"libvirt-48-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1f","drive":"l= ibvirt-48-storage","id":"virtio-disk390"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-b.i= mg","node-name":"libvirt-47-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1","drive":"li= bvirt-47-storage","id":"virtio-disk391"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-c.i= mg","node-name":"libvirt-46-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x2","drive":"li= bvirt-46-storage","id":"virtio-disk392"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-d.i= mg","node-name":"libvirt-45-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x3","drive":"li= bvirt-45-storage","id":"virtio-disk393"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-a.i= mg","node-name":"libvirt-44-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x4","drive":"li= bvirt-44-storage","id":"virtio-disk416"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-b.i= mg","node-name":"libvirt-43-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x5","drive":"li= bvirt-43-storage","id":"virtio-disk417"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-c.i= mg","node-name":"libvirt-42-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x6","drive":"li= bvirt-42-storage","id":"virtio-disk418"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-d.i= mg","node-name":"libvirt-41-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x7","drive":"li= bvirt-41-storage","id":"virtio-disk419"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-a.i= mg","node-name":"libvirt-40-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x8","drive":"li= bvirt-40-storage","id":"virtio-disk442"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-b.i= mg","node-name":"libvirt-39-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x9","drive":"li= bvirt-39-storage","id":"virtio-disk443"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-c.i= mg","node-name":"libvirt-38-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xa","drive":"li= bvirt-38-storage","id":"virtio-disk444"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-d.i= mg","node-name":"libvirt-37-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xb","drive":"li= bvirt-37-storage","id":"virtio-disk445"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-a.i= mg","node-name":"libvirt-36-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xc","drive":"li= bvirt-36-storage","id":"virtio-disk468"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-b.i= mg","node-name":"libvirt-35-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xd","drive":"li= bvirt-35-storage","id":"virtio-disk469"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-c.i= mg","node-name":"libvirt-34-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xe","drive":"li= bvirt-34-storage","id":"virtio-disk470"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-d.i= mg","node-name":"libvirt-33-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xf","drive":"li= bvirt-33-storage","id":"virtio-disk471"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-a.i= mg","node-name":"libvirt-32-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x10","drive":"l= ibvirt-32-storage","id":"virtio-disk494"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-b.i= mg","node-name":"libvirt-31-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x11","drive":"l= ibvirt-31-storage","id":"virtio-disk495"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-c.i= mg","node-name":"libvirt-30-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x12","drive":"l= ibvirt-30-storage","id":"virtio-disk496"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-d.i= mg","node-name":"libvirt-29-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x13","drive":"l= ibvirt-29-storage","id":"virtio-disk497"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-a.i= mg","node-name":"libvirt-28-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x14","drive":"l= ibvirt-28-storage","id":"virtio-disk520"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-b.i= mg","node-name":"libvirt-27-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x15","drive":"l= ibvirt-27-storage","id":"virtio-disk521"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-c.i= mg","node-name":"libvirt-26-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x16","drive":"l= ibvirt-26-storage","id":"virtio-disk522"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-d.i= mg","node-name":"libvirt-25-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x17","drive":"l= ibvirt-25-storage","id":"virtio-disk523"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-a.i= mg","node-name":"libvirt-24-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x18","drive":"l= ibvirt-24-storage","id":"virtio-disk546"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-b.i= mg","node-name":"libvirt-23-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x19","drive":"l= ibvirt-23-storage","id":"virtio-disk547"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-c.i= mg","node-name":"libvirt-22-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1a","drive":"l= ibvirt-22-storage","id":"virtio-disk548"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-d.i= mg","node-name":"libvirt-21-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1b","drive":"l= ibvirt-21-storage","id":"virtio-disk549"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-a.i= mg","node-name":"libvirt-20-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1c","drive":"l= ibvirt-20-storage","id":"virtio-disk572"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-b.i= mg","node-name":"libvirt-19-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1d","drive":"l= ibvirt-19-storage","id":"virtio-disk573"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-c.i= mg","node-name":"libvirt-18-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1e","drive":"l= ibvirt-18-storage","id":"virtio-disk574"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-d.i= mg","node-name":"libvirt-17-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1f","drive":"l= ibvirt-17-storage","id":"virtio-disk575"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-a.i= mg","node-name":"libvirt-16-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x1","drive":"li= bvirt-16-storage","id":"virtio-disk598"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-b.i= mg","node-name":"libvirt-15-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x2","drive":"li= bvirt-15-storage","id":"virtio-disk599"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-c.i= mg","node-name":"libvirt-14-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x3","drive":"li= bvirt-14-storage","id":"virtio-disk600"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-d.i= mg","node-name":"libvirt-13-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x4","drive":"li= bvirt-13-storage","id":"virtio-disk601"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-a.i= mg","node-name":"libvirt-12-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x5","drive":"li= bvirt-12-storage","id":"virtio-disk624"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-b.i= mg","node-name":"libvirt-11-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x6","drive":"li= bvirt-11-storage","id":"virtio-disk625"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-c.i= mg","node-name":"libvirt-10-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x7","drive":"li= bvirt-10-storage","id":"virtio-disk626"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-d.i= mg","node-name":"libvirt-9-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x8","drive":"li= bvirt-9-storage","id":"virtio-disk627"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-a.i= mg","node-name":"libvirt-8-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x9","drive":"li= bvirt-8-storage","id":"virtio-disk650"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-b.i= mg","node-name":"libvirt-7-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xa","drive":"li= bvirt-7-storage","id":"virtio-disk651"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-c.i= mg","node-name":"libvirt-6-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xb","drive":"li= bvirt-6-storage","id":"virtio-disk652"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-d.i= mg","node-name":"libvirt-5-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xc","drive":"li= bvirt-5-storage","id":"virtio-disk653"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-a.i= mg","node-name":"libvirt-4-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xd","drive":"li= bvirt-4-storage","id":"virtio-disk676"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-b.i= mg","node-name":"libvirt-3-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xe","drive":"li= bvirt-3-storage","id":"virtio-disk677"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-c.i= mg","node-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xf","drive":"li= bvirt-2-storage","id":"virtio-disk678"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-d.i= mg","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x10","drive":"l= ibvirt-1-storage","id":"virtio-disk679"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pci-bridge.x86_64-latest.args b/tests/q= emuxml2argvdata/pci-bridge.x86_64-latest.args index e8ddb921cd..6a631f557d 100644 --- a/tests/qemuxml2argvdata/pci-bridge.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pci-bridge.x86_64-latest.args @@ -28,9 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/= .config \ -device '{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0",= "addr":"0x3"}' \ -device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.0",= "addr":"0x4"}' \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"= libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ +-blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"= libvirt-1-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0"}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:f1:95:51","bus":"pci.0","addr":"0x5"}' \ -netdev '{"type":"user","id":"hostnet1"}' \ diff --git a/tests/qemuxml2argvdata/pci-many.x86_64-latest.args b/tests/qem= uxml2argvdata/pci-many.x86_64-latest.args index 8ef64242a7..2bf2d2f9fe 100644 --- a/tests/qemuxml2argvdata/pci-many.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pci-many.x86_64-latest.args @@ -27,93 +27,64 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-b= r/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"= libvirt-29-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-29-format","read-only":true,"driver":"raw= ","file":"libvirt-29-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-29-for= mat","id":"ide0-1-0"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test.img",= "node-name":"libvirt-28-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-28-format","read-only":false,"driver":"ra= w","file":"libvirt-28-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-28-format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test1.img"= ,"node-name":"libvirt-27-storage","auto-read-only":true,"discard":"unmap"}'= \ --blockdev '{"node-name":"libvirt-27-format","read-only":false,"driver":"ra= w","file":"libvirt-27-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-27-format","id":"virtio-disk1"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-a.i= mg","node-name":"libvirt-26-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-26-format","read-only":false,"driver":"ra= w","file":"libvirt-26-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-26-format","id":"virtio-disk26"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-b.i= mg","node-name":"libvirt-25-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-25-format","read-only":false,"driver":"ra= w","file":"libvirt-25-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-25-format","id":"virtio-disk27"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-c.i= mg","node-name":"libvirt-24-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-24-format","read-only":false,"driver":"ra= w","file":"libvirt-24-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x8","drive":"li= bvirt-24-format","id":"virtio-disk28"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-d.i= mg","node-name":"libvirt-23-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-23-format","read-only":false,"driver":"ra= w","file":"libvirt-23-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x9","drive":"li= bvirt-23-format","id":"virtio-disk29"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-a.i= mg","node-name":"libvirt-22-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-22-format","read-only":false,"driver":"ra= w","file":"libvirt-22-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xa","drive":"li= bvirt-22-format","id":"virtio-disk52"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-b.i= mg","node-name":"libvirt-21-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-21-format","read-only":false,"driver":"ra= w","file":"libvirt-21-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xb","drive":"li= bvirt-21-format","id":"virtio-disk53"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-c.i= mg","node-name":"libvirt-20-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-20-format","read-only":false,"driver":"ra= w","file":"libvirt-20-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xc","drive":"li= bvirt-20-format","id":"virtio-disk54"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-d.i= mg","node-name":"libvirt-19-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-19-format","read-only":false,"driver":"ra= w","file":"libvirt-19-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xd","drive":"li= bvirt-19-format","id":"virtio-disk55"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-a.i= mg","node-name":"libvirt-18-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-18-format","read-only":false,"driver":"ra= w","file":"libvirt-18-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xe","drive":"li= bvirt-18-format","id":"virtio-disk78"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-b.i= mg","node-name":"libvirt-17-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-17-format","read-only":false,"driver":"ra= w","file":"libvirt-17-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xf","drive":"li= bvirt-17-format","id":"virtio-disk79"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-c.i= mg","node-name":"libvirt-16-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-16-format","read-only":false,"driver":"ra= w","file":"libvirt-16-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x10","drive":"l= ibvirt-16-format","id":"virtio-disk80"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-d.i= mg","node-name":"libvirt-15-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-15-format","read-only":false,"driver":"ra= w","file":"libvirt-15-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x11","drive":"l= ibvirt-15-format","id":"virtio-disk81"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-a.i= mg","node-name":"libvirt-14-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-14-format","read-only":false,"driver":"ra= w","file":"libvirt-14-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x12","drive":"l= ibvirt-14-format","id":"virtio-disk104"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-b.i= mg","node-name":"libvirt-13-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-13-format","read-only":false,"driver":"ra= w","file":"libvirt-13-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x13","drive":"l= ibvirt-13-format","id":"virtio-disk105"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-c.i= mg","node-name":"libvirt-12-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-12-format","read-only":false,"driver":"ra= w","file":"libvirt-12-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x14","drive":"l= ibvirt-12-format","id":"virtio-disk106"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-d.i= mg","node-name":"libvirt-11-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-11-format","read-only":false,"driver":"ra= w","file":"libvirt-11-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x15","drive":"l= ibvirt-11-format","id":"virtio-disk107"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-a.i= mg","node-name":"libvirt-10-storage","auto-read-only":true,"discard":"unmap= "}' \ --blockdev '{"node-name":"libvirt-10-format","read-only":false,"driver":"ra= w","file":"libvirt-10-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x16","drive":"l= ibvirt-10-format","id":"virtio-disk130"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-b.i= mg","node-name":"libvirt-9-storage","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-9-format","read-only":false,"driver":"raw= ","file":"libvirt-9-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x17","drive":"l= ibvirt-9-format","id":"virtio-disk131"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-c.i= mg","node-name":"libvirt-8-storage","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-8-format","read-only":false,"driver":"raw= ","file":"libvirt-8-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x18","drive":"l= ibvirt-8-format","id":"virtio-disk132"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-d.i= mg","node-name":"libvirt-7-storage","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"raw= ","file":"libvirt-7-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x19","drive":"l= ibvirt-7-format","id":"virtio-disk133"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-a.i= mg","node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ","file":"libvirt-6-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1a","drive":"l= ibvirt-6-format","id":"virtio-disk156"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-b.i= mg","node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ","file":"libvirt-5-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1b","drive":"l= ibvirt-5-format","id":"virtio-disk157"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-c.i= mg","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1c","drive":"l= ibvirt-4-format","id":"virtio-disk158"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-d.i= mg","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1d","drive":"l= ibvirt-3-format","id":"virtio-disk159"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-a.i= mg","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1e","drive":"l= ibvirt-2-format","id":"virtio-disk182"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-b.i= mg","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1f","drive":"l= ibvirt-1-format","id":"virtio-disk183"}' \ +-blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"= libvirt-29-storage","read-only":true}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-29-sto= rage","id":"ide0-1-0"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test.img",= "node-name":"libvirt-28-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-28-storage","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test1.img"= ,"node-name":"libvirt-27-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-27-storage","id":"virtio-disk1"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-a.i= mg","node-name":"libvirt-26-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-26-storage","id":"virtio-disk26"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-b.i= mg","node-name":"libvirt-25-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-25-storage","id":"virtio-disk27"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-c.i= mg","node-name":"libvirt-24-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x8","drive":"li= bvirt-24-storage","id":"virtio-disk28"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-d.i= mg","node-name":"libvirt-23-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x9","drive":"li= bvirt-23-storage","id":"virtio-disk29"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-a.i= mg","node-name":"libvirt-22-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xa","drive":"li= bvirt-22-storage","id":"virtio-disk52"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-b.i= mg","node-name":"libvirt-21-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xb","drive":"li= bvirt-21-storage","id":"virtio-disk53"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-c.i= mg","node-name":"libvirt-20-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xc","drive":"li= bvirt-20-storage","id":"virtio-disk54"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-d.i= mg","node-name":"libvirt-19-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xd","drive":"li= bvirt-19-storage","id":"virtio-disk55"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-a.i= mg","node-name":"libvirt-18-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xe","drive":"li= bvirt-18-storage","id":"virtio-disk78"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-b.i= mg","node-name":"libvirt-17-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xf","drive":"li= bvirt-17-storage","id":"virtio-disk79"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-c.i= mg","node-name":"libvirt-16-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x10","drive":"l= ibvirt-16-storage","id":"virtio-disk80"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-d.i= mg","node-name":"libvirt-15-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x11","drive":"l= ibvirt-15-storage","id":"virtio-disk81"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-a.i= mg","node-name":"libvirt-14-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x12","drive":"l= ibvirt-14-storage","id":"virtio-disk104"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-b.i= mg","node-name":"libvirt-13-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x13","drive":"l= ibvirt-13-storage","id":"virtio-disk105"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-c.i= mg","node-name":"libvirt-12-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x14","drive":"l= ibvirt-12-storage","id":"virtio-disk106"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-d.i= mg","node-name":"libvirt-11-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x15","drive":"l= ibvirt-11-storage","id":"virtio-disk107"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-a.i= mg","node-name":"libvirt-10-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x16","drive":"l= ibvirt-10-storage","id":"virtio-disk130"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-b.i= mg","node-name":"libvirt-9-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x17","drive":"l= ibvirt-9-storage","id":"virtio-disk131"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-c.i= mg","node-name":"libvirt-8-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x18","drive":"l= ibvirt-8-storage","id":"virtio-disk132"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-d.i= mg","node-name":"libvirt-7-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x19","drive":"l= ibvirt-7-storage","id":"virtio-disk133"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-a.i= mg","node-name":"libvirt-6-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1a","drive":"l= ibvirt-6-storage","id":"virtio-disk156"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-b.i= mg","node-name":"libvirt-5-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1b","drive":"l= ibvirt-5-storage","id":"virtio-disk157"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-c.i= mg","node-name":"libvirt-4-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1c","drive":"l= ibvirt-4-storage","id":"virtio-disk158"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-d.i= mg","node-name":"libvirt-3-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1d","drive":"l= ibvirt-3-storage","id":"virtio-disk159"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-a.i= mg","node-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1e","drive":"l= ibvirt-2-storage","id":"virtio-disk182"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-b.i= mg","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1f","drive":"l= ibvirt-1-storage","id":"virtio-disk183"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ diff --git a/tests/qemuxml2argvdata/pci-rom.x86_64-latest.args b/tests/qemu= xml2argvdata/pci-rom.x86_64-latest.args index b2d21a497d..a4a1c57319 100644 --- a/tests/qemuxml2argvdata/pci-rom.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pci-rom.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:24:a5:9f","bus":"pci.0","addr":"0x2","rombar":1}' \ -netdev '{"type":"user","id":"hostnet1"}' \ diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args b/= tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args index 3fb86c29c2..534c6828fb 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args @@ -66,9 +66,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-pcie-ex= pander-bus-te/.config \ -device '{"driver":"xio3130-downstream","port":31,"chassis":35,"id":"pci.3= 5","bus":"pci.3","addr":"0x1f"}' \ -device '{"driver":"pcie-root-port","port":8,"chassis":36,"id":"pci.36","b= us":"pcie.0","addr":"0x1"}' \ -device '{"driver":"qemu-xhci","id":"usb","bus":"pci.36","addr":"0x0"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":= "sata0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-storage","id"= :"sata0-0-0","bootindex":1}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:f1:95:51","bus":"pci.4","addr":"0x0"}' \ -netdev '{"type":"user","id":"hostnet1"}' \ diff --git a/tests/qemuxml2argvdata/pcie-root-port.x86_64-latest.args b/tes= ts/qemuxml2argvdata/pcie-root-port.x86_64-latest.args index a7b855f935..87689266e1 100644 --- a/tests/qemuxml2argvdata/pcie-root-port.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pcie-root-port.x86_64-latest.args @@ -29,9 +29,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bu= s":"pcie.0","multifunction":true,"addr":"0x2"}' \ -device '{"driver":"ioh3420","port":26,"chassis":40,"id":"pci.2","bus":"pc= ie.0","addr":"0x2.0x1"}' \ -device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":= "sata0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-storage","id"= :"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","= addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.x86_64-late= st.args b/tests/qemuxml2argvdata/pcie-switch-downstream-port.x86_64-latest.= args index 6483c26322..7bf7431006 100644 --- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.x86_64-latest.args @@ -37,9 +37,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"xio3130-downstream","port":5,"chassis":9,"id":"pci.9",= "bus":"pci.2","addr":"0x5"}' \ -device '{"driver":"xio3130-downstream","port":6,"chassis":10,"id":"pci.10= ","bus":"pci.2","addr":"0x6"}' \ -device '{"driver":"qemu-xhci","id":"usb","bus":"pci.4","addr":"0x0"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":= "sata0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-storage","id"= :"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","= addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.x86_64-latest= .args b/tests/qemuxml2argvdata/pcie-switch-upstream-port.x86_64-latest.args index 8ea8d6fc55..be5fe92358 100644 --- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.x86_64-latest.args @@ -32,9 +32,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"x3130-upstream","id":"pci.4","bus":"pci.2","addr":"0x0= "}' \ -device '{"driver":"pcie-root-port","port":18,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x2.0x2"}' \ -device '{"driver":"qemu-xhci","id":"usb","bus":"pci.5","addr":"0x0"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":= "sata0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-storage","id"= :"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","= addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ diff --git a/tests/qemuxml2argvdata/pcihole64-q35.x86_64-latest.args b/test= s/qemuxml2argvdata/pcihole64-q35.x86_64-latest.args index 5351a68091..ff5d3ca592 100644 --- a/tests/qemuxml2argvdata/pcihole64-q35.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pcihole64-q35.x86_64-latest.args @@ -30,9 +30,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bu= s":"pcie.0","multifunction":true,"addr":"0x2"}' \ -device '{"driver":"pcie-root-port","port":17,"chassis":2,"id":"pci.2","bu= s":"pcie.0","addr":"0x2.0x1"}' \ -device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":= "sata0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-storage","id"= :"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","= addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args b/t= ests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args index 55a222b7ac..0f221ac2db 100644 --- a/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args @@ -43,9 +43,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"nec-usb-xhci","id":"usb","bus":"pci.6","addr":"0x0"}' \ -device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.5","addr":"0x= 0"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.4"= ,"addr":"0x0"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.7","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk1","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.7","addr":"0x0","drive":"li= bvirt-1-storage","id":"virtio-disk1","bootindex":1}' \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/to= /guest \ -device '{"driver":"virtio-9p-pci","id":"fs0","fsdev":"fsdev-fs0","mount_t= ag":"/import/from/host","bus":"pci.1","addr":"0x0"}' \ -netdev '{"type":"user","id":"hostnet0"}' \ diff --git a/tests/qemuxml2argvdata/q35-pcie.x86_64-latest.args b/tests/qem= uxml2argvdata/q35-pcie.x86_64-latest.args index a0a68b12e8..0720377f2f 100644 --- a/tests/qemuxml2argvdata/q35-pcie.x86_64-latest.args +++ b/tests/qemuxml2argvdata/q35-pcie.x86_64-latest.args @@ -44,9 +44,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"nec-usb-xhci","id":"usb","bus":"pci.8","addr":"0x0"}' \ -device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.7","addr":"0x= 0"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.6"= ,"addr":"0x0"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.9","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk1","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.9","addr":"0x0","drive":"li= bvirt-1-storage","id":"virtio-disk1","bootindex":1}' \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/to= /guest \ -device '{"driver":"virtio-9p-pci","id":"fs0","fsdev":"fsdev-fs0","mount_t= ag":"/import/from/host","bus":"pci.3","addr":"0x0"}' \ -netdev '{"type":"user","id":"hostnet0"}' \ diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.x86_64-latest.args b/tes= ts/qemuxml2argvdata/q35-usb2-multi.x86_64-latest.args index 8ec54eafc2..f3598e90fe 100644 --- a/tests/qemuxml2argvdata/q35-usb2-multi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/q35-usb2-multi.x86_64-latest.args @@ -40,9 +40,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"ich9-usb-uhci1","masterbus":"usb2.0","firstport":0,"bu= s":"pci.2","multifunction":true,"addr":"0x1"}' \ -device '{"driver":"ich9-usb-uhci2","masterbus":"usb2.0","firstport":2,"bu= s":"pci.2","addr":"0x1.0x1"}' \ -device '{"driver":"ich9-usb-uhci3","masterbus":"usb2.0","firstport":4,"bu= s":"pci.2","addr":"0x1.0x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":= "sata0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-storage","id"= :"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","= addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.x86_64-latest.args b/t= ests/qemuxml2argvdata/q35-usb2-reorder.x86_64-latest.args index feb109d939..c1d4ee40f1 100644 --- a/tests/qemuxml2argvdata/q35-usb2-reorder.x86_64-latest.args +++ b/tests/qemuxml2argvdata/q35-usb2-reorder.x86_64-latest.args @@ -40,9 +40,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"ich9-usb-uhci3","masterbus":"usb2.0","firstport":4,"bu= s":"pci.2","addr":"0x1.0x2"}' \ -device '{"driver":"ich9-usb-uhci2","masterbus":"usb2.0","firstport":2,"bu= s":"pci.2","addr":"0x1.0x1"}' \ -device '{"driver":"ich9-usb-uhci1","masterbus":"usb2.0","firstport":0,"bu= s":"pci.2","multifunction":true,"addr":"0x1"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":= "sata0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-storage","id"= :"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","= addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ diff --git a/tests/qemuxml2argvdata/q35-usb2.x86_64-latest.args b/tests/qem= uxml2argvdata/q35-usb2.x86_64-latest.args index 83eb7d7b4e..717e97706e 100644 --- a/tests/qemuxml2argvdata/q35-usb2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/q35-usb2.x86_64-latest.args @@ -32,9 +32,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pcie.0","multifunction":true,"addr":"0x1d"}' \ -device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus= ":"pcie.0","addr":"0x1d.0x1"}' \ -device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pcie.0","addr":"0x1d.0x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":= "sata0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-storage","id"= :"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","= addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ diff --git a/tests/qemuxml2argvdata/q35.x86_64-latest.args b/tests/qemuxml2= argvdata/q35.x86_64-latest.args index e6a915420c..54ca1cb119 100644 --- a/tests/qemuxml2argvdata/q35.x86_64-latest.args +++ b/tests/qemuxml2argvdata/q35.x86_64-latest.args @@ -31,9 +31,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bu= s":"pcie.0","multifunction":true,"addr":"0x2"}' \ -device '{"driver":"pcie-root-port","port":17,"chassis":2,"id":"pci.2","bu= s":"pcie.0","addr":"0x2.0x1"}' \ -device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":= "sata0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-storage","id"= :"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","= addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.x86_64-latest.args b/tests/= qemuxml2argvdata/qemu-ns-alt.x86_64-latest.args index eaba61ce8b..07af64af26 100644 --- a/tests/qemuxml2argvdata/qemu-ns-alt.x86_64-latest.args +++ b/tests/qemuxml2argvdata/qemu-ns-alt.x86_64-latest.args @@ -29,9 +29,8 @@ BAR=3D'' \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -unknown parameter \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.x86_64-latest.args index 97f7fc8c9b..52a1488073 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.x86_64-latest.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' ARGUMENT \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.x86_64-latest.args index 97f7fc8c9b..52a1488073 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.x86_64-latest.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' ARGUMENT \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.x86_64-latest.args = b/tests/qemuxml2argvdata/qemu-ns-commandline.x86_64-latest.args index 97f7fc8c9b..52a1488073 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline.x86_64-latest.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' ARGUMENT \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.x86_64-l= atest.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.x86_64-l= atest.args index 97f7fc8c9b..52a1488073 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.x86_64-latest.a= rgs @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' ARGUMENT \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.x86_64-lates= t.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.x86_64-latest.ar= gs index 97f7fc8c9b..52a1488073 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.x86_64-latest.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' ARGUMENT \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.x86_64-latest.args b= /tests/qemuxml2argvdata/qemu-ns-domain-ns0.x86_64-latest.args index 97f7fc8c9b..52a1488073 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.x86_64-latest.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' ARGUMENT \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.x86_64-latest.args b/tes= ts/qemuxml2argvdata/qemu-ns-no-env.x86_64-latest.args index c7a599b24f..43abe6e1fe 100644 --- a/tests/qemuxml2argvdata/qemu-ns-no-env.x86_64-latest.args +++ b/tests/qemuxml2argvdata/qemu-ns-no-env.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -unknown parameter \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args b/tests/qemu= xml2argvdata/qemu-ns.x86_64-latest.args index d35bae0f32..de5067e1d5 100644 --- a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args +++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args @@ -30,9 +30,8 @@ BAR=3D'' \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ua-disk","bootindex":1,"prop1":"propval1","prop2":-321,"prop3":12= 3,"prop4":true,"prop5":false}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ua-disk","bootindex":1,"prop1":"propval1","prop2":-321,"prop3":1= 23,"prop4":true,"prop5":false}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -unknown parameter \ diff --git a/tests/qemuxml2argvdata/restore-v2-fd.x86_64-latest.args b/test= s/qemuxml2argvdata/restore-v2-fd.x86_64-latest.args index e5e2b50b75..853b9c30a9 100644 --- a/tests/qemuxml2argvdata/restore-v2-fd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/restore-v2-fd.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -incoming fd:7 \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/restore-v2.x86_64-latest.args b/tests/q= emuxml2argvdata/restore-v2.x86_64-latest.args index d130a94157..fd66760998 100644 --- a/tests/qemuxml2argvdata/restore-v2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/restore-v2.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -incoming exec:cat \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.x86_64-latest.args b/= tests/qemuxml2argvdata/seclabel-dac-none.x86_64-latest.args index 486a07b157..23beb54806 100644 --- a/tests/qemuxml2argvdata/seclabel-dac-none.x86_64-latest.args +++ b/tests/qemuxml2argvdata/seclabel-dac-none.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.x86_64-lates= t.args b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.x86_64-latest.ar= gs index 486a07b157..23beb54806 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.x86_64-latest.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.x86_64-lates= t.args b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.x86_64-latest.ar= gs index 486a07b157..23beb54806 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.x86_64-latest.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.x86_64-latest= .args b/tests/qemuxml2argvdata/seclabel-dynamic-override.x86_64-latest.args index 82b7e38fe2..a8f42a7674 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-override.x86_64-latest.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.x86_64-latest.args @@ -27,12 +27,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-1-form= at","id":"ide0-0-1"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-stor= age","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-1-stor= age","id":"ide0-0-1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.x86_64-latest.= args b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.x86_64-latest.args index 486a07b157..23beb54806 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.x86_64-latest.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.x86_64-latest.args b/t= ests/qemuxml2argvdata/seclabel-dynamic.x86_64-latest.args index 486a07b157..23beb54806 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic.x86_64-latest.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/seclabel-none.x86_64-latest.args b/test= s/qemuxml2argvdata/seclabel-none.x86_64-latest.args index 486a07b157..23beb54806 100644 --- a/tests/qemuxml2argvdata/seclabel-none.x86_64-latest.args +++ b/tests/qemuxml2argvdata/seclabel-none.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.x86_64-latest= .args b/tests/qemuxml2argvdata/seclabel-static-labelskip.x86_64-latest.args index 486a07b157..23beb54806 100644 --- a/tests/qemuxml2argvdata/seclabel-static-labelskip.x86_64-latest.args +++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/seclabel-static-relabel.x86_64-latest.args index 486a07b157..23beb54806 100644 --- a/tests/qemuxml2argvdata/seclabel-static-relabel.x86_64-latest.args +++ b/tests/qemuxml2argvdata/seclabel-static-relabel.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/seclabel-static.x86_64-latest.args b/te= sts/qemuxml2argvdata/seclabel-static.x86_64-latest.args index 486a07b157..23beb54806 100644 --- a/tests/qemuxml2argvdata/seclabel-static.x86_64-latest.args +++ b/tests/qemuxml2argvdata/seclabel-static.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest= .args b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args index a6e7260f1b..a4ef64b0e6 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev serial,id=3Dcharserial0,path=3D/dev/ttyS2 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0,"iobase":1016,"irq":4}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args b= /tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args index fe0631dbe9..4e0b5a20b5 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev serial,id=3Dcharserial0,path=3D/dev/ttyS2 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/serial-file-chardev.x86_64-latest.args = b/tests/qemuxml2argvdata/serial-file-chardev.x86_64-latest.args index a28e54095e..ca1867c247 100644 --- a/tests/qemuxml2argvdata/serial-file-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-file-chardev.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -add-fd set=3D0,fd=3D1750,opaque=3Dserial0-source \ -chardev file,id=3Dcharserial0,path=3D/dev/fdset/0,append=3Don \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxml2argvdata/serial-file-log.x86_64-latest.args b/te= sts/qemuxml2argvdata/serial-file-log.x86_64-latest.args index b6c93aae9b..6cae9e89cd 100644 --- a/tests/qemuxml2argvdata/serial-file-log.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-file-log.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -add-fd set=3D0,fd=3D1750,opaque=3Dserial0-source \ -add-fd set=3D1,fd=3D1751,opaque=3Dserial0-log \ -chardev file,id=3Dcharserial0,path=3D/dev/fdset/0,append=3Don,logfile=3D/= dev/fdset/1,logappend=3Don \ diff --git a/tests/qemuxml2argvdata/serial-many-chardev.x86_64-latest.args = b/tests/qemuxml2argvdata/serial-many-chardev.x86_64-latest.args index 75576bd85d..38d0033c9f 100644 --- a/tests/qemuxml2argvdata/serial-many-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-many-chardev.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -add-fd set=3D0,fd=3D1750,opaque=3Dserial1-source \ diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.x86_64-latest.args b= /tests/qemuxml2argvdata/serial-pty-chardev.x86_64-latest.args index e2853ca15f..8b128669d1 100644 --- a/tests/qemuxml2argvdata/serial-pty-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-pty-chardev.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args b/t= ests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args index 2a9062f935..dbbe2e10e5 100644 --- a/tests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev spiceport,id=3Dcharserial0,name=3Dorg.qemu.console.serial.0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.x86_64-latest.args b= /tests/qemuxml2argvdata/serial-tcp-chardev.x86_64-latest.args index c2ca0c616b..9f6a7e08e6 100644 --- a/tests/qemuxml2argvdata/serial-tcp-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-tcp-chardev.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev socket,id=3Dcharserial0,host=3D127.0.0.1,port=3D9999 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.x86_64-latest= .args b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.x86_64-latest.args index 722d74f86c..6c0ef3ef8d 100644 --- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev socket,id=3Dcharserial0,host=3D127.0.0.1,port=3D9999,telnet=3Don,= server=3Don,wait=3Doff \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.x86_64= -latest.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.x86_= 64-latest.args index 3683fe3fed..3a755c1aff 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest= .args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D2222,localaddr=3D127= .0.0.1,localport=3D1111 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -chardev socket,id=3Dcharserial1,host=3D127.0.0.1,port=3D5555 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.x86_6= 4-latest.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.x8= 6_64-latest.args index cf936f0fc0..f8f1bb8502 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.x86_64-lates= t.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D2222,localaddr=3D127= .0.0.1,localport=3D1111 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -object '{"qom-type":"tls-creds-x509","id":"objcharserial1_tls0","dir":"/e= tc/pki/libvirt-chardev","endpoint":"client","verify-peer":true}' \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.x86_64-lates= t.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.x86_64-latest.ar= gs index cf936f0fc0..f8f1bb8502 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D2222,localaddr=3D127= .0.0.1,localport=3D1111 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -object '{"qom-type":"tls-creds-x509","id":"objcharserial1_tls0","dir":"/e= tc/pki/libvirt-chardev","endpoint":"client","verify-peer":true}' \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.x86_6= 4-latest.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.x8= 6_64-latest.args index 2e161704dc..c227a04112 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.x86_64-lates= t.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D2222,localaddr=3D127= .0.0.1,localport=3D1111 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -object '{"qom-type":"secret","id":"charserial1-secret0","data":"9eao5F8qt= kGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey= 0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.x86_64-latest.args b= /tests/qemuxml2argvdata/serial-udp-chardev.x86_64-latest.args index bcb54a4fe1..3592ef6b19 100644 --- a/tests/qemuxml2argvdata/serial-udp-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-udp-chardev.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D9998,localaddr=3D127= .0.0.1,localport=3D9999 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -chardev udp,id=3Dcharserial1,host=3D,port=3D9999,localaddr=3D,localport= =3D0 \ diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.x86_64-latest.args b/= tests/qemuxml2argvdata/serial-vc-chardev.x86_64-latest.args index fa5af4b978..50df7aa9bd 100644 --- a/tests/qemuxml2argvdata/serial-vc-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-vc-chardev.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev vc,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/smbios-type-fwcfg.x86_64-latest.args b/= tests/qemuxml2argvdata/smbios-type-fwcfg.x86_64-latest.args index a9a0eae4f5..41831fec53 100644 --- a/tests/qemuxml2argvdata/smbios-type-fwcfg.x86_64-latest.args +++ b/tests/qemuxml2argvdata/smbios-type-fwcfg.x86_64-latest.args @@ -32,9 +32,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/smbios.x86_64-latest.args b/tests/qemux= ml2argvdata/smbios.x86_64-latest.args index 8ef15be66a..969e587683 100644 --- a/tests/qemuxml2argvdata/smbios.x86_64-latest.args +++ b/tests/qemuxml2argvdata/smbios.x86_64-latest.args @@ -32,9 +32,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/user-aliases.x86_64-latest.args b/tests= /qemuxml2argvdata/user-aliases.x86_64-latest.args index df0005f8dc..c07100ae54 100644 --- a/tests/qemuxml2argvdata/user-aliases.x86_64-latest.args +++ b/tests/qemuxml2argvdata/user-aliases.x86_64-latest.args @@ -38,9 +38,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-gentoo/= .config \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x8"}' \ -device '{"driver":"usb-ccid","id":"ua-myCCID","bus":"ua-SomeWeirdControll= er.0","port":"1"}' \ -device '{"driver":"usb-ccid","id":"ua-myCCID2","bus":"ua-SomeWeirdControl= ler.0","port":"2"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/fd.img","n= ode-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap","cach= e":{"direct":true,"no-flush":false}}' \ --blockdev '{"node-name":"libvirt-4-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"raw","file":"libvirt-4-storage"}' \ --device '{"driver":"floppy","unit":0,"drive":"libvirt-4-format","id":"ua-m= yDisk1","write-cache":"on"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/fd.img","n= ode-name":"libvirt-4-storage","read-only":false,"cache":{"direct":true,"no-= flush":false}}' \ +-device '{"driver":"floppy","unit":0,"drive":"libvirt-4-storage","id":"ua-= myDisk1","write-cache":"on"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/gentoo.qco= w2","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"qco= w2","file":"libvirt-3-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-3-format","id":"ua-myDisk2","bootindex":1}' \ @@ -48,9 +47,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-gentoo/= .config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/OtherDemo.= img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qco= w2","encrypt":{"format":"luks","key-secret":"libvirt-2-format-encryption-se= cret0"},"file":"libvirt-2-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-2-format","id":"ua-myEncryptedDisk1"}' \ --blockdev '{"driver":"file","filename":"/home/zippy/tmp/install-amd64-mini= mal-20140619.iso","node-name":"libvirt-1-storage","auto-read-only":true,"di= scard":"unmap","cache":{"direct":true,"no-flush":false}}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":true,"cache":{"dire= ct":true,"no-flush":false},"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"share-rw":true,"drive"= :"libvirt-1-format","id":"ua-WhatAnAwesomeCDROM","bootindex":2,"write-cache= ":"on"}' \ +-blockdev '{"driver":"file","filename":"/home/zippy/tmp/install-amd64-mini= mal-20140619.iso","node-name":"libvirt-1-storage","read-only":true,"cache":= {"direct":true,"no-flush":false}}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"share-rw":true,"drive"= :"libvirt-1-storage","id":"ua-WhatAnAwesomeCDROM","bootindex":2,"write-cach= e":"on"}' \ -netdev '{"type":"tap","fd":"3","vhost":true,"vhostfd":"44","id":"hostua-C= heckoutThisNIC"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostua-CheckoutThisNIC","id"= :"ua-CheckoutThisNIC","mac":"52:54:00:d6:c0:0b","bus":"pci.0","addr":"0x3"}= ' \ -netdev '{"type":"socket","listen":"127.0.0.1:1234","id":"hostua-WeCanAlso= DoServerMode"}' \ diff --git a/tests/qemuxml2argvdata/user-aliases2.x86_64-latest.args b/test= s/qemuxml2argvdata/user-aliases2.x86_64-latest.args index 4f015c4c28..3c7c21c22f 100644 --- a/tests/qemuxml2argvdata/user-aliases2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/user-aliases2.x86_64-latest.args @@ -30,9 +30,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ -device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ -device '{"driver":"isa-fdc","bootindexA":1}' \ --blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"floppy","unit":0,"drive":"libvirt-1-format","id":"fdc0= -0-0"}' \ +-blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-1-storage","read-only":false}' \ +-device '{"driver":"floppy","unit":0,"drive":"libvirt-1-storage","id":"fdc= 0-0-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ diff --git a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.= args b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args index 26a2e56056..ba03152c36 100644 --- a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args @@ -28,9 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args b/tes= ts/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args index 92d90fbcb8..69c4f5fa4c 100644 --- a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args @@ -28,9 +28,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/video-none-device.x86_64-latest.args b/= tests/qemuxml2argvdata/video-none-device.x86_64-latest.args index d7cd40c422..10e8ae1880 100644 --- a/tests/qemuxml2argvdata/video-none-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-none-device.x86_64-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/video-qxl-heads.x86_64-latest.args b/te= sts/qemuxml2argvdata/video-qxl-heads.x86_64-latest.args index e0fe7397e6..e3319f3c48 100644 --- a/tests/qemuxml2argvdata/video-qxl-heads.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-qxl-heads.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pci.0","a= ddr":"0x2"}' \ -device '{"driver":"qxl","id":"video1","max_outputs":3,"ram_size":67108864= ,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pci.0","addr"= :"0x4"}' \ diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.x86_64-latest.args b/= tests/qemuxml2argvdata/video-qxl-noheads.x86_64-latest.args index 32d58cc4b2..41aa82250f 100644 --- a/tests/qemuxml2argvdata/video-qxl-noheads.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-qxl-noheads.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pci.0","a= ddr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.x86_64-latest.args= b/tests/qemuxml2argvdata/video-qxl-resolution.x86_64-latest.args index 0a2d18443d..721ef8dc0b 100644 --- a/tests/qemuxml2argvdata/video-qxl-resolution.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-qxl-resolution.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":8,"xres":1280,"yre= s":720,"bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.x86_64-latest.args = b/tests/qemuxml2argvdata/video-vga-qxl-heads.x86_64-latest.args index e0fe7397e6..e3319f3c48 100644 --- a/tests/qemuxml2argvdata/video-vga-qxl-heads.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pci.0","a= ddr":"0x2"}' \ -device '{"driver":"qxl","id":"video1","max_outputs":3,"ram_size":67108864= ,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pci.0","addr"= :"0x4"}' \ diff --git a/tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args b/tests/q= emuxml2argvdata/virtio-lun.x86_64-latest.args index ee9539e672..97b51d0746 100644 --- a/tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args @@ -28,12 +28,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/= .config \ -boot menu=3Don,strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ --blockdev '{"driver":"host_device","filename":"/dev/sdfake","node-name":"l= ibvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","scsi":true,"bus":"pci.0","addr":"0x4"= ,"drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ --blockdev '{"driver":"host_device","filename":"/dev/sdfake2","node-name":"= libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","scsi":true,"bus":"pci.0","addr":"0x5"= ,"drive":"libvirt-1-format","id":"virtio-disk1"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/sdfake","node-name":"l= ibvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","scsi":true,"bus":"pci.0","addr":"0x4"= ,"drive":"libvirt-2-storage","id":"virtio-disk0","bootindex":2}' \ +-blockdev '{"driver":"host_device","filename":"/dev/sdfake2","node-name":"= libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","scsi":true,"bus":"pci.0","addr":"0x5"= ,"drive":"libvirt-1-storage","id":"virtio-disk1"}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","event_idx":false,"netdev":"hostnet0",= "id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args index 375db8690b..b529c798db 100644 --- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args @@ -38,9 +38,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"pcie-root-port","port":17,"chassis":10,"id":"pci.10","= bus":"pcie.0","addr":"0x2.0x1"}' \ -device '{"driver":"virtio-scsi-pci-non-transitional","id":"scsi0","bus":"= pci.4","addr":"0x0"}' \ -device '{"driver":"virtio-serial-pci-non-transitional","id":"virtio-seria= l0","bus":"pci.3","addr":"0x0"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci-non-transitional","bus":"pci.5","addr":= "0x0","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci-non-transitional","bus":"pci.5","addr":= "0x0","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ -device '{"driver":"virtio-9p-pci-non-transitional","id":"fs0","fsdev":"fs= dev-fs0","mount_tag":"fs1","bus":"pci.1","addr":"0x0"}' \ -netdev '{"type":"user","id":"hostnet0"}' \ diff --git a/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args index 9ba52a3309..a165eab675 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args @@ -27,12 +27,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img1","nod= e-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","ats":true,"bus":"pci.0","addr":"0x2",= "drive":"libvirt-2-format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img2","nod= e-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","ats":false,"bus":"pci.0","addr":"0x3"= ,"drive":"libvirt-1-format","id":"virtio-disk1"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img1","nod= e-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","ats":true,"bus":"pci.0","addr":"0x2",= "drive":"libvirt-2-storage","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img2","nod= e-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","ats":false,"bus":"pci.0","addr":"0x3"= ,"drive":"libvirt-1-storage","id":"virtio-disk1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest= .args b/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args index 2b8aac5e38..8714d6ef42 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args @@ -27,12 +27,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img1","nod= e-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","iommu_platform":true,"bus":"pci.0","a= ddr":"0x2","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img2","nod= e-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","iommu_platform":false,"bus":"pci.0","= addr":"0x3","drive":"libvirt-1-format","id":"virtio-disk1"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img1","nod= e-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","iommu_platform":true,"bus":"pci.0","a= ddr":"0x2","drive":"libvirt-2-storage","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img2","nod= e-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","iommu_platform":false,"bus":"pci.0","= addr":"0x3","drive":"libvirt-1-storage","id":"virtio-disk1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-lates= t.args b/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.ar= gs index 2ccd559afe..f84b9c2433 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args @@ -27,12 +27,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img1","nod= e-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","packed":true,"bus":"pci.0","addr":"0x= 2","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img2","nod= e-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","packed":false,"bus":"pci.0","addr":"0= x3","drive":"libvirt-1-format","id":"virtio-disk1"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img1","nod= e-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","packed":true,"bus":"pci.0","addr":"0x= 2","drive":"libvirt-2-storage","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img2","nod= e-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","packed":false,"bus":"pci.0","addr":"0= x3","drive":"libvirt-1-storage","id":"virtio-disk1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args b/tes= ts/qemuxml2argvdata/virtio-options.x86_64-latest.args index ccc3b0e7d7..03b3dd9691 100644 --- a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args @@ -29,9 +29,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-scsi-pci","iommu_platform":true,"ats":true,"pac= ked":true,"page-per-vq":true,"id":"scsi0","bus":"pci.0","addr":"0x8"}' \ -device '{"driver":"virtio-serial-pci","iommu_platform":true,"ats":true,"p= acked":true,"page-per-vq":true,"id":"virtio-serial0","bus":"pci.0","addr":"= 0x9"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img1","nod= e-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","iommu_platform":true,"ats":true,"pack= ed":true,"page-per-vq":true,"bus":"pci.0","addr":"0xa","drive":"libvirt-1-f= ormat","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img1","nod= e-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","iommu_platform":true,"ats":true,"pack= ed":true,"page-per-vq":true,"bus":"pci.0","addr":"0xa","drive":"libvirt-1-s= torage","id":"virtio-disk0","bootindex":1}' \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ -device '{"driver":"virtio-9p-pci","iommu_platform":true,"ats":true,"packe= d":true,"page-per-vq":true,"id":"fs0","fsdev":"fsdev-fs0","mount_tag":"fs1"= ,"bus":"pci.0","addr":"0x3"}' \ -fsdev local,security_model=3Dmapped,writeout=3Dimmediate,id=3Dfsdev-fs1,p= ath=3D/export/fs2 \ diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args index 4fe1dcefce..c92eb58f61 100644 --- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args @@ -31,9 +31,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1.0x1"}' \ -device '{"driver":"virtio-scsi-pci-transitional","id":"scsi0","bus":"pci.= 2","addr":"0x4"}' \ -device '{"driver":"virtio-serial-pci-transitional","id":"virtio-serial0",= "bus":"pci.2","addr":"0x3"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci-transitional","bus":"pci.2","addr":"0x5= ","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci-transitional","bus":"pci.2","addr":"0x5= ","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ -device '{"driver":"virtio-9p-pci-transitional","id":"fs0","fsdev":"fsdev-= fs0","mount_tag":"fs1","bus":"pci.2","addr":"0x1"}' \ -netdev '{"type":"user","id":"hostnet0"}' \ diff --git a/tests/qemuxml2argvdata/vmcoreinfo.x86_64-latest.args b/tests/q= emuxml2argvdata/vmcoreinfo.x86_64-latest.args index e037f73164..35aaa0d401 100644 --- a/tests/qemuxml2argvdata/vmcoreinfo.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vmcoreinfo.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -device '{"driver":"vmcoreinfo"}' \ diff --git a/tests/qemuxml2argvdata/watchdog-device.x86_64-latest.args b/te= sts/qemuxml2argvdata/watchdog-device.x86_64-latest.args index fb1c033e35..f4e34880be 100644 --- a/tests/qemuxml2argvdata/watchdog-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog-device.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"i6300esb","id":"watchdog0","bus":"pci.0","addr":"0x3"}= ' \ -watchdog-action poweroff \ diff --git a/tests/qemuxml2argvdata/watchdog-dump.x86_64-latest.args b/test= s/qemuxml2argvdata/watchdog-dump.x86_64-latest.args index 2ee74a82d2..c97d6c87b4 100644 --- a/tests/qemuxml2argvdata/watchdog-dump.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog-dump.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"ib700","id":"watchdog0"}' \ -watchdog-action pause \ diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args b= /tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args index 86c458dd8b..bf757d8369 100644 --- a/tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"ib700","id":"watchdog0"}' \ -watchdog-action inject-nmi \ diff --git a/tests/qemuxml2argvdata/watchdog.x86_64-latest.args b/tests/qem= uxml2argvdata/watchdog.x86_64-latest.args index c70d1ce50f..b64d5454ac 100644 --- a/tests/qemuxml2argvdata/watchdog.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"ib700","id":"watchdog0"}' \ -watchdog-action poweroff \ --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org