From nobody Wed May 1 03:18:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1613480249000161.1274608543472; Tue, 16 Feb 2021 04:57:29 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-541-a7FrY36OP_uawlvy8bYK3Q-1; Tue, 16 Feb 2021 07:57:23 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 92BC2801965; Tue, 16 Feb 2021 12:57:17 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 603D06F450; Tue, 16 Feb 2021 12:57:17 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E1D9E18095CB; Tue, 16 Feb 2021 12:57:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11GCvDQQ002228 for ; Tue, 16 Feb 2021 07:57:13 -0500 Received: by smtp.corp.redhat.com (Postfix) id 777F360C6D; Tue, 16 Feb 2021 12:57:13 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-215.ams2.redhat.com [10.36.112.215]) by smtp.corp.redhat.com (Postfix) with ESMTP id 372CA60C6B; Tue, 16 Feb 2021 12:57:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613480246; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=goERy38YODku/jOPT2V+ug5EWF1K0lKRZbUbZWdFAmM=; b=Fix6esKjV/Oxv9BsRv4O2aUnHSuWKlkO+RWOOmrvfCHM1JcQ10hvCi1Nra8hp7qP3mRFh9 CdMPAjPTfkN7D3FUVoRw1of0qcRwkX9VJOrMYxIygvfTBsLoqzMg0jJOCLfjnWdGOY325Y Mayb1WsawcdTkjSNagP387CwLGO1pEI= X-MC-Unique: a7FrY36OP_uawlvy8bYK3Q-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/5] qemu: probe for -vnc supporting use of QemuOpts syntax Date: Tue, 16 Feb 2021 12:57:01 +0000 Message-Id: <20210216125705.275788-2-berrange@redhat.com> In-Reply-To: <20210216125705.275788-1-berrange@redhat.com> References: <20210216125705.275788-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) This was introduced in QEMU 2.2.0, and is visible by -vnc appearing in the "query-command-line-options" data. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 + tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 + 54 files changed, 55 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 46b0109ca2..3f8593a9e5 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -616,6 +616,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "vhost-user-blk", "cpu-max", "memory-backend-file.x-use-canonical-path-for-ramblock-id", + "vnc-opts", ); =20 =20 @@ -3295,6 +3296,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCaps= CommandLine[] =3D { { "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS }, { "fw_cfg", "file", QEMU_CAPS_FW_CFG }, { "fsdev", "fmode", QEMU_CAPS_FSDEV_CREATEMODE }, /* Could have also c= hecked fsdev->dmode */ + { "vnc", "display", QEMU_CAPS_VNC_OPTS }, }; =20 static int diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 6fd7922926..38574eef16 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -596,6 +596,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_DEVICE_VHOST_USER_BLK, /* -device vhost-user-blk */ QEMU_CAPS_CPU_MAX, /* -cpu max */ QEMU_CAPS_X_USE_CANONICAL_PATH_FOR_RAMBLOCK_ID, /* -object memory-back= end-file,x-use-canonical-path-for-ramblock-id=3D */ + QEMU_CAPS_VNC_OPTS, /* -vnc uses QemuOpts parser instead of custom cod= e */ =20 QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qem= ucapabilitiesdata/caps_2.10.0.aarch64.xml index 5b7df57b50..cce5233a14 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -149,6 +149,7 @@ + 2010000 0 61700287 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemuc= apabilitiesdata/caps_2.10.0.ppc64.xml index fcd375da3b..94ea063d05 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -149,6 +149,7 @@ + 2010000 0 42900287 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.10.0.s390x.xml index dd28959eab..42e77c7ef1 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -113,6 +113,7 @@ + 2010000 0 39100287 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.10.0.x86_64.xml index 579b88c17f..8027baf181 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -194,6 +194,7 @@ + 2010000 0 43100287 diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.11.0.s390x.xml index 137fff4dfc..23ccb98c2a 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -121,6 +121,7 @@ + 2011000 0 39100288 diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.11.0.x86_64.xml index 2c475d73bc..5e310a452b 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -201,6 +201,7 @@ + 2011000 0 43100288 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qem= ucapabilitiesdata/caps_2.12.0.aarch64.xml index d4dad8d8b2..93c768c633 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -168,6 +168,7 @@ + 2012000 0 61700289 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemuc= apabilitiesdata/caps_2.12.0.ppc64.xml index f441354054..2b274dbbce 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -169,6 +169,7 @@ + 2011090 0 42900289 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.12.0.s390x.xml index 63c7e38f40..f74a4a807a 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -134,6 +134,7 @@ + 2012000 0 39100289 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.12.0.x86_64.xml index d54e305e2e..f160c7d16e 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -212,6 +212,7 @@ + 2011090 0 43100289 diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.4.0.x86_64.xml index dc8c17c230..4c81108258 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -140,6 +140,7 @@ + 2004000 0 43100242 diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.5.0.x86_64.xml index ff2f789ba3..ac365a695a 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -146,6 +146,7 @@ + 2005000 0 43100243 diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_2.6.0.aarch64.xml index b43cc3aa4d..6e398921c0 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -129,6 +129,7 @@ + 2006000 0 61700244 diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_2.6.0.ppc64.xml index efad707714..597e1a6a21 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -125,6 +125,7 @@ + 2006000 0 42900244 diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.6.0.x86_64.xml index 5c383c190a..b57e1f0d23 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -158,6 +158,7 @@ + 2006000 0 43100244 diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_2.7.0.s390x.xml index b46e16c0d8..5e5aef04f8 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -94,6 +94,7 @@ + 2007000 0 39100245 diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.7.0.x86_64.xml index 95f38ca41d..5574c3b941 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -163,6 +163,7 @@ + 2007000 0 43100245 diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_2.8.0.s390x.xml index cda8d08c4d..5525610a36 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -101,6 +101,7 @@ + 2007093 0 39100246 diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.8.0.x86_64.xml index d24c3c71e0..d9a102886a 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -168,6 +168,7 @@ + 2008000 0 43100246 diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_2.9.0.ppc64.xml index 04fd9abfff..d5098c3dfb 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -140,6 +140,7 @@ + 2009000 0 42900247 diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_2.9.0.s390x.xml index 9cdcb9988a..d985f4e9ec 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -106,6 +106,7 @@ + 2009000 0 39100247 diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.9.0.x86_64.xml index 37406cb4a9..8f41622c44 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -187,6 +187,7 @@ + 2009000 0 43100247 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_3.0.0.ppc64.xml index 28cc662bfb..09291babd6 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -171,6 +171,7 @@ + 2012050 0 42900239 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemu= capabilitiesdata/caps_3.0.0.riscv32.xml index cbc185fc3a..1c67d1b0a2 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -104,6 +104,7 @@ + 3000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_3.0.0.riscv64.xml index aa803ccbd6..018747e385 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -104,6 +104,7 @@ + 3000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_3.0.0.s390x.xml index cdb767bbf7..fd5279987a 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -137,6 +137,7 @@ + 3000000 0 39100239 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_3.0.0.x86_64.xml index 09bdbf7fc7..8bf6c831b1 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -218,6 +218,7 @@ + 3000000 0 43100239 diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_3.1.0.ppc64.xml index 11d8d668de..0464a8e456 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -176,6 +176,7 @@ + 3000091 0 42900240 diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_3.1.0.x86_64.xml index 7c7216826b..1a3177d561 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -221,6 +221,7 @@ + 3000092 0 43100240 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.aarch64.xml index 8bf4283e5b..915c84f66e 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -183,6 +183,7 @@ + 4000000 0 61700240 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.0.0.ppc64.xml index f9bf0910a2..b096120ae3 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -191,6 +191,7 @@ + 4000000 0 42900240 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.riscv32.xml index d56a19e6f9..53c35beba6 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -183,6 +183,7 @@ + 4000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.riscv64.xml index d35cb7e2ca..d76ad4102b 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -183,6 +183,7 @@ + 4000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.0.0.s390x.xml index 4e1fdb7eda..e61a9570b7 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml @@ -147,6 +147,7 @@ + 4000000 0 39100240 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.0.0.x86_64.xml index df76bf3b46..17395394df 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -228,6 +228,7 @@ + 4000000 0 43100240 diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.1.0.x86_64.xml index 026e5071a5..6bc2fea7b4 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -235,6 +235,7 @@ + 4001000 0 43100241 diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0.aarch64.xml index 57be989872..56922178ff 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -196,6 +196,7 @@ + 4001050 0 61700242 diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index 53a1b9ed18..080e3364d9 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -197,6 +197,7 @@ + 4001050 0 42900242 diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index 79a16221c1..2dfdc6f2ba 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -158,6 +158,7 @@ + 4002000 0 39100242 diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index afd0f2254f..ce6336d483 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -244,6 +244,7 @@ + 4002000 0 43100242 diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index 964df1076b..7031031716 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -206,6 +206,7 @@ + 5000000 0 61700241 diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index 7398751fd8..4f690108e0 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -215,6 +215,7 @@ + 5000000 0 42900241 diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index 7a27dd75d9..6fb46102e7 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -201,6 +201,7 @@ + 5000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index eb700b5415..8fd9afdf15 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -251,6 +251,7 @@ + 5000000 0 43100241 diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemuca= pabilitiesdata/caps_5.1.0.sparc.xml index 704ca704e0..66b62ff387 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -116,6 +116,7 @@ + 5001000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index a7a9af5dc1..d1096c3cb7 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -253,6 +253,7 @@ + 5001000 0 43100242 diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.aarch64.xml index dec6fd250a..44cd217efb 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -210,6 +210,7 @@ + 5002000 0 61700243 diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.ppc64.xml index 479bd90e37..8fad127015 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -217,6 +217,7 @@ + 5002000 0 42900243 diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.riscv64.xml index 9eaccb2089..c939ed2db7 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -203,6 +203,7 @@ + 5002000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index cdcd5cac57..4c91abc6f1 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -165,6 +165,7 @@ + 5002000 0 39100243 diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index 5643d3b713..853f73fa53 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -254,6 +254,7 @@ + 5002000 0 43100243 diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index ddfa701798..23fb5b7393 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -255,6 +255,7 @@ + 5002050 0 43100242 --=20 2.29.2 From nobody Wed May 1 03:18:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1613480262; cv=none; d=zohomail.com; s=zohoarc; b=BSjrxk3cQXFzPwMjw6wfMMYSmyJzEuDK9UoCXc1AGaE4vbXtgyIf+QTtMKVHy5xYFgGrm1p4FZmjMx4ZdwlJWZJansXppzZ41tGPqdTeBvCVGnz7rU70l3OZg2KgpDYMOz/DOBwhCIEauWGD+b+vnehVWUj7938qmk98ZX862lg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613480262; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=G+rEaEYSF/2RPGw+FdesFJEwMMiciqtTn+i7hK+92d0=; b=Nr/m4+cvh8uRzpL0S3hxHsK6YBrD80WPKfLwkh9SRIzKIvRgNHvOhfGLFoX7oNs0+BVj3wNFMvTAkXmA98gay666SxZTKg5OVPiUdAVkxm5Hgd+JM2UFDvKMqIKY5pMnF0F/x6dy4MFA//fivrSCAGpl/bMSY+zEaxS1WZUJJUs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1613480261769207.75969307558432; Tue, 16 Feb 2021 04:57:41 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-199-02b3Q02SOmak4zvHHgPuhg-1; Tue, 16 Feb 2021 07:57:38 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5F8B579EC2; Tue, 16 Feb 2021 12:57:32 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 395B86F45E; Tue, 16 Feb 2021 12:57:32 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E982557DFC; Tue, 16 Feb 2021 12:57:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11GCvE8X002235 for ; Tue, 16 Feb 2021 07:57:14 -0500 Received: by smtp.corp.redhat.com (Postfix) id C8F2C60C6D; Tue, 16 Feb 2021 12:57:14 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-215.ams2.redhat.com [10.36.112.215]) by smtp.corp.redhat.com (Postfix) with ESMTP id F02C560C15; Tue, 16 Feb 2021 12:57:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613480260; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=G+rEaEYSF/2RPGw+FdesFJEwMMiciqtTn+i7hK+92d0=; b=BxdRoAYwtOlIF1PK6PG6cwcLq68CFI3O9CjQvKjN31RDhYZ8w/OLP99gACxNwcKgTfcqop nYmovPw99LwArG/Dj46+FI1/wqHRe6DGumLwnXriYkE2O+1j48UPjKryX3iufgeIzGtv3C KkBJMGsTE2AfaZnUt3HYIZqRlnKTVk0= X-MC-Unique: 02b3Q02SOmak4zvHHgPuhg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/5] qemu: use on|off for -vnc boolean option values Date: Tue, 16 Feb 2021 12:57:02 +0000 Message-Id: <20210216125705.275788-3-berrange@redhat.com> In-Reply-To: <20210216125705.275788-1-berrange@redhat.com> References: <20210216125705.275788-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The preferred syntax for boolean options is to set the value "on" or "off". QEMU 7.1.0 will deprecate the short format we currently use. The long format has been supported with -vnc since the change to use QemuOpts in 2.2.0, so we check based on the new capability flag. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 18 ++++++++++++++---- .../graphics-vnc-tls-secret.x86_64-latest.args | 2 +- .../graphics-vnc-tls.x86_64-2.4.0.args | 2 +- .../graphics-vnc-tls.x86_64-latest.args | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a8342ff7d5..d801018aa2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7644,8 +7644,12 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigP= tr cfg, graphics->data.vnc.sharePolicy)); } =20 - if (graphics->data.vnc.auth.passwd || cfg->vncPassword) - virBufferAddLit(&opt, ",password"); + if (graphics->data.vnc.auth.passwd || cfg->vncPassword) { + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_OPTS)) + virBufferAddLit(&opt, ",password=3Don"); + else + virBufferAddLit(&opt, ",password"); + } =20 if (cfg->vncTLS) { qemuDomainGraphicsPrivatePtr gfxPriv =3D QEMU_DOMAIN_GRAPHICS_PRIV= ATE(graphics); @@ -7670,7 +7674,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigP= tr cfg, =20 virBufferAsprintf(&opt, ",tls-creds=3D%s", gfxPriv->tlsAlias); } else { - virBufferAddLit(&opt, ",tls"); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_OPTS)) + virBufferAddLit(&opt, ",tls=3Don"); + else + virBufferAddLit(&opt, ",tls"); if (cfg->vncTLSx509verify) { virBufferAddLit(&opt, ",x509verify=3D"); virQEMUBuildBufferEscapeComma(&opt, cfg->vncTLSx509certdir= ); @@ -7682,7 +7689,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigP= tr cfg, } =20 if (cfg->vncSASL) { - virBufferAddLit(&opt, ",sasl"); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_OPTS)) + virBufferAddLit(&opt, ",sasl=3Don"); + else + virBufferAddLit(&opt, ",sasl"); =20 if (cfg->vncSASLdir) virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir); diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args index 00119fcd3d..eb0df17eda 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args @@ -34,7 +34,7 @@ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8w= BYM91uEHCn6j/1,\ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ -object tls-creds-x509,id=3Dvnc-tls-creds0,dir=3D/etc/pki/libvirt-vnc,\ endpoint=3Dserver,verify-peer=3Dyes,passwordid=3Dvnc-tls-creds0-secret0 \ --vnc 127.0.0.1:3,tls-creds=3Dvnc-tls-creds0,sasl \ +-vnc 127.0.0.1:3,tls-creds=3Dvnc-tls-creds0,sasl=3Don \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args b/te= sts/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args index 471ff0dc77..78a47f1d30 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args @@ -26,6 +26,6 @@ server=3Don,wait=3Doff \ -no-acpi \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --vnc 127.0.0.1:3,tls,x509verify=3D/etc/pki/libvirt-vnc,sasl \ +-vnc 127.0.0.1:3,tls=3Don,x509verify=3D/etc/pki/libvirt-vnc,sasl=3Don \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args b/t= ests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args index b739a9b9c8..1c4b948b97 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args @@ -31,7 +31,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -object tls-creds-x509,id=3Dvnc-tls-creds0,dir=3D/etc/pki/libvirt-vnc,\ endpoint=3Dserver,verify-peer=3Dyes \ --vnc 127.0.0.1:3,tls-creds=3Dvnc-tls-creds0,sasl \ +-vnc 127.0.0.1:3,tls-creds=3Dvnc-tls-creds0,sasl=3Don \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ --=20 2.29.2 From nobody Wed May 1 03:18:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 161348025154924.743850239492076; Tue, 16 Feb 2021 04:57:31 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-272-rA38-eidPyOjeYZykZKxQA-1; Tue, 16 Feb 2021 07:57:26 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2B30A100A8E9; Tue, 16 Feb 2021 12:57:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CD7FD6F450; Tue, 16 Feb 2021 12:57:20 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7CAEF1809C8F; Tue, 16 Feb 2021 12:57:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11GCvGBA002245 for ; Tue, 16 Feb 2021 07:57:16 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6E0B460C62; Tue, 16 Feb 2021 12:57:16 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-215.ams2.redhat.com [10.36.112.215]) by smtp.corp.redhat.com (Postfix) with ESMTP id 383B360C15; Tue, 16 Feb 2021 12:57:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613480250; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=kFeIBIROjaIr91saqfcUJk3xNug3pS64VrPXqLWWVAg=; b=X2d3Js4uBzgwrVBkHmXFSQ7s5hLWTBrMKwax25LGuz/stm1sRtWmoYuEFOyMrQ78ORSzR0 I7QsPiF5AyrPKH79aZa2fh48q2tpEu8p5YhSQa7LpslG5JEgP1gGmBiLoq2tN/E2/TP+XO kbiRlYnZbAjT1OdPtVjT+LENmeoveqc= X-MC-Unique: rA38-eidPyOjeYZykZKxQA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/5] qemu: use on|off instead of yes|no for -object boolean properties Date: Tue, 16 Feb 2021 12:57:03 +0000 Message-Id: <20210216125705.275788-4-berrange@redhat.com> In-Reply-To: <20210216125705.275788-1-berrange@redhat.com> References: <20210216125705.275788-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) QEMU has long accepted many different values for boolean properties, but set accepted has been different depending on which QEMU parser you hit. The on|off values were supported by all QEMU parsers. The yes|no, y|n, true|false values were only partially supported: https://lists.gnu.org/archive/html/qemu-devel/2020-11/msg01012.html Thus we should standardize on on|off everywhere since that is most widely supported in QEMU. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Peter Krempa --- src/util/virqemu.c | 2 +- .../aarch64-gic-default-both.args | 28 ++- .../aarch64-gic-default-v2.args | 28 ++- .../aarch64-gic-default-v3.args | 28 ++- .../qemuxml2argvdata/aarch64-gic-default.args | 28 ++- .../aarch64-gic-none-both.args | 28 ++- .../qemuxml2argvdata/aarch64-gic-none-v2.args | 28 ++- .../qemuxml2argvdata/aarch64-gic-none-v3.args | 28 ++- tests/qemuxml2argvdata/aarch64-gic-none.args | 28 ++- tests/qemuxml2argvdata/cpu-check-full.args | 30 +++- tests/qemuxml2argvdata/cpu-check-partial.args | 30 +++- .../qemuxml2argvdata/cpu-numa-memshared.args | 4 +- ...sk-backing-chains-index.x86_64-2.12.0.args | 62 ++++++- ...sk-backing-chains-index.x86_64-latest.args | 169 +++++++++++++++++- ...isk-network-tlsx509-nbd.x86_64-2.12.0.args | 2 +- ...isk-network-tlsx509-nbd.x86_64-latest.args | 2 +- ...sk-network-tlsx509-vxhs.x86_64-2.12.0.args | 4 +- ...isk-network-tlsx509-vxhs.x86_64-5.0.0.args | 4 +- .../disk-network-tlsx509.x86_64-2.12.0.args | 6 +- .../disk-network-tlsx509.x86_64-latest.args | 6 +- .../disk-vhostuser.x86_64-latest.args | 4 +- .../fd-memory-numa-topology.args | 2 +- .../fd-memory-numa-topology2.args | 4 +- .../fd-memory-numa-topology3.args | 6 +- ...graphics-vnc-tls-secret.x86_64-latest.args | 2 +- .../graphics-vnc-tls.x86_64-latest.args | 2 +- .../qemuxml2argvdata/hugepages-memaccess.args | 10 +- .../hugepages-memaccess2.args | 10 +- .../hugepages-memaccess3.x86_64-latest.args | 4 +- .../hugepages-numa-nodeset-part.args | 2 +- .../hugepages-numa-nodeset.args | 8 +- .../hugepages-nvdimm.x86_64-latest.args | 6 +- tests/qemuxml2argvdata/hugepages-shared.args | 8 +- .../mach-virt-console-native.args | 29 ++- .../mach-virt-serial+console-native.args | 29 ++- .../mach-virt-serial-compat.args | 29 ++- ...memory-default-hugepage.x86_64-latest.args | 4 +- .../memfd-memory-numa.x86_64-latest.args | 4 +- .../memory-hotplug-dimm-addr.args | 2 +- .../qemuxml2argvdata/memory-hotplug-dimm.args | 2 +- ...y-hotplug-nvdimm-access.x86_64-latest.args | 4 +- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 4 +- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 4 +- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 4 +- ...emory-hotplug-nvdimm-ppc64-abi-update.args | 2 +- .../memory-hotplug-nvdimm-ppc64.args | 2 +- ...hotplug-nvdimm-readonly.x86_64-latest.args | 4 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 2 +- ...ory-hotplug-virtio-pmem.x86_64-latest.args | 2 +- .../qemuxml2argvdata/pages-dimm-discard.args | 4 +- .../pci-rom-disabled-invalid.args | 30 +++- .../pseries-console-native.args | 28 ++- .../pseries-serial+console-native.args | 28 ++- .../pseries-serial-compat.args | 28 ++- .../serial-tcp-tlsx509-chardev-verify.args | 2 +- .../serial-tcp-tlsx509-chardev.args | 2 +- .../serial-tcp-tlsx509-secret-chardev.args | 2 +- .../shmem-plain-doorbell.args | 6 +- tests/qemuxml2argvdata/user-aliases.args | 8 +- tests/qemuxml2argvdata/user-aliases2.args | 29 ++- ...vhost-user-fs-fd-memory.x86_64-latest.args | 2 +- ...vhost-user-fs-hugepages.x86_64-latest.args | 2 +- ...host-user-gpu-secondary.x86_64-latest.args | 2 +- .../vhost-user-vga.x86_64-latest.args | 2 +- 64 files changed, 810 insertions(+), 105 deletions(-) mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-default-= both.args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-default-= v2.args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-default-= v3.args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-default.= args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-none-bot= h.args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-none-v2.= args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-none-v3.= args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-none.args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/cpu-check-full.args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/cpu-check-partial.ar= gs mode change 120000 =3D> 100644 tests/qemuxml2argvdata/disk-backing-chains-= index.x86_64-2.12.0.args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/disk-backing-chains-= index.x86_64-latest.args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/mach-virt-console-na= tive.args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/mach-virt-serial+con= sole-native.args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/mach-virt-serial-com= pat.args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/pci-rom-disabled-inv= alid.args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/pseries-console-nati= ve.args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/pseries-serial+conso= le-native.args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/pseries-serial-compa= t.args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/user-aliases2.args diff --git a/src/util/virqemu.c b/src/util/virqemu.c index c4b6e8b3db..4136012c70 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -336,7 +336,7 @@ virQEMUBuildObjectCommandlineFromJSONInternal(virBuffer= Ptr buf, =20 if (props) { virBufferAddLit(buf, ","); - if (virQEMUBuildCommandLineJSON(props, buf, NULL, false, + if (virQEMUBuildCommandLineJSON(props, buf, NULL, true, virQEMUBuildCommandLineJSONArrayBitmap) < = 0) return -1; } diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-both.args b/tests/q= emuxml2argvdata/aarch64-gic-default-both.args deleted file mode 120000 index 6209eff4b0..0000000000 --- a/tests/qemuxml2argvdata/aarch64-gic-default-both.args +++ /dev/null @@ -1 +0,0 @@ -aarch64-gic-v3.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-both.args b/tests/q= emuxml2argvdata/aarch64-gic-default-both.args new file mode 100644 index 0000000000..7a3d9e33cf --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-gic-default-both.args @@ -0,0 +1,27 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-aarch64 \ +-name aarch64test \ +-S \ +-machine virt,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,gic-version=3D3 \ +-cpu host \ +-m 1024 \ +-realtime mlock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,\ +path=3D/tmp/lib/domain--1-aarch64test/monitor.sock,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args b/tests/qem= uxml2argvdata/aarch64-gic-default-v2.args deleted file mode 120000 index 04ecd4ce76..0000000000 --- a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args +++ /dev/null @@ -1 +0,0 @@ -aarch64-gic-v2.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args b/tests/qem= uxml2argvdata/aarch64-gic-default-v2.args new file mode 100644 index 0000000000..997c06fc7f --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-gic-default-v2.args @@ -0,0 +1,27 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-aarch64 \ +-name aarch64test \ +-S \ +-machine virt,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,gic-version=3D2 \ +-cpu host \ +-m 1024 \ +-realtime mlock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,\ +path=3D/tmp/lib/domain--1-aarch64test/monitor.sock,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args b/tests/qem= uxml2argvdata/aarch64-gic-default-v3.args deleted file mode 120000 index 6209eff4b0..0000000000 --- a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args +++ /dev/null @@ -1 +0,0 @@ -aarch64-gic-v3.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args b/tests/qem= uxml2argvdata/aarch64-gic-default-v3.args new file mode 100644 index 0000000000..7a3d9e33cf --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-gic-default-v3.args @@ -0,0 +1,27 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-aarch64 \ +-name aarch64test \ +-S \ +-machine virt,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,gic-version=3D3 \ +-cpu host \ +-m 1024 \ +-realtime mlock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,\ +path=3D/tmp/lib/domain--1-aarch64test/monitor.sock,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi diff --git a/tests/qemuxml2argvdata/aarch64-gic-default.args b/tests/qemuxm= l2argvdata/aarch64-gic-default.args deleted file mode 120000 index 04ecd4ce76..0000000000 --- a/tests/qemuxml2argvdata/aarch64-gic-default.args +++ /dev/null @@ -1 +0,0 @@ -aarch64-gic-v2.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/aarch64-gic-default.args b/tests/qemuxm= l2argvdata/aarch64-gic-default.args new file mode 100644 index 0000000000..997c06fc7f --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-gic-default.args @@ -0,0 +1,27 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-aarch64 \ +-name aarch64test \ +-S \ +-machine virt,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,gic-version=3D2 \ +-cpu host \ +-m 1024 \ +-realtime mlock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,\ +path=3D/tmp/lib/domain--1-aarch64test/monitor.sock,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-both.args b/tests/qemu= xml2argvdata/aarch64-gic-none-both.args deleted file mode 120000 index 6209eff4b0..0000000000 --- a/tests/qemuxml2argvdata/aarch64-gic-none-both.args +++ /dev/null @@ -1 +0,0 @@ -aarch64-gic-v3.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-both.args b/tests/qemu= xml2argvdata/aarch64-gic-none-both.args new file mode 100644 index 0000000000..7a3d9e33cf --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-gic-none-both.args @@ -0,0 +1,27 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-aarch64 \ +-name aarch64test \ +-S \ +-machine virt,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,gic-version=3D3 \ +-cpu host \ +-m 1024 \ +-realtime mlock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,\ +path=3D/tmp/lib/domain--1-aarch64test/monitor.sock,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args b/tests/qemuxm= l2argvdata/aarch64-gic-none-v2.args deleted file mode 120000 index 04ecd4ce76..0000000000 --- a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args +++ /dev/null @@ -1 +0,0 @@ -aarch64-gic-v2.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args b/tests/qemuxm= l2argvdata/aarch64-gic-none-v2.args new file mode 100644 index 0000000000..997c06fc7f --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-gic-none-v2.args @@ -0,0 +1,27 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-aarch64 \ +-name aarch64test \ +-S \ +-machine virt,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,gic-version=3D2 \ +-cpu host \ +-m 1024 \ +-realtime mlock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,\ +path=3D/tmp/lib/domain--1-aarch64test/monitor.sock,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args b/tests/qemuxm= l2argvdata/aarch64-gic-none-v3.args deleted file mode 120000 index 6209eff4b0..0000000000 --- a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args +++ /dev/null @@ -1 +0,0 @@ -aarch64-gic-v3.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args b/tests/qemuxm= l2argvdata/aarch64-gic-none-v3.args new file mode 100644 index 0000000000..7a3d9e33cf --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-gic-none-v3.args @@ -0,0 +1,27 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-aarch64 \ +-name aarch64test \ +-S \ +-machine virt,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,gic-version=3D3 \ +-cpu host \ +-m 1024 \ +-realtime mlock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,\ +path=3D/tmp/lib/domain--1-aarch64test/monitor.sock,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi diff --git a/tests/qemuxml2argvdata/aarch64-gic-none.args b/tests/qemuxml2a= rgvdata/aarch64-gic-none.args deleted file mode 120000 index 04ecd4ce76..0000000000 --- a/tests/qemuxml2argvdata/aarch64-gic-none.args +++ /dev/null @@ -1 +0,0 @@ -aarch64-gic-v2.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/aarch64-gic-none.args b/tests/qemuxml2a= rgvdata/aarch64-gic-none.args new file mode 100644 index 0000000000..997c06fc7f --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-gic-none.args @@ -0,0 +1,27 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-aarch64 \ +-name aarch64test \ +-S \ +-machine virt,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,gic-version=3D2 \ +-cpu host \ +-m 1024 \ +-realtime mlock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,\ +path=3D/tmp/lib/domain--1-aarch64test/monitor.sock,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi diff --git a/tests/qemuxml2argvdata/cpu-check-full.args b/tests/qemuxml2arg= vdata/cpu-check-full.args deleted file mode 120000 index e280ccb23d..0000000000 --- a/tests/qemuxml2argvdata/cpu-check-full.args +++ /dev/null @@ -1 +0,0 @@ -cpu-check-none.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/cpu-check-full.args b/tests/qemuxml2arg= vdata/cpu-check-full.args new file mode 100644 index 0000000000..835f8b619e --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-check-full.args @@ -0,0 +1,29 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-x86_64 \ +-name QEMUGuest1 \ +-S \ +-machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-cpu core2duo \ +-m 214 \ +-realtime mlock=3Doff \ +-smp 6,sockets=3D6,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ +server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-usb \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/cpu-check-partial.args b/tests/qemuxml2= argvdata/cpu-check-partial.args deleted file mode 120000 index e280ccb23d..0000000000 --- a/tests/qemuxml2argvdata/cpu-check-partial.args +++ /dev/null @@ -1 +0,0 @@ -cpu-check-none.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/cpu-check-partial.args b/tests/qemuxml2= argvdata/cpu-check-partial.args new file mode 100644 index 0000000000..835f8b619e --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-check-partial.args @@ -0,0 +1,29 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-x86_64 \ +-name QEMUGuest1 \ +-S \ +-machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-cpu core2duo \ +-m 214 \ +-realtime mlock=3Doff \ +-smp 6,sockets=3D6,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ +server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-usb \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args b/tests/qemuxml= 2argvdata/cpu-numa-memshared.args index fa029c9314..a0016ac0bd 100644 --- a/tests/qemuxml2argvdata/cpu-numa-memshared.args +++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args @@ -15,11 +15,11 @@ QEMU_AUDIO_DRV=3Dnone \ -realtime mlock=3Doff \ -smp 16,sockets=3D2,cores=3D4,threads=3D2 \ -object memory-backend-file,id=3Dram-node0,\ -mem-path=3D/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0,share=3Dyes,\ +mem-path=3D/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0,share=3Don,\ size=3D112197632 \ -numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ -object memory-backend-file,id=3Dram-node1,\ -mem-path=3D/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node1,share=3Dno,\ +mem-path=3D/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node1,share=3Doff,\ size=3D112197632 \ -numa node,nodeid=3D1,cpus=3D8-15,memdev=3Dram-node1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0= .args b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args deleted file mode 120000 index 3f4cd9040d..0000000000 --- a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args +++ /dev/null @@ -1 +0,0 @@ -disk-backing-chains-noindex.x86_64-2.12.0.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0= .args b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args new file mode 100644 index 0000000000..0919eedd21 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args @@ -0,0 +1,61 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-2.12,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m 214 \ +-realtime mlock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-drive 'file=3Dgluster+unix:///Volume2/Image?socket=3D/path/to/sock,file.d= ebug=3D4,\ +format=3Dqcow2,if=3Dnone,id=3Ddrive-virtio-disk0' \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Ddrive-vir= tio-disk0,\ +id=3Dvirtio-disk0,bootindex=3D1 \ +-drive file=3Dnbd:unix:/var/run/nbdsock:exportname=3Dbar,format=3Dqcow2,if= =3Dnone,\ +id=3Ddrive-virtio-disk1 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-vir= tio-disk1,\ +id=3Dvirtio-disk1 \ +-drive file=3Dgluster://example.org:6000/Volume1/Image,file.debug=3D4,form= at=3Draw,\ +if=3Dnone,id=3Ddrive-virtio-disk2 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-vir= tio-disk2,\ +id=3Dvirtio-disk2 \ +-object secret,id=3Dvirtio-disk3-auth-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-drive 'file=3Drbd:pool/image:id=3Dmyname:auth_supported=3Dcephx\;none:\ +mon_host=3Dmon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.or= g\:\ +6322,file.password-secret=3Dvirtio-disk3-auth-secret0,format=3Dqcow2,if=3D= none,\ +id=3Ddrive-virtio-disk3' \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-vir= tio-disk3,\ +id=3Dvirtio-disk3 \ +-drive file=3D/dev/HostVG/QEMUGuest11,format=3Dqcow2,if=3Dnone,id=3Ddrive-= virtio-disk4 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x6,drive=3Ddrive-vir= tio-disk4,\ +id=3Dvirtio-disk4 \ +-drive file=3D/var/lib/libvirt/images/rhel7.1484071880,format=3Dqcow2,if= =3Dnone,\ +id=3Ddrive-virtio-disk5 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x7,drive=3Ddrive-vir= tio-disk5,\ +id=3Dvirtio-disk5 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x8 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest= .args b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args deleted file mode 120000 index 549eb65512..0000000000 --- a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args +++ /dev/null @@ -1 +0,0 @@ -disk-backing-chains-noindex.x86_64-latest.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest= .args b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args new file mode 100644 index 0000000000..927b338380 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args @@ -0,0 +1,168 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-cpu qemu64 \ +-m 214 \ +-object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-blockdev '{"driver":"file","filename":"/tmp/missing-backing-store.qcow",\ +"node-name":"libvirt-25-storage","auto-read-only":true,"discard":"unmap"}'= \ +-blockdev '{"node-name":"libvirt-25-format","read-only":true,"driver":"qco= w2",\ +"file":"libvirt-25-storage"}' \ +-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 virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-24-format,\ +id=3Dvirtio-disk0,bootindex=3D1 \ +-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/image5.qcow",\ +"node-name":"libvirt-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 '{"driver":"file","filename":"/tmp/image4.qcow",\ +"node-name":"libvirt-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":"libvirt-20-storage","auto-read-only":true,"discard":"unmap"}'= \ +-blockdev '{"node-name":"libvirt-20-format","read-only":true,"driver":"qco= w2",\ +"file":"libvirt-20-storage","backing":"libvirt-21-format"}' \ +-blockdev '{"driver":"file","filename":"/tmp/image2",\ +"node-name":"libvirt-19-storage","auto-read-only":true,"discard":"unmap"}'= \ +-blockdev '{"node-name":"libvirt-19-format","read-only":true,"driver":"vmd= k",\ +"file":"libvirt-19-storage","backing":"libvirt-20-format"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ +"node-name":"libvirt-18-storage","auto-read-only":true,"discard":"unmap"}'= \ +-blockdev '{"node-name":"libvirt-18-format","read-only":true,"driver":"qco= w2",\ +"file":"libvirt-18-storage","backing":"libvirt-19-format"}' \ +-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 virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-17-format,\ +id=3Dvirtio-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 virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-16-format,\ +id=3Dvirtio-disk2 \ +-blockdev '{"driver":"file","filename":"/tmp/image.qcow",\ +"node-name":"libvirt-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 secret,id=3Dlibvirt-14-storage-auth-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-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-required":["cephx","none"],\ +"key-secret":"libvirt-14-storage-auth-secret0",\ +"node-name":"libvirt-14-storage","auto-read-only":true,"discard":"unmap"}'= \ +-blockdev '{"node-name":"libvirt-14-format","read-only":false,"driver":"qc= ow2",\ +"file":"libvirt-14-storage","backing":"libvirt-15-format"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-14-format,\ +id=3Dvirtio-disk3 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest11",\ +"node-name":"libvirt-13-storage","auto-read-only":true,"discard":"unmap"}'= \ +-blockdev '{"node-name":"libvirt-13-format","read-only":false,"driver":"qc= ow2",\ +"file":"libvirt-13-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-13-format,\ +id=3Dvirtio-disk4 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/rhel7.qcow= 2",\ +"node-name":"libvirt-12-storage","auto-read-only":true,"discard":"unmap"}'= \ +-blockdev '{"node-name":"libvirt-12-format","read-only":true,"driver":"qco= w2",\ +"file":"libvirt-12-storage","backing":null}' \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/rhel7.1483536402",\ +"node-name":"libvirt-11-storage","auto-read-only":true,"discard":"unmap"}'= \ +-blockdev '{"node-name":"libvirt-11-format","read-only":true,"driver":"qco= w2",\ +"file":"libvirt-11-storage","backing":"libvirt-12-format"}' \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/rhel7.1483545313",\ +"node-name":"libvirt-10-storage","auto-read-only":true,"discard":"unmap"}'= \ +-blockdev '{"node-name":"libvirt-10-format","read-only":true,"driver":"qco= w2",\ +"file":"libvirt-10-storage","backing":"libvirt-11-format"}' \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/rhel7.1483545901",\ +"node-name":"libvirt-9-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-9-format","read-only":true,"driver":"qcow= 2",\ +"file":"libvirt-9-storage","backing":"libvirt-10-format"}' \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/rhel7.1483546244",\ +"node-name":"libvirt-8-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-8-format","read-only":true,"driver":"qcow= 2",\ +"file":"libvirt-8-storage","backing":"libvirt-9-format"}' \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/rhel7.1483605920",\ +"node-name":"libvirt-7-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-7-format","read-only":true,"driver":"qcow= 2",\ +"file":"libvirt-7-storage","backing":"libvirt-8-format"}' \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/rhel7.1483605924",\ +"node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-6-format","read-only":true,"driver":"qcow= 2",\ +"file":"libvirt-6-storage","backing":"libvirt-7-format"}' \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/rhel7.1483615252",\ +"node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-5-format","read-only":true,"driver":"qcow= 2",\ +"file":"libvirt-5-storage","backing":"libvirt-6-format"}' \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/rhel7.1484071872",\ +"node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-4-format","read-only":true,"driver":"qcow= 2",\ +"file":"libvirt-4-storage","backing":"libvirt-5-format"}' \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/rhel7.1484071876",\ +"node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"qcow= 2",\ +"file":"libvirt-3-storage","backing":"libvirt-4-format"}' \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/rhel7.1484071877",\ +"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":"libvirt-3-format"}' \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/rhel7.1484071880",\ +"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","backing":"libvirt-2-format"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1-format,\ +id=3Dvirtio-disk5 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x8 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.= args b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.args index a97c7398ce..e9cb35f64a 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.args @@ -32,7 +32,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ -object tls-creds-x509,id=3Dobjvirtio-disk3_tls0,dir=3D/etc/pki/libvirt-nb= d/dummy,,\ -path,endpoint=3Dclient,verify-peer=3Dyes,passwordid=3Dobjvirtio-disk3_tls0= -secret0 \ +path,endpoint=3Dclient,verify-peer=3Don,passwordid=3Dobjvirtio-disk3_tls0-= secret0 \ -drive file.driver=3Dnbd,file.server.type=3Dinet,file.server.host=3Dexampl= e.com,\ file.server.port=3D1234,file.tls-creds=3Dobjvirtio-disk3_tls0,format=3Draw= ,if=3Dnone,\ id=3Ddrive-virtio-disk3,cache=3Dnone \ 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 24cebfe6a4..008bb1093d 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args @@ -33,7 +33,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ -object tls-creds-x509,id=3Dobjlibvirt-1-storage_tls0,\ -dir=3D/etc/pki/libvirt-nbd/dummy,,path,endpoint=3Dclient,verify-peer=3Dyes= ,\ +dir=3D/etc/pki/libvirt-nbd/dummy,,path,endpoint=3Dclient,verify-peer=3Don,\ passwordid=3Dobjlibvirt-1-storage_tls0-secret0 \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.com",\ "port":"1234"},"tls-creds":"objlibvirt-1-storage_tls0",\ diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0= .args b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0.args index e703875e35..47000d2d4b 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0.args @@ -32,7 +32,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ -object tls-creds-x509,id=3Dobjvirtio-disk0_tls0,dir=3D/etc/pki/libvirt-vx= hs/dummy,\ -,path,endpoint=3Dclient,verify-peer=3Dyes,passwordid=3Dobjvirtio-disk0_tls= 0-secret0 \ +,path,endpoint=3Dclient,verify-peer=3Don,passwordid=3Dobjvirtio-disk0_tls0= -secret0 \ -drive file.driver=3Dvxhs,file.tls-creds=3Dobjvirtio-disk0_tls0,\ file.vdisk-id=3Deb90327c-8302-4725-9e1b-4e85ed4dc251,\ file.server.host=3D192.168.0.1,file.server.port=3D9999,format=3Draw,if=3Dn= one,\ @@ -44,7 +44,7 @@ serial=3Deb90327c-8302-4725-9e1b-4e85ed4dc251 \ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ -object tls-creds-x509,id=3Dobjvirtio-disk1_tls0,dir=3D/etc/pki/libvirt-vx= hs/dummy,\ -,path,endpoint=3Dclient,verify-peer=3Dyes,passwordid=3Dobjvirtio-disk1_tls= 0-secret0 \ +,path,endpoint=3Dclient,verify-peer=3Don,passwordid=3Dobjvirtio-disk1_tls0= -secret0 \ -drive file.driver=3Dvxhs,file.tls-creds=3Dobjvirtio-disk1_tls0,\ file.vdisk-id=3Deb90327c-8302-4725-9e1b-4e85ed4dc252,\ file.server.host=3D192.168.0.2,file.server.port=3D9999,format=3Draw,if=3Dn= one,\ diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.= args b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args index 7096aa935f..ec215c6904 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args @@ -32,7 +32,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ -object tls-creds-x509,id=3Dobjlibvirt-3-storage_tls0,\ -dir=3D/etc/pki/libvirt-vxhs/dummy,,path,endpoint=3Dclient,verify-peer=3Dye= s,\ +dir=3D/etc/pki/libvirt-vxhs/dummy,,path,endpoint=3Dclient,verify-peer=3Don= ,\ passwordid=3Dobjlibvirt-3-storage_tls0-secret0 \ -blockdev '{"driver":"vxhs","tls-creds":"objlibvirt-3-storage_tls0",\ "vdisk-id":"eb90327c-8302-4725-9e1b-4e85ed4dc251",\ @@ -49,7 +49,7 @@ serial=3Deb90327c-8302-4725-9e1b-4e85ed4dc251 \ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ -object tls-creds-x509,id=3Dobjlibvirt-2-storage_tls0,\ -dir=3D/etc/pki/libvirt-vxhs/dummy,,path,endpoint=3Dclient,verify-peer=3Dye= s,\ +dir=3D/etc/pki/libvirt-vxhs/dummy,,path,endpoint=3Dclient,verify-peer=3Don= ,\ passwordid=3Dobjlibvirt-2-storage_tls0-secret0 \ -blockdev '{"driver":"vxhs","tls-creds":"objlibvirt-2-storage_tls0",\ "vdisk-id":"eb90327c-8302-4725-9e1b-4e85ed4dc252",\ diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args= b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args index a31efccd00..259f9ba575 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args @@ -32,7 +32,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ -object tls-creds-x509,id=3Dobjvirtio-disk0_tls0,dir=3D/etc/pki/libvirt-vx= hs/dummy,\ -,path,endpoint=3Dclient,verify-peer=3Dyes,passwordid=3Dobjvirtio-disk0_tls= 0-secret0 \ +,path,endpoint=3Dclient,verify-peer=3Don,passwordid=3Dobjvirtio-disk0_tls0= -secret0 \ -drive file.driver=3Dvxhs,file.tls-creds=3Dobjvirtio-disk0_tls0,\ file.vdisk-id=3Deb90327c-8302-4725-9e1b-4e85ed4dc251,\ file.server.host=3D192.168.0.1,file.server.port=3D9999,format=3Draw,if=3Dn= one,\ @@ -44,7 +44,7 @@ serial=3Deb90327c-8302-4725-9e1b-4e85ed4dc251 \ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ -object tls-creds-x509,id=3Dobjvirtio-disk1_tls0,dir=3D/etc/pki/libvirt-vx= hs/dummy,\ -,path,endpoint=3Dclient,verify-peer=3Dyes,passwordid=3Dobjvirtio-disk1_tls= 0-secret0 \ +,path,endpoint=3Dclient,verify-peer=3Don,passwordid=3Dobjvirtio-disk1_tls0= -secret0 \ -drive file.driver=3Dvxhs,file.tls-creds=3Dobjvirtio-disk1_tls0,\ file.vdisk-id=3Deb90327c-8302-4725-9e1b-4e85ed4dc252,\ file.server.host=3D192.168.0.2,file.server.port=3D9999,format=3Draw,if=3Dn= one,\ @@ -60,7 +60,7 @@ id=3Dvirtio-disk2,write-cache=3Don,serial=3Deb90327c-8302= -4725-9e1b-4e85ed4dc252 \ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ -object tls-creds-x509,id=3Dobjvirtio-disk3_tls0,dir=3D/etc/pki/libvirt-nb= d/dummy,,\ -path,endpoint=3Dclient,verify-peer=3Dyes,passwordid=3Dobjvirtio-disk3_tls0= -secret0 \ +path,endpoint=3Dclient,verify-peer=3Don,passwordid=3Dobjvirtio-disk3_tls0-= secret0 \ -drive file.driver=3Dnbd,file.server.type=3Dinet,file.server.host=3Dexampl= e.com,\ file.server.port=3D1234,file.tls-creds=3Dobjvirtio-disk3_tls0,format=3Draw= ,if=3Dnone,\ id=3Ddrive-virtio-disk3,cache=3Dnone \ diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args index 6dc82878e8..4ac7e270d4 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args @@ -32,7 +32,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ -object tls-creds-x509,id=3Dobjlibvirt-4-storage_tls0,\ -dir=3D/etc/pki/libvirt-vxhs/dummy,,path,endpoint=3Dclient,verify-peer=3Dye= s,\ +dir=3D/etc/pki/libvirt-vxhs/dummy,,path,endpoint=3Dclient,verify-peer=3Don= ,\ passwordid=3Dobjlibvirt-4-storage_tls0-secret0 \ -blockdev '{"driver":"vxhs","tls-creds":"objlibvirt-4-storage_tls0",\ "vdisk-id":"eb90327c-8302-4725-9e1b-4e85ed4dc251",\ @@ -49,7 +49,7 @@ serial=3Deb90327c-8302-4725-9e1b-4e85ed4dc251 \ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ -object tls-creds-x509,id=3Dobjlibvirt-3-storage_tls0,\ -dir=3D/etc/pki/libvirt-vxhs/dummy,,path,endpoint=3Dclient,verify-peer=3Dye= s,\ +dir=3D/etc/pki/libvirt-vxhs/dummy,,path,endpoint=3Dclient,verify-peer=3Don= ,\ passwordid=3Dobjlibvirt-3-storage_tls0-secret0 \ -blockdev '{"driver":"vxhs","tls-creds":"objlibvirt-3-storage_tls0",\ "vdisk-id":"eb90327c-8302-4725-9e1b-4e85ed4dc252",\ @@ -74,7 +74,7 @@ id=3Dvirtio-disk2,write-cache=3Don,serial=3Deb90327c-8302= -4725-9e1b-4e85ed4dc252 \ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ -object tls-creds-x509,id=3Dobjlibvirt-1-storage_tls0,\ -dir=3D/etc/pki/libvirt-nbd/dummy,,path,endpoint=3Dclient,verify-peer=3Dyes= ,\ +dir=3D/etc/pki/libvirt-nbd/dummy,,path,endpoint=3Dclient,verify-peer=3Don,\ passwordid=3Dobjlibvirt-1-storage_tls0-secret0 \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.com",\ "port":"1234"},"tls-creds":"objlibvirt-1-storage_tls0",\ diff --git a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args index 6432632d03..7918e38bc3 100644 --- a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args @@ -15,8 +15,8 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-memfd,id=3Dpc.ram,share=3Dyes,\ -x-use-canonical-path-for-ramblock-id=3Dno,size=3D224395264 \ +-object memory-backend-memfd,id=3Dpc.ram,share=3Don,\ +x-use-canonical-path-for-ramblock-id=3Doff,size=3D224395264 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.args b/tests/qe= muxml2argvdata/fd-memory-numa-topology.args index c9699d75c4..5bc00e36ff 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=3Dnone \ -realtime mlock=3Doff \ -smp 8,sockets=3D1,cores=3D8,threads=3D1 \ -object memory-backend-file,id=3Dram-node0,\ -mem-path=3D/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share= =3Dyes,\ +mem-path=3D/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share= =3Don,\ size=3D15032385536 \ -numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args b/tests/q= emuxml2argvdata/fd-memory-numa-topology2.args index 2ec070c5a5..7b77e3d528 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args @@ -16,11 +16,11 @@ QEMU_AUDIO_DRV=3Dnone \ -realtime mlock=3Doff \ -smp 20,sockets=3D1,cores=3D8,threads=3D1 \ -object memory-backend-file,id=3Dram-node0,\ -mem-path=3D/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share= =3Dno,\ +mem-path=3D/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share= =3Doff,\ size=3D15032385536 \ -numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ -object memory-backend-file,id=3Dram-node1,\ -mem-path=3D/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1,share= =3Dyes,\ +mem-path=3D/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1,share= =3Don,\ size=3D15032385536 \ -numa node,nodeid=3D1,cpus=3D8-15,memdev=3Dram-node1 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args b/tests/q= emuxml2argvdata/fd-memory-numa-topology3.args index a62dcbcc60..0ee7b2e33a 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args @@ -16,15 +16,15 @@ QEMU_AUDIO_DRV=3Dnone \ -realtime mlock=3Doff \ -smp 32,sockets=3D1,cores=3D24,threads=3D1 \ -object memory-backend-file,id=3Dram-node0,\ -mem-path=3D/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share= =3Dyes,\ +mem-path=3D/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share= =3Don,\ size=3D15032385536 \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -object memory-backend-file,id=3Dram-node1,\ -mem-path=3D/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1,share= =3Dyes,\ +mem-path=3D/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1,share= =3Don,\ size=3D15032385536 \ -numa node,nodeid=3D1,cpus=3D2-3,memdev=3Dram-node1 \ -object memory-backend-file,id=3Dram-node2,\ -mem-path=3D/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node2,share= =3Dno,\ +mem-path=3D/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node2,share= =3Doff,\ size=3D15032385536 \ -numa node,nodeid=3D2,cpus=3D4-5,memdev=3Dram-node2 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args index eb0df17eda..c16e3e3ef4 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args @@ -33,7 +33,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ -object tls-creds-x509,id=3Dvnc-tls-creds0,dir=3D/etc/pki/libvirt-vnc,\ -endpoint=3Dserver,verify-peer=3Dyes,passwordid=3Dvnc-tls-creds0-secret0 \ +endpoint=3Dserver,verify-peer=3Don,passwordid=3Dvnc-tls-creds0-secret0 \ -vnc 127.0.0.1:3,tls-creds=3Dvnc-tls-creds0,sasl=3Don \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args b/t= ests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args index 1c4b948b97..31112ce85d 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args @@ -30,7 +30,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -object tls-creds-x509,id=3Dvnc-tls-creds0,dir=3D/etc/pki/libvirt-vnc,\ -endpoint=3Dserver,verify-peer=3Dyes \ +endpoint=3Dserver,verify-peer=3Don \ -vnc 127.0.0.1:3,tls-creds=3Dvnc-tls-creds0,sasl=3Don \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.args b/tests/qemuxm= l2argvdata/hugepages-memaccess.args index 3b062640e6..76ccf6b026 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess.args @@ -15,23 +15,23 @@ QEMU_AUDIO_DRV=3Dnone \ -realtime mlock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -object memory-backend-file,id=3Dram-node0,\ -mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=3Dno,prealloc= =3Dyes,\ +mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=3Doff,preallo= c=3Don,\ size=3D1073741824,host-nodes=3D0-3,policy=3Dbind \ -numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ -object memory-backend-file,id=3Dram-node1,\ -mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=3Dyes,preallo= c=3Dyes,\ +mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=3Don,prealloc= =3Don,\ size=3D1073741824,host-nodes=3D0-3,policy=3Dbind \ -numa node,nodeid=3D1,cpus=3D1,memdev=3Dram-node1 \ -object memory-backend-file,id=3Dram-node2,\ -mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=3Dno,prealloc= =3Dyes,\ +mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=3Doff,preallo= c=3Don,\ size=3D1073741824,host-nodes=3D0-3,policy=3Dbind \ -numa node,nodeid=3D2,cpus=3D2,memdev=3Dram-node2 \ -object memory-backend-file,id=3Dram-node3,\ -mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=3Dno,prealloc= =3Dyes,\ +mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=3Doff,preallo= c=3Don,\ size=3D1073741824,host-nodes=3D3,policy=3Dbind \ -numa node,nodeid=3D3,cpus=3D3,memdev=3Dram-node3 \ -object memory-backend-file,id=3Dmemdimm0,\ -mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=3Dyes,preallo= c=3Dyes,\ +mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=3Don,prealloc= =3Don,\ size=3D536870912,host-nodes=3D0-3,policy=3Dbind \ -device pc-dimm,node=3D1,memdev=3Dmemdimm0,id=3Ddimm0,slot=3D0,addr=3D4294= 967296 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args b/tests/qemux= ml2argvdata/hugepages-memaccess2.args index 6f71c26f6c..9622b2dbc5 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess2.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess2.args @@ -15,23 +15,23 @@ QEMU_AUDIO_DRV=3Dnone \ -realtime mlock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -object memory-backend-file,id=3Dram-node0,\ -mem-path=3D/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0,share=3Dno,\ +mem-path=3D/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0,share=3Doff,\ size=3D1073741824,host-nodes=3D0-3,policy=3Dbind \ -numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ -object memory-backend-file,id=3Dram-node1,\ -mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=3Dyes,preallo= c=3Dyes,\ +mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=3Don,prealloc= =3Don,\ size=3D1073741824,host-nodes=3D0-3,policy=3Dbind \ -numa node,nodeid=3D1,cpus=3D1,memdev=3Dram-node1 \ -object memory-backend-file,id=3Dram-node2,\ -mem-path=3D/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node2,share=3Dno,\ +mem-path=3D/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node2,share=3Doff,\ size=3D1073741824,host-nodes=3D0-3,policy=3Dbind \ -numa node,nodeid=3D2,cpus=3D2,memdev=3Dram-node2 \ -object memory-backend-file,id=3Dram-node3,\ -mem-path=3D/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node3,share=3Dno,\ +mem-path=3D/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node3,share=3Doff,\ size=3D1073741824,host-nodes=3D3,policy=3Dbind \ -numa node,nodeid=3D3,cpus=3D3,memdev=3Dram-node3 \ -object memory-backend-file,id=3Dmemdimm0,\ -mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=3Dyes,preallo= c=3Dyes,\ +mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=3Don,prealloc= =3Don,\ size=3D536870912,host-nodes=3D0-3,policy=3Dbind \ -device pc-dimm,node=3D1,memdev=3Dmemdimm0,id=3Ddimm0,slot=3D0,addr=3D4294= 967296 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args= b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args index d78b2185a8..1372612e27 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args @@ -19,8 +19,8 @@ arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy= =3Don,amd-ssbd=3Don,virt-ssbd=3Don,\ rdctl-no=3Don,skip-l1dfl-vmentry=3Don,mds-no=3Don,pschange-mc-no=3Don \ -m 4096 \ -object memory-backend-file,id=3Dpc.ram,\ -mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-fedora,share=3Dyes,\ -x-use-canonical-path-for-ramblock-id=3Dno,prealloc=3Dyes,size=3D4294967296= \ +mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-fedora,share=3Don,\ +x-use-canonical-path-for-ramblock-id=3Doff,prealloc=3Don,size=3D4294967296= \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args b/test= s/qemuxml2argvdata/hugepages-numa-nodeset-part.args index 916d6361a0..1c7a8cc803 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args +++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=3Dnone \ -object memory-backend-ram,id=3Dram-node0,size=3D268435456 \ -numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ -object memory-backend-file,id=3Dram-node1,\ -mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-SomeDummyHugepagesGu,prealloc= =3Dyes,\ +mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-SomeDummyHugepagesGu,prealloc= =3Don,\ size=3D805306368 \ -numa node,nodeid=3D1,cpus=3D1,memdev=3Dram-node1 \ -uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \ diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args b/tests/qem= uxml2argvdata/hugepages-numa-nodeset.args index b20469828d..6c8fd30c4c 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args +++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args @@ -15,19 +15,19 @@ QEMU_AUDIO_DRV=3Dnone \ -realtime mlock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -object memory-backend-file,id=3Dram-node0,\ -mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=3Dyes,\ +mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=3Don,\ size=3D1073741824 \ -numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ -object memory-backend-file,id=3Dram-node1,\ -mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=3Dyes,\ +mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=3Don,\ size=3D1073741824 \ -numa node,nodeid=3D1,cpus=3D1,memdev=3Dram-node1 \ -object memory-backend-file,id=3Dram-node2,\ -mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=3Dyes,\ +mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=3Don,\ size=3D1073741824 \ -numa node,nodeid=3D2,cpus=3D2,memdev=3Dram-node2 \ -object memory-backend-file,id=3Dram-node3,\ -mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=3Dyes,\ +mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=3Don,\ size=3D1073741824 \ -numa node,nodeid=3D3,cpus=3D3,memdev=3Dram-node3 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/t= ests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args index a7d1ed9d4e..0b0a99cfd7 100644 --- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args @@ -18,11 +18,11 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -object memory-backend-file,id=3Dram-node0,\ -mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=3Dyes,preallo= c=3Dyes,\ +mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=3Don,prealloc= =3Don,\ size=3D1073741824 \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ --object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,share= =3Dyes,\ -prealloc=3Dyes,size=3D536870912 \ +-object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,share= =3Don,\ +prealloc=3Don,size=3D536870912 \ -device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/hugepages-shared.args b/tests/qemuxml2a= rgvdata/hugepages-shared.args index 3cffa37dad..b5dcde82e3 100644 --- a/tests/qemuxml2argvdata/hugepages-shared.args +++ b/tests/qemuxml2argvdata/hugepages-shared.args @@ -15,19 +15,19 @@ QEMU_AUDIO_DRV=3Dnone \ -realtime mlock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -object memory-backend-file,id=3Dram-node0,\ -mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=3Dyes,\ +mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=3Don,\ size=3D1073741824,host-nodes=3D0-3,policy=3Dbind \ -numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ -object memory-backend-file,id=3Dram-node1,\ -mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=3Dyes,preallo= c=3Dyes,\ +mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=3Don,prealloc= =3Don,\ size=3D1073741824,host-nodes=3D0-3,policy=3Dbind \ -numa node,nodeid=3D1,cpus=3D1,memdev=3Dram-node1 \ -object memory-backend-file,id=3Dram-node2,\ -mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=3Dno,prealloc= =3Dyes,\ +mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=3Doff,preallo= c=3Don,\ size=3D1073741824,host-nodes=3D0-3,policy=3Dbind \ -numa node,nodeid=3D2,cpus=3D2,memdev=3Dram-node2 \ -object memory-backend-file,id=3Dram-node3,\ -mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=3Dyes,\ +mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=3Don,\ size=3D1073741824,host-nodes=3D3,policy=3Dbind \ -numa node,nodeid=3D3,cpus=3D3,memdev=3Dram-node3 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/mach-virt-console-native.args b/tests/q= emuxml2argvdata/mach-virt-console-native.args deleted file mode 120000 index c7abf01bd6..0000000000 --- a/tests/qemuxml2argvdata/mach-virt-console-native.args +++ /dev/null @@ -1 +0,0 @@ -mach-virt-serial-native.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/mach-virt-console-native.args b/tests/q= emuxml2argvdata/mach-virt-console-native.args new file mode 100644 index 0000000000..89b82ab32d --- /dev/null +++ b/tests/qemuxml2argvdata/mach-virt-console-native.args @@ -0,0 +1,28 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-aarch64 \ +-name guest \ +-S \ +-machine virt,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m 512 \ +-realtime mlock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-guest/monitor.s= ock,\ +server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-chardev pty,id=3Dcharserial0 \ +-serial chardev:charserial0 diff --git a/tests/qemuxml2argvdata/mach-virt-serial+console-native.args b/= tests/qemuxml2argvdata/mach-virt-serial+console-native.args deleted file mode 120000 index c7abf01bd6..0000000000 --- a/tests/qemuxml2argvdata/mach-virt-serial+console-native.args +++ /dev/null @@ -1 +0,0 @@ -mach-virt-serial-native.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/mach-virt-serial+console-native.args b/= tests/qemuxml2argvdata/mach-virt-serial+console-native.args new file mode 100644 index 0000000000..89b82ab32d --- /dev/null +++ b/tests/qemuxml2argvdata/mach-virt-serial+console-native.args @@ -0,0 +1,28 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-aarch64 \ +-name guest \ +-S \ +-machine virt,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m 512 \ +-realtime mlock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-guest/monitor.s= ock,\ +server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-chardev pty,id=3Dcharserial0 \ +-serial chardev:charserial0 diff --git a/tests/qemuxml2argvdata/mach-virt-serial-compat.args b/tests/qe= muxml2argvdata/mach-virt-serial-compat.args deleted file mode 120000 index c7abf01bd6..0000000000 --- a/tests/qemuxml2argvdata/mach-virt-serial-compat.args +++ /dev/null @@ -1 +0,0 @@ -mach-virt-serial-native.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/mach-virt-serial-compat.args b/tests/qe= muxml2argvdata/mach-virt-serial-compat.args new file mode 100644 index 0000000000..89b82ab32d --- /dev/null +++ b/tests/qemuxml2argvdata/mach-virt-serial-compat.args @@ -0,0 +1,28 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-aarch64 \ +-name guest \ +-S \ +-machine virt,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m 512 \ +-realtime mlock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-guest/monitor.s= ock,\ +server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-chardev pty,id=3Dcharserial0 \ +-serial chardev:charserial0 diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-la= test.args b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-lat= est.args index 6a57f31d79..77a5ac0788 100644 --- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.ar= gs @@ -17,8 +17,8 @@ file=3D/tmp/lib/domain--1-instance-00000092/master-key.ae= s \ -m 14336 \ -overcommit mem-lock=3Doff \ -smp 8,sockets=3D1,dies=3D1,cores=3D8,threads=3D1 \ --object memory-backend-memfd,id=3Dram-node0,hugetlb=3Dyes,hugetlbsize=3D20= 97152,\ -share=3Dyes,prealloc=3Dyes,size=3D15032385536,host-nodes=3D3,policy=3Dpref= erred \ +-object memory-backend-memfd,id=3Dram-node0,hugetlb=3Don,hugetlbsize=3D209= 7152,\ +share=3Don,prealloc=3Don,size=3D15032385536,host-nodes=3D3,policy=3Dprefer= red \ -numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ -display none \ diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/= tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args index 6a57f31d79..77a5ac0788 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args @@ -17,8 +17,8 @@ file=3D/tmp/lib/domain--1-instance-00000092/master-key.ae= s \ -m 14336 \ -overcommit mem-lock=3Doff \ -smp 8,sockets=3D1,dies=3D1,cores=3D8,threads=3D1 \ --object memory-backend-memfd,id=3Dram-node0,hugetlb=3Dyes,hugetlbsize=3D20= 97152,\ -share=3Dyes,prealloc=3Dyes,size=3D15032385536,host-nodes=3D3,policy=3Dpref= erred \ +-object memory-backend-memfd,id=3Dram-node0,hugetlb=3Don,hugetlbsize=3D209= 7152,\ +share=3Don,prealloc=3Don,size=3D15032385536,host-nodes=3D3,policy=3Dprefer= red \ -numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ -display none \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args b/tests/q= emuxml2argvdata/memory-hotplug-dimm-addr.args index f52518a4f0..09bb346a38 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=3Dnone \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -numa node,nodeid=3D0,cpus=3D0-1,mem=3D214 \ -object memory-backend-file,id=3Dmemdimm0,\ -mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=3Dyes,\ +mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=3Don,\ size=3D536870912,host-nodes=3D1-3,policy=3Dbind \ -device pc-dimm,node=3D0,memdev=3Dmemdimm0,id=3Ddimm0,slot=3D0,addr=3D4294= 967296 \ -object memory-backend-ram,id=3Dmemdimm2,size=3D536870912 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxm= l2argvdata/memory-hotplug-dimm.args index ccd80845d8..aa17026079 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=3Dnone \ -object memory-backend-ram,id=3Dmemdimm0,size=3D536870912 \ -device pc-dimm,node=3D0,memdev=3Dmemdimm0,id=3Ddimm0,slot=3D0 \ -object memory-backend-file,id=3Dmemdimm1,\ -mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=3Dyes,\ +mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=3Don,\ size=3D536870912,host-nodes=3D1-3,policy=3Dbind \ -device pc-dimm,node=3D0,memdev=3Dmemdimm1,id=3Ddimm1,slot=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ 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 63fec07e9d..b4be9f77e5 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args @@ -19,8 +19,8 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -object memory-backend-ram,id=3Dram-node0,size=3D224395264 \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ --object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,share= =3Dno,\ -prealloc=3Dyes,size=3D536870912 \ +-object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,share= =3Doff,\ +prealloc=3Don,size=3D536870912 \ -device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ 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 f088f65735..1094d2ffec 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args @@ -19,8 +19,8 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -object memory-backend-ram,id=3Dram-node0,size=3D224395264 \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ --object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,share= =3Dno,\ -prealloc=3Dyes,size=3D536870912,align=3D2097152 \ +-object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,share= =3Doff,\ +prealloc=3Don,size=3D536870912,align=3D2097152 \ -device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ 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 6309953812..35cbd0e4dc 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args @@ -19,8 +19,8 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -object memory-backend-ram,id=3Dram-node0,size=3D224395264 \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ --object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,share= =3Dno,\ -prealloc=3Dyes,size=3D536870912 \ +-object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,share= =3Doff,\ +prealloc=3Don,size=3D536870912 \ -device nvdimm,node=3D0,label-size=3D131072,memdev=3Dmemnvdimm0,id=3Dnvdim= m0,slot=3D0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ 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 35895914b2..c1b38fc466 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args @@ -19,8 +19,8 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -object memory-backend-ram,id=3Dram-node0,size=3D224395264 \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ --object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,share= =3Dno,\ -size=3D536870912,pmem=3Dyes \ +-object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,share= =3Doff,\ +size=3D536870912,pmem=3Don \ -device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.= args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args index e059194fac..1df12e21d6 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=3Dnone \ -realtime mlock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -numa node,nodeid=3D0,cpus=3D0-1,mem=3D1024 \ --object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,preallo= c=3Dyes,\ +-object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,preallo= c=3Don,\ size=3D537001984 \ -device nvdimm,node=3D0,label-size=3D131072,\ uuid=3D49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=3Dmemnvdimm0,id=3Dnvdim= m0,slot=3D0 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args b/test= s/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args index e059194fac..1df12e21d6 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=3Dnone \ -realtime mlock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -numa node,nodeid=3D0,cpus=3D0-1,mem=3D1024 \ --object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,preallo= c=3Dyes,\ +-object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,preallo= c=3Don,\ size=3D537001984 \ -device nvdimm,node=3D0,label-size=3D131072,\ uuid=3D49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=3Dmemnvdimm0,id=3Dnvdim= m0,slot=3D0 \ 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 be88fb6007..490d4c4b1c 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 @@ -19,8 +19,8 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -object memory-backend-ram,id=3Dram-node0,size=3D224395264 \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ --object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,share= =3Dno,\ -prealloc=3Dyes,size=3D536870912 \ +-object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,share= =3Doff,\ +prealloc=3Don,size=3D536870912 \ -device nvdimm,node=3D0,unarmed=3Don,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot= =3D0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.arg= s b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args index 571e0b3d50..2cc62be1fa 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args @@ -19,7 +19,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -object memory-backend-ram,id=3Dram-node0,size=3D1073741824 \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ --object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,preallo= c=3Dyes,\ +-object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,preallo= c=3Don,\ size=3D536870912 \ -device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ 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 3c4aff806f..066371d6d7 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args @@ -20,7 +20,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -object memory-backend-ram,id=3Dram-node0,size=3D2145386496 \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -object memory-backend-file,id=3Dmemvirtiopmem0,mem-path=3D/tmp/virtio_pme= m,\ -share=3Dyes,size=3D536870912 \ +share=3Don,size=3D536870912 \ -device virtio-pmem-pci,memdev=3Dmemvirtiopmem0,id=3Dvirtiopmem0,bus=3Dpci= .0,\ addr=3D0x5 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.args b/tests/qemuxml= 2argvdata/pages-dimm-discard.args index c1c00fe2ed..6465ba1cb6 100644 --- a/tests/qemuxml2argvdata/pages-dimm-discard.args +++ b/tests/qemuxml2argvdata/pages-dimm-discard.args @@ -16,11 +16,11 @@ QEMU_AUDIO_DRV=3Dnone \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -numa node,nodeid=3D0,cpus=3D0-1,mem=3D1024 \ -object memory-backend-file,id=3Dmemdimm0,\ -mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-fedora,prealloc=3Dyes,size=3D1= 073741824,\ +mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-fedora,prealloc=3Don,size=3D10= 73741824,\ host-nodes=3D1-3,policy=3Dbind \ -device pc-dimm,node=3D0,memdev=3Dmemdimm0,id=3Ddimm0,slot=3D0 \ -object memory-backend-file,id=3Dmemdimm1,\ -mem-path=3D/var/lib/libvirt/qemu/ram/-1-fedora/dimm1,discard-data=3Dyes,sh= are=3Dno,\ +mem-path=3D/var/lib/libvirt/qemu/ram/-1-fedora/dimm1,discard-data=3Don,sha= re=3Doff,\ size=3D536870912 \ -device pc-dimm,node=3D0,memdev=3Dmemdimm1,id=3Ddimm1,slot=3D1 \ -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ diff --git a/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args b/tests/q= emuxml2argvdata/pci-rom-disabled-invalid.args deleted file mode 120000 index 0dffe3c624..0000000000 --- a/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args +++ /dev/null @@ -1 +0,0 @@ -pci-rom-disabled.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args b/tests/q= emuxml2argvdata/pci-rom-disabled-invalid.args new file mode 100644 index 0000000000..4eb57617fb --- /dev/null +++ b/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args @@ -0,0 +1,29 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-x86_64 \ +-name guest \ +-S \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m 214 \ +-realtime mlock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-guest/monitor.s= ock,\ +server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:24:a5:9f= ,bus=3Dpci.0,\ +addr=3D0x3,romfile=3D diff --git a/tests/qemuxml2argvdata/pseries-console-native.args b/tests/qem= uxml2argvdata/pseries-console-native.args deleted file mode 120000 index 1c09cf2102..0000000000 --- a/tests/qemuxml2argvdata/pseries-console-native.args +++ /dev/null @@ -1 +0,0 @@ -pseries-serial-native.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/pseries-console-native.args b/tests/qem= uxml2argvdata/pseries-console-native.args new file mode 100644 index 0000000000..04c4753697 --- /dev/null +++ b/tests/qemuxml2argvdata/pseries-console-native.args @@ -0,0 +1,27 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-ppc64 \ +-name guest \ +-S \ +-machine pseries,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m 512 \ +-realtime mlock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-guest/monitor.s= ock,\ +server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-chardev pty,id=3Dcharserial0 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 diff --git a/tests/qemuxml2argvdata/pseries-serial+console-native.args b/te= sts/qemuxml2argvdata/pseries-serial+console-native.args deleted file mode 120000 index 1c09cf2102..0000000000 --- a/tests/qemuxml2argvdata/pseries-serial+console-native.args +++ /dev/null @@ -1 +0,0 @@ -pseries-serial-native.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/pseries-serial+console-native.args b/te= sts/qemuxml2argvdata/pseries-serial+console-native.args new file mode 100644 index 0000000000..04c4753697 --- /dev/null +++ b/tests/qemuxml2argvdata/pseries-serial+console-native.args @@ -0,0 +1,27 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-ppc64 \ +-name guest \ +-S \ +-machine pseries,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m 512 \ +-realtime mlock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-guest/monitor.s= ock,\ +server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-chardev pty,id=3Dcharserial0 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 diff --git a/tests/qemuxml2argvdata/pseries-serial-compat.args b/tests/qemu= xml2argvdata/pseries-serial-compat.args deleted file mode 120000 index 1c09cf2102..0000000000 --- a/tests/qemuxml2argvdata/pseries-serial-compat.args +++ /dev/null @@ -1 +0,0 @@ -pseries-serial-native.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/pseries-serial-compat.args b/tests/qemu= xml2argvdata/pseries-serial-compat.args new file mode 100644 index 0000000000..04c4753697 --- /dev/null +++ b/tests/qemuxml2argvdata/pseries-serial-compat.args @@ -0,0 +1,27 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-ppc64 \ +-name guest \ +-S \ +-machine pseries,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m 512 \ +-realtime mlock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-guest/monitor.s= ock,\ +server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-chardev pty,id=3Dcharserial0 \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D0x30000000 diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args = b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args index 486d1ace09..4536a63f9b 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args @@ -31,7 +31,7 @@ server=3Don,wait=3Doff \ localport=3D1111 \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -object tls-creds-x509,id=3Dobjcharserial1_tls0,dir=3D/etc/pki/libvirt-cha= rdev,\ -endpoint=3Dclient,verify-peer=3Dyes \ +endpoint=3Dclient,verify-peer=3Don \ -chardev socket,id=3Dcharserial1,host=3D127.0.0.1,port=3D5555,\ tls-creds=3Dobjcharserial1_tls0 \ -device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args b/tests= /qemuxml2argvdata/serial-tcp-tlsx509-chardev.args index 486d1ace09..4536a63f9b 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args @@ -31,7 +31,7 @@ server=3Don,wait=3Doff \ localport=3D1111 \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -object tls-creds-x509,id=3Dobjcharserial1_tls0,dir=3D/etc/pki/libvirt-cha= rdev,\ -endpoint=3Dclient,verify-peer=3Dyes \ +endpoint=3Dclient,verify-peer=3Don \ -chardev socket,id=3Dcharserial1,host=3D127.0.0.1,port=3D5555,\ tls-creds=3Dobjcharserial1_tls0 \ -device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args = b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args index 9d199240a2..72073f1fac 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args @@ -36,7 +36,7 @@ localport=3D1111 \ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ -object tls-creds-x509,id=3Dobjcharserial1_tls0,dir=3D/etc/pki/libvirt-cha= rdev,\ -endpoint=3Dclient,verify-peer=3Dyes,passwordid=3Dcharserial1-secret0 \ +endpoint=3Dclient,verify-peer=3Don,passwordid=3Dcharserial1-secret0 \ -chardev socket,id=3Dcharserial1,host=3D127.0.0.1,port=3D5555,\ tls-creds=3Dobjcharserial1_tls0 \ -device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.args b/tests/qemux= ml2argvdata/shmem-plain-doorbell.args index a5d8626617..433992c143 100644 --- a/tests/qemuxml2argvdata/shmem-plain-doorbell.args +++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.args @@ -26,14 +26,14 @@ server=3Don,wait=3Doff \ -no-acpi \ -usb \ -object memory-backend-file,id=3Dshmmem-shmem0,mem-path=3D/dev/shm/shmem0,\ -size=3D4194304,share=3Dyes \ +size=3D4194304,share=3Don \ -device ivshmem-plain,id=3Dshmem0,memdev=3Dshmmem-shmem0,bus=3Dpci.0,addr= =3D0x3 \ -object memory-backend-file,id=3Dshmmem-shmem1,mem-path=3D/dev/shm/shmem1,\ -size=3D134217728,share=3Dyes \ +size=3D134217728,share=3Don \ -device ivshmem-plain,id=3Dshmem1,memdev=3Dshmmem-shmem1,master=3Doff,bus= =3Dpci.0,\ addr=3D0x5 \ -object memory-backend-file,id=3Dshmmem-shmem2,mem-path=3D/dev/shm/shmem2,\ -size=3D268435456,share=3Dyes \ +size=3D268435456,share=3Don \ -device ivshmem-plain,id=3Dshmem2,memdev=3Dshmmem-shmem2,master=3Don,bus= =3Dpci.0,\ addr=3D0x4 \ -device ivshmem-doorbell,id=3Dshmem3,chardev=3Dcharshmem3,ioeventfd=3Don,b= us=3Dpci.0,\ diff --git a/tests/qemuxml2argvdata/user-aliases.args b/tests/qemuxml2argvd= ata/user-aliases.args index 9b574d9a30..d3570e5485 100644 --- a/tests/qemuxml2argvdata/user-aliases.args +++ b/tests/qemuxml2argvdata/user-aliases.args @@ -17,16 +17,16 @@ file=3D/tmp/lib/domain--1-gentoo/master-key.aes \ -realtime mlock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -object memory-backend-file,id=3Dram-node0,\ -mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=3Dyes,size=3D1= 073741824 \ +mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=3Don,size=3D10= 73741824 \ -numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ -object memory-backend-file,id=3Dram-node1,\ -mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=3Dyes,size=3D1= 073741824 \ +mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=3Don,size=3D10= 73741824 \ -numa node,nodeid=3D1,cpus=3D1,memdev=3Dram-node1 \ -object memory-backend-file,id=3Dram-node2,\ -mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=3Dyes,size=3D1= 073741824 \ +mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=3Don,size=3D10= 73741824 \ -numa node,nodeid=3D2,cpus=3D2,memdev=3Dram-node2 \ -object memory-backend-file,id=3Dram-node3,\ -mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=3Dyes,size=3D1= 073741824 \ +mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=3Don,size=3D10= 73741824 \ -numa node,nodeid=3D3,cpus=3D3,memdev=3Dram-node3 \ -uuid a75aca4b-a02f-2bcb-4a91-c93cd848c34b \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/user-aliases2.args b/tests/qemuxml2argv= data/user-aliases2.args deleted file mode 120000 index d63573a9a5..0000000000 --- a/tests/qemuxml2argvdata/user-aliases2.args +++ /dev/null @@ -1 +0,0 @@ -boot-floppy-q35.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/user-aliases2.args b/tests/qemuxml2argv= data/user-aliases2.args new file mode 100644 index 0000000000..4d975e4e39 --- /dev/null +++ b/tests/qemuxml2argvdata/user-aliases2.args @@ -0,0 +1,28 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-x86_64 \ +-name QEMUGuest1 \ +-S \ +-machine pc-q35-2.4,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m 214 \ +-realtime mlock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ +server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-drive file=3D/tmp/firmware.img,format=3Draw,if=3Dnone,id=3Ddrive-fdc0-0-0= \ +-device isa-fdc,driveA=3Ddrive-fdc0-0-0,bootindexA=3D1 diff --git a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args index bf44d34cae..3ff0d5a96b 100644 --- a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args @@ -18,7 +18,7 @@ file=3D/tmp/lib/domain--1-guest/master-key.aes \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -object memory-backend-file,id=3Dram-node0,\ -mem-path=3D/var/lib/libvirt/qemu/ram/-1-guest/ram-node0,share=3Dyes,\ +mem-path=3D/var/lib/libvirt/qemu/ram/-1-guest/ram-node0,share=3Don,\ size=3D15032385536 \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args index fb086f00aa..77d712c378 100644 --- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args @@ -18,7 +18,7 @@ file=3D/tmp/lib/domain--1-guest/master-key.aes \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -object memory-backend-file,id=3Dram-node0,\ -mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-guest,share=3Dyes,prealloc=3Dy= es,\ +mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-guest,share=3Don,prealloc=3Don= ,\ size=3D2147483648 \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ 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 49298aaccc..2fe44aae49 100644 --- a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args @@ -17,7 +17,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -m 214 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --object memory-backend-memfd,id=3Dram-node0,share=3Dyes,size=3D224395264 \ +-object memory-backend-memfd,id=3Dram-node0,share=3Don,size=3D224395264 \ -numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args b/tes= ts/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args index 2899fcb86d..9911c345c1 100644 --- a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args @@ -17,7 +17,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -m 214 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --object memory-backend-memfd,id=3Dram-node0,share=3Dyes,size=3D224395264 \ +-object memory-backend-memfd,id=3Dram-node0,share=3Don,size=3D224395264 \ -numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ --=20 2.29.2 From nobody Wed May 1 03:18:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1613480281; cv=none; d=zohomail.com; s=zohoarc; b=EqfmUy/W+pvibkGrPQ9Q+Cr0plUCkJabeK8NcyMR+Y5K2bo0rtAIkug351LcpWwEi+HFDe10XbjGrOhTJVuUt6BdbwCzGzEGkyyeLsHnIO52UbPT8ZRb3dATLt/ic1LD30ALUgqxq19JYjfoxmcbHPeWIgr3sb+f08FA1S6aV0g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613480281; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8JLZaM711ulPZeBMHEdxC2ap1/AfBC9YtNW5TJ5G1KI=; b=ZxU+03qtdIn/csbnX/J7Y+aiRDWhsxfGdsncIhEnm7g9abh+vLSw4nDc3RxRYTTKE0jJSoDZ4XFtbsNiLPIEn9E+xP8iIAPLE9NtERDpgpMYTNIy1GbyyfvMHY2V38AGBtZAgnLO+lqor0HCkZ45NCnhsfZqVK8TKakeXA+nkg8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1613480281192863.6662253337788; Tue, 16 Feb 2021 04:58:01 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-440-r8zfwhBFNK6PZ3NQC9eAGg-1; Tue, 16 Feb 2021 07:57:55 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 60A00801AB1; Tue, 16 Feb 2021 12:57:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 36C4760937; Tue, 16 Feb 2021 12:57:50 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EB09157DFD; Tue, 16 Feb 2021 12:57:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11GCvmqc002345 for ; Tue, 16 Feb 2021 07:57:48 -0500 Received: by smtp.corp.redhat.com (Postfix) id EA86E60C5F; Tue, 16 Feb 2021 12:57:48 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-215.ams2.redhat.com [10.36.112.215]) by smtp.corp.redhat.com (Postfix) with ESMTP id 28208619CA; Tue, 16 Feb 2021 12:57:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613480280; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=8JLZaM711ulPZeBMHEdxC2ap1/AfBC9YtNW5TJ5G1KI=; b=Bxfzn2pxQMNyf2Pj+ZlUWvsmVipSPGl5qMcNPIZ0OgOBqR/drTLQgVRKjg6u+qQ/PP2lex tIeUukuwvbFyrd0Mgc3WJ2YAETvK71MVbp2MNiDVKZoWNGzbYjVOkTOK77PVjHh25PAfJi CQ05h2f0JMi/jXvRGUds1d2i3cUSDoU= X-MC-Unique: r8zfwhBFNK6PZ3NQC9eAGg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 4/5] qemu: use on|off instead of yes|no for -drive boolean properties Date: Tue, 16 Feb 2021 12:57:04 +0000 Message-Id: <20210216125705.275788-5-berrange@redhat.com> In-Reply-To: <20210216125705.275788-1-berrange@redhat.com> References: <20210216125705.275788-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) QEMU has long accepted many different values for boolean properties, but set accepted has been different depending on which QEMU parser you hit. The on|off values were supported by all QEMU parsers. The yes|no, y|n, true|false values were only partially supported: https://lists.gnu.org/archive/html/qemu-devel/2020-11/msg01012.html Thus we should standardize on on|off everywhere since that is most widely supported in QEMU. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Peter Krempa --- src/util/virqemu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virqemu.c b/src/util/virqemu.c index 4136012c70..5b0dc25bc1 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -362,7 +362,7 @@ virQEMUBuildDriveCommandlineFromJSON(virJSONValuePtr sr= cdef) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 - if (virQEMUBuildCommandLineJSON(srcdef, &buf, NULL, false, + if (virQEMUBuildCommandLineJSON(srcdef, &buf, NULL, true, virQEMUBuildCommandLineJSONArrayNumber= ed) < 0) return NULL; =20 --=20 2.29.2 From nobody Wed May 1 03:18:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1613480281441261.3050630459519; Tue, 16 Feb 2021 04:58:01 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-594-egx8AYcXNkWVVVK0jnNTSw-1; Tue, 16 Feb 2021 07:57:58 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0F8261020C21; Tue, 16 Feb 2021 12:57:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DE6BE5D9CD; Tue, 16 Feb 2021 12:57:52 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A47D418095CD; Tue, 16 Feb 2021 12:57:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11GCvo9j002362 for ; Tue, 16 Feb 2021 07:57:50 -0500 Received: by smtp.corp.redhat.com (Postfix) id 59CAC60C6B; Tue, 16 Feb 2021 12:57:50 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-215.ams2.redhat.com [10.36.112.215]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6165E60C62; Tue, 16 Feb 2021 12:57:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613480280; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=9JhrP8W260Q5jqEDoyzu7vMkE+Od5hqV2tEM+fYTLPI=; b=Gv8EptvykcOI13HCHtEWku+WjxILMTRBYpd6RWuUxzJPtvAxZYop9QNIXLEQdTbHqAzoud lH53uLjAW4L0tvz7AM3LRi28T9NWiUuClEWsjOOlXx16FKb81UkXt6B5yKXY2VewsmXuO1 +XEzs/OjSXodA4lMcRpP9VYlU/0tdWg= X-MC-Unique: egx8AYcXNkWVVVK0jnNTSw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 5/5] qemu: remove support for generating yes|no boolean options Date: Tue, 16 Feb 2021 12:57:05 +0000 Message-Id: <20210216125705.275788-6-berrange@redhat.com> In-Reply-To: <20210216125705.275788-1-berrange@redhat.com> References: <20210216125705.275788-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) All callers are now using the on|off syntax, so yes|no is a unreachable code path. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Peter Krempa --- src/util/virqemu.c | 50 +++++++++++++------------------------ src/util/virqemu.h | 10 +++----- tests/qemucommandutiltest.c | 10 ++++---- 3 files changed, 25 insertions(+), 45 deletions(-) diff --git a/src/util/virqemu.c b/src/util/virqemu.c index 5b0dc25bc1..57ee42dd16 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -37,7 +37,6 @@ struct virQEMUCommandLineJSONIteratorData { const char *prefix; virBufferPtr buf; const char *skipKey; - bool onOff; virQEMUBuildCommandLineJSONArrayFormatFunc arrayFunc; }; =20 @@ -47,7 +46,6 @@ virQEMUBuildCommandLineJSONRecurse(const char *key, virJSONValuePtr value, virBufferPtr buf, const char *skipKey, - bool onOff, virQEMUBuildCommandLineJSONArrayFormatF= unc arrayFunc, bool nested); =20 @@ -57,8 +55,7 @@ int virQEMUBuildCommandLineJSONArrayBitmap(const char *key, virJSONValuePtr array, virBufferPtr buf, - const char *skipKey G_GNUC_UNUSED, - bool onOff G_GNUC_UNUSED) + const char *skipKey G_GNUC_UNUSED) { ssize_t pos =3D -1; ssize_t end; @@ -87,8 +84,7 @@ int virQEMUBuildCommandLineJSONArrayNumbered(const char *key, virJSONValuePtr array, virBufferPtr buf, - const char *skipKey, - bool onOff) + const char *skipKey) { virJSONValuePtr member; size_t i; @@ -99,7 +95,7 @@ virQEMUBuildCommandLineJSONArrayNumbered(const char *key, member =3D virJSONValueArrayGet((virJSONValuePtr) array, i); prefix =3D g_strdup_printf("%s.%zu", key, i); =20 - if (virQEMUBuildCommandLineJSONRecurse(prefix, member, buf, skipKe= y, onOff, + if (virQEMUBuildCommandLineJSONRecurse(prefix, member, buf, skipKe= y, virQEMUBuildCommandLineJSON= ArrayNumbered, true) < 0) return 0; @@ -125,8 +121,7 @@ static int virQEMUBuildCommandLineJSONArrayObjectsStr(const char *key, virJSONValuePtr array, virBufferPtr buf, - const char *skipKey G_GNUC_UNUS= ED, - bool onOff G_GNUC_UNUSED) + const char *skipKey G_GNUC_UNUS= ED) { g_auto(virBuffer) tmp =3D VIR_BUFFER_INITIALIZER; size_t i; @@ -163,11 +158,11 @@ virQEMUBuildCommandLineJSONIterate(const char *key, tmpkey =3D g_strdup_printf("%s.%s", data->prefix, key); =20 return virQEMUBuildCommandLineJSONRecurse(tmpkey, value, data->buf, - data->skipKey, data->onO= ff, + data->skipKey, data->arrayFunc, false); } else { return virQEMUBuildCommandLineJSONRecurse(key, value, data->buf, - data->skipKey, data->onO= ff, + data->skipKey, data->arrayFunc, false); } } @@ -178,11 +173,10 @@ virQEMUBuildCommandLineJSONRecurse(const char *key, virJSONValuePtr value, virBufferPtr buf, const char *skipKey, - bool onOff, virQEMUBuildCommandLineJSONArrayFormatF= unc arrayFunc, bool nested) { - struct virQEMUCommandLineJSONIteratorData data =3D { key, buf, skipKey= , onOff, arrayFunc }; + struct virQEMUCommandLineJSONIteratorData data =3D { key, buf, skipKey= , arrayFunc }; virJSONType type =3D virJSONValueGetType(value); virJSONValuePtr elem; bool tmp; @@ -207,18 +201,10 @@ virQEMUBuildCommandLineJSONRecurse(const char *key, =20 case VIR_JSON_TYPE_BOOLEAN: virJSONValueGetBoolean(value, &tmp); - if (onOff) { - if (tmp) - virBufferAsprintf(buf, "%s=3Don,", key); - else - virBufferAsprintf(buf, "%s=3Doff,", key); - } else { - if (tmp) - virBufferAsprintf(buf, "%s=3Dyes,", key); - else - virBufferAsprintf(buf, "%s=3Dno,", key); - } - + if (tmp) + virBufferAsprintf(buf, "%s=3Don,", key); + else + virBufferAsprintf(buf, "%s=3Doff,", key); break; =20 case VIR_JSON_TYPE_ARRAY: @@ -229,7 +215,7 @@ virQEMUBuildCommandLineJSONRecurse(const char *key, return -1; } =20 - if (!arrayFunc || arrayFunc(key, value, buf, skipKey, onOff) < 0) { + if (!arrayFunc || arrayFunc(key, value, buf, skipKey) < 0) { /* fallback, treat the array as a non-bitmap, adding the key * for each member */ for (i =3D 0; i < virJSONValueArraySize(value); i++) { @@ -237,7 +223,7 @@ virQEMUBuildCommandLineJSONRecurse(const char *key, =20 /* recurse to avoid duplicating code */ if (virQEMUBuildCommandLineJSONRecurse(key, elem, buf, ski= pKey, - onOff, arrayFunc, t= rue) < 0) + arrayFunc, true) < = 0) return -1; } } @@ -265,7 +251,6 @@ virQEMUBuildCommandLineJSONRecurse(const char *key, * @value: json object containing the value * @buf: otuput buffer * @skipKey: name of key that will be handled separately by caller - * @onOff: Use 'on' and 'off' for boolean values rather than 'yes' and 'no' * @arrayFunc: array formatter function to allow for different syntax * * Formats JSON value object into command line parameters suitable for use= with @@ -277,10 +262,9 @@ int virQEMUBuildCommandLineJSON(virJSONValuePtr value, virBufferPtr buf, const char *skipKey, - bool onOff, virQEMUBuildCommandLineJSONArrayFormatFunc arr= ay) { - if (virQEMUBuildCommandLineJSONRecurse(NULL, value, buf, skipKey, onOf= f, array, false) < 0) + if (virQEMUBuildCommandLineJSONRecurse(NULL, value, buf, skipKey, arra= y, false) < 0) return -1; =20 virBufferTrim(buf, ","); @@ -311,7 +295,7 @@ virQEMUBuildNetdevCommandlineFromJSON(virJSONValuePtr p= rops, =20 virBufferAsprintf(&buf, "%s,", type); =20 - if (virQEMUBuildCommandLineJSON(props, &buf, "type", true, + if (virQEMUBuildCommandLineJSON(props, &buf, "type", virQEMUBuildCommandLineJSONArrayObject= sStr) < 0) return NULL; =20 @@ -336,7 +320,7 @@ virQEMUBuildObjectCommandlineFromJSONInternal(virBuffer= Ptr buf, =20 if (props) { virBufferAddLit(buf, ","); - if (virQEMUBuildCommandLineJSON(props, buf, NULL, true, + if (virQEMUBuildCommandLineJSON(props, buf, NULL, virQEMUBuildCommandLineJSONArrayBitmap) < = 0) return -1; } @@ -362,7 +346,7 @@ virQEMUBuildDriveCommandlineFromJSON(virJSONValuePtr sr= cdef) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 - if (virQEMUBuildCommandLineJSON(srcdef, &buf, NULL, true, + if (virQEMUBuildCommandLineJSON(srcdef, &buf, NULL, virQEMUBuildCommandLineJSONArrayNumber= ed) < 0) return NULL; =20 diff --git a/src/util/virqemu.h b/src/util/virqemu.h index b81efc765f..849b7df0c2 100644 --- a/src/util/virqemu.h +++ b/src/util/virqemu.h @@ -29,23 +29,19 @@ typedef int (*virQEMUBuildCommandLineJSONArrayFormatFunc)(const char *key, virJSONValuePtr = array, virBufferPtr buf, - const char *skip= Key, - bool onOff); + const char *skip= Key); int virQEMUBuildCommandLineJSONArrayBitmap(const char *key, virJSONValuePtr array, virBufferPtr buf, - const char *skipKey, - bool onOff); + const char *skipKey); int virQEMUBuildCommandLineJSONArrayNumbered(const char *key, virJSONValuePtr array, virBufferPtr buf, - const char *skipKey, - bool onOff); + const char *skipKey); =20 int virQEMUBuildCommandLineJSON(virJSONValuePtr value, virBufferPtr buf, const char *skipKey, - bool onOff, virQEMUBuildCommandLineJSONArrayFormatFunc= array); =20 char * diff --git a/tests/qemucommandutiltest.c b/tests/qemucommandutiltest.c index 305f59e76b..6291c3b787 100644 --- a/tests/qemucommandutiltest.c +++ b/tests/qemucommandutiltest.c @@ -47,7 +47,7 @@ testQemuCommandBuildFromJSON(const void *opaque) return -1; } =20 - if (virQEMUBuildCommandLineJSON(val, &buf, NULL, false, data->arrayfun= c) < 0) { + if (virQEMUBuildCommandLineJSON(val, &buf, NULL, data->arrayfunc) < 0)= { fprintf(stderr, "\nvirQEMUBuildCommandlineJSON failed process JSON:\n%s\n", data->props); @@ -99,8 +99,8 @@ mymain(void) DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"string\":\"qwer\"}", "string=3Dqw= er"); DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"string\":\"qw,e,r\"}", "string=3D= qw,,e,,r"); DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"number\":1234}", "number=3D1234"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"boolean\":true}", "boolean=3Dyes"= ); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"boolean\":false}", "boolean=3Dno"= ); + DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"boolean\":true}", "boolean=3Don"); + DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"boolean\":false}", "boolean=3Doff= "); DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[]}", NULL); DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[0]}", "bitmap=3D0"); DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[1,3,5]}", @@ -113,14 +113,14 @@ mymain(void) DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"array\":[\"bleah\",\"qwerty\",1]}= ", "array=3Dbleah,array=3Dqwerty,array= =3D1"); DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"boolean\":true,\"hyphen-name\":12= 34,\"some_string\":\"bleah\"}", - "boolean=3Dyes,hyphen-name=3D1234,som= e_string=3Dbleah"); + "boolean=3Don,hyphen-name=3D1234,some= _string=3Dbleah"); DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"nest\": {\"boolean\":true," "\"hyphen-name\":1234," "\"some_string\":\"bleah\= "," "\"bleah\":\"bl,eah\"" "}" "}", - "nest.boolean=3Dyes,nest.hyphen-name= =3D1234," + "nest.boolean=3Don,nest.hyphen-name= =3D1234," "nest.some_string=3Dbleah,nest.bleah= =3Dbl,,eah"); DO_TEST_COMMAND_DRIVE_FROM_JSON("{\"driver\":\"gluster\"," "\"volume\":\"test\"," --=20 2.29.2