From nobody Thu Apr 25 14:33:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1637396908328840.0484675127019; Sat, 20 Nov 2021 00:28:28 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-263-8u1WQXByPCGoQ_smzL8Ejg-1; Sat, 20 Nov 2021 03:28:23 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F1798425D0; Sat, 20 Nov 2021 08:28:17 +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 CFCA460BF1; Sat, 20 Nov 2021 08:28: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 962F14A704; Sat, 20 Nov 2021 08:28:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1AK8S62k002957 for ; Sat, 20 Nov 2021 03:28:06 -0500 Received: by smtp.corp.redhat.com (Postfix) id 086D21121319; Sat, 20 Nov 2021 08:28:06 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 035DA1121318 for ; Sat, 20 Nov 2021 08:28:04 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8422485A5A8 for ; Sat, 20 Nov 2021 08:28:04 +0000 (UTC) Received: from chinatelecom.cn (prt-mail.chinatelecom.cn [42.123.76.226]) by relay.mimecast.com with ESMTP id us-mta-424-cGGoZs5VNMmjmrLX1bbjHA-1; Sat, 20 Nov 2021 03:27:58 -0500 Received: from clientip-182.138.181.165 (unknown [172.18.0.188]) by chinatelecom.cn (HERMES) with SMTP id 0F3112800A3; Sat, 20 Nov 2021 16:20:50 +0800 (CST) Received: from ([172.18.0.188]) by app0023 with ESMTP id d67422ea9f5946118342d51ea93709b5 for libvir-list@redhat.com; Sat, 20 Nov 2021 16:20:55 CST X-MC-Unique: 8u1WQXByPCGoQ_smzL8Ejg-1 X-MC-Unique: cGGoZs5VNMmjmrLX1bbjHA-1 HMM_SOURCE_IP: 172.18.0.188:46282.1299073927 HMM_ATTACHE_NUM: 0000 HMM_SOURCE_TYPE: SMTP X-189-SAVE-TO-SEND: +huangy81@chinatelecom.cn X-Transaction-ID: d67422ea9f5946118342d51ea93709b5 X-Real-From: huangy81@chinatelecom.cn X-Receive-IP: 172.18.0.188 X-MEDUSA-Status: 0 From: huangy81@chinatelecom.cn To: libvir-list@redhat.com Subject: [PATCH v6 1/4] qemu_capabilities: introduce QEMU_CAPS_ACCEL Date: Sat, 20 Nov 2021 03:20:45 -0500 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 1AK8S62k002957 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?J=C3=A1n=20Tomko?= , Han Han , Hyman 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.12 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-ZM-MESSAGEID: 1637396909413100001 From: Hyman Huang(=E9=BB=84=E5=8B=87) since the "-machine" option for accelerators is legacy, "-accel" option may be a better mechanism. following are details: https://lore.kernel.org/qemu-devel/3aa73987-40e8-3619-0723-9f17f73850bd@red= hat.com/ this patch introduce QEMU_CAPS_ACCEL capability to tell if we're dealing new enough QEMU so that we can replace '-machine accel' with '-accel'. there were two phases of -accel support in QEMU: - 2.9 to 4.2: only one -accel option supported; specifying a fallback couldn't be done with -accel and required the older "-machine accel=3Dtcg:k= vm" instead. - 5.0 or newer: multiple -accel options supported, e.g. "-accel tcg -accel kvm" and it would be possible to distinguish them, for example using QOM properties. however libvirt only ever specifies one accelerator so it makes no difference. since the oldest supported qemu by libvirt is qemu-2.11, so modify capability test cases with QEMU version >=3D 2.11.0 carefully. Signed-off-by: Hyman Huang(=E9=BB=84=E5=8B=87) --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 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_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.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 + 44 files changed, 45 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b864f4d7df..4a6a53d88e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -651,6 +651,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "device.json", /* QEMU_CAPS_DEVICE_JSON */ "query-dirty-rate", /* QEMU_CAPS_QUERY_DIRTY_RATE */ "rbd-encryption", /* QEMU_CAPS_RBD_ENCRYPTION */ + "accel", /* QEMU_CAPS_ACCEL */ ); =20 =20 @@ -3203,6 +3204,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCaps= CommandLine[] =3D { { "spice", "rendernode", QEMU_CAPS_SPICE_RENDERNODE }, { "vnc", "power-control", QEMU_CAPS_VNC_POWER_CONTROL }, { "vnc", "audiodev", QEMU_CAPS_AUDIODEV }, + { "accel", NULL, QEMU_CAPS_ACCEL }, }; =20 static int diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 61bdbdb2ac..b625e3910d 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -631,6 +631,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_DEVICE_JSON, /* -device accepts JSON */ QEMU_CAPS_QUERY_DIRTY_RATE, /* accepts query-dirty-rate */ QEMU_CAPS_RBD_ENCRYPTION, /* Ceph RBD encryption support */ + QEMU_CAPS_ACCEL, /* -accel */ =20 QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.11.0.s390x.xml index 4d916121c5..e773b938c9 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -91,6 +91,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 ed9826504c..9638a75e77 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -166,6 +166,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 0c646c9c24..3e61e3e59e 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -138,6 +138,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 eb964e46d6..9c3b638530 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -137,6 +137,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 15a3e8724b..90bac6e250 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -105,6 +105,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 7f536db863..0da4a17bdc 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -178,6 +178,7 @@ + 2011090 0 43100289 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_3.0.0.ppc64.xml index e287c85293..650c2eeb95 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -139,6 +139,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 4f1a2631d8..fd662028a0 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -75,6 +75,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 c917876949..81bec3717b 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -75,6 +75,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 4d0be025fd..8b8e22b72f 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -108,6 +108,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 24ebdf3bbf..891460772f 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -184,6 +184,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 05d7921734..5a70fed6e9 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -144,6 +144,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 eedf55d677..5ce61bdedd 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -188,6 +188,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 3fe7332e19..2c4b6a53d2 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -154,6 +154,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 10f0d825e7..d1004e1cda 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -161,6 +161,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 9ae7a9260a..d8bd1a0ba5 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -151,6 +151,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 cbfdf4968e..b21efef7e8 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -151,6 +151,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 8e6ac7a8a9..7583cb41a1 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml @@ -120,6 +120,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 2e5947aff6..b760094f15 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -196,6 +196,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 40ad314d29..c057ae9029 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -203,6 +203,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 6cdc32dab3..a3377da552 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -169,6 +169,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 25e879b851..d3ff89a441 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -168,6 +168,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 beac3db473..d09f20f311 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -133,6 +133,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 415d12054b..9285fc3465 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -214,6 +214,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 bb6a7d5ee7..5604193c5e 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -179,6 +179,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 f8317c1117..8f4ddce8ee 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -187,6 +187,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 58c7eb6651..11ac230161 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -171,6 +171,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 69f49020e7..f5641ee82d 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -221,6 +221,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 58af90b29f..08da1e4ed0 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -90,6 +90,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 578e16e8b0..07b25c5324 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -224,6 +224,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 b943eaedaf..8af4f7109e 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -184,6 +184,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 ec64e1cacf..fa483c659a 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -190,6 +190,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 a11d15f91a..e56dd7f42f 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -174,6 +174,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 552e1d43c9..74dffd88da 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -141,6 +141,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 bcc262551a..97771139ec 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -227,6 +227,7 @@ + 5002000 0 43100243 diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0.aarch64.xml index 0fefe64537..bbf668fe78 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -192,6 +192,7 @@ + 6000000 0 61700242 diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index 61685066b8..595b3fafea 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -149,6 +149,7 @@ + 6000000 0 39100242 diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index 1b394198f1..dc1598c98b 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -235,6 +235,7 @@ + 6000000 0 43100242 diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index 1f4f49eb34..181beee79b 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -239,6 +239,7 @@ + 6001000 0 43100243 diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index 9662214cd8..14129d63ae 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -204,6 +204,7 @@ + 6001050 0 61700244 diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0.ppc64.xml index 94528ba13a..4bb8674d3f 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -200,6 +200,7 @@ + 6001050 0 42900244 diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index 39179916c5..561777bf9b 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -240,6 +240,7 @@ + 6001050 0 43100244 --=20 2.27.0 From nobody Thu Apr 25 14:33:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1637396907607461.67722668934243; Sat, 20 Nov 2021 00:28:27 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-287-HlAeRVmZMx2chqg78x1HFA-1; Sat, 20 Nov 2021 03:28:24 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D302E425CC; Sat, 20 Nov 2021 08:28:17 +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 A39E419736; Sat, 20 Nov 2021 08:28: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 6DBD44A703; Sat, 20 Nov 2021 08:28:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1AK8SCps002993 for ; Sat, 20 Nov 2021 03:28:12 -0500 Received: by smtp.corp.redhat.com (Postfix) id 06E5F2166B2D; Sat, 20 Nov 2021 08:28:12 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F3D952166B26 for ; Sat, 20 Nov 2021 08:28:06 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 887298027FB for ; Sat, 20 Nov 2021 08:28:06 +0000 (UTC) Received: from chinatelecom.cn (prt-mail.chinatelecom.cn [42.123.76.226]) by relay.mimecast.com with ESMTP id us-mta-115-6YqoknOePDW4SNbwvWejRg-1; Sat, 20 Nov 2021 03:28:00 -0500 Received: from clientip-182.138.181.165 (unknown [172.18.0.188]) by chinatelecom.cn (HERMES) with SMTP id CFE202800AA; Sat, 20 Nov 2021 16:20:52 +0800 (CST) Received: from ([172.18.0.188]) by app0023 with ESMTP id 3b25b3e6f2c24c4a8d5d3563d5582247 for libvir-list@redhat.com; Sat, 20 Nov 2021 16:20:58 CST X-MC-Unique: HlAeRVmZMx2chqg78x1HFA-1 X-MC-Unique: 6YqoknOePDW4SNbwvWejRg-1 HMM_SOURCE_IP: 172.18.0.188:46282.1299073927 HMM_ATTACHE_NUM: 0000 HMM_SOURCE_TYPE: SMTP X-189-SAVE-TO-SEND: +huangy81@chinatelecom.cn X-Transaction-ID: 3b25b3e6f2c24c4a8d5d3563d5582247 X-Real-From: huangy81@chinatelecom.cn X-Receive-IP: 172.18.0.188 X-MEDUSA-Status: 0 From: huangy81@chinatelecom.cn To: libvir-list@redhat.com Subject: [PATCH v6 2/4] qemu_command: switch accelerator option to new style Date: Sat, 20 Nov 2021 03:20:46 -0500 Message-Id: <6b4aa4a4da699af778c087e0e58e395f334e1a6a.1637395523.git.huangy81@chinatelecom.cn> In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 1AK8SCps002993 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?J=C3=A1n=20Tomko?= , Han Han , Hyman X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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-ZM-MESSAGEID: 1637397810761100001 From: Hyman Huang(=E9=BB=84=E5=8B=87) QEMU greater than 2.9.0 support '-accel' option, change the way of assembling commandline from "accel=3Dkvm" to "-accel kvm" when specifying accelerator. Signed-off-by: Hyman Huang(=E9=BB=84=E5=8B=87) --- src/qemu/qemu_command.c | 31 ++++++++++++++++++- ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 3 +- .../aarch64-features-sve.aarch64-latest.args | 3 +- .../channel-unix-guestfwd.x86_64-latest.args | 3 +- .../clock-timer-armvtimer.aarch64-latest.args | 3 +- .../console-virtio-unix.x86_64-latest.args | 3 +- ...u-Icelake-Server-pconfig.x86_64-3.1.0.args | 3 +- ...-Icelake-Server-pconfig.x86_64-latest.args | 3 +- .../cpu-host-model.x86_64-2.11.0.args | 3 +- .../cpu-host-model.x86_64-2.12.0.args | 3 +- .../cpu-host-model.x86_64-3.0.0.args | 3 +- .../cpu-host-model.x86_64-3.1.0.args | 3 +- .../cpu-host-model.x86_64-4.0.0.args | 3 +- .../cpu-host-model.x86_64-4.1.0.args | 3 +- .../cpu-host-model.x86_64-4.2.0.args | 3 +- .../cpu-host-model.x86_64-5.0.0.args | 3 +- .../cpu-host-model.x86_64-5.1.0.args | 3 +- .../cpu-host-model.x86_64-5.2.0.args | 3 +- .../cpu-host-model.x86_64-6.0.0.args | 3 +- .../cpu-host-model.x86_64-6.1.0.args | 3 +- .../cpu-host-model.x86_64-latest.args | 3 +- .../cpu-tsc-frequency.x86_64-4.0.0.args | 3 +- ...ult-video-type-aarch64.aarch64-latest.args | 3 +- ...default-video-type-ppc64.ppc64-latest.args | 3 +- ...default-video-type-s390x.s390x-latest.args | 3 +- .../disk-cdrom-network.x86_64-2.12.0.args | 3 +- .../disk-cdrom-network.x86_64-latest.args | 3 +- .../disk-network-http.x86_64-latest.args | 3 +- .../disk-serial.x86_64-latest.args | 3 +- .../graphics-spice-timeout.x86_64-latest.args | 3 +- .../hugepages-memaccess3.x86_64-latest.args | 3 +- .../intel-iommu-aw-bits.x86_64-latest.args | 3 +- ...ntel-iommu-caching-mode.x86_64-latest.args | 3 +- ...ntel-iommu-device-iotlb.x86_64-latest.args | 3 +- .../intel-iommu-eim.x86_64-latest.args | 3 +- .../launch-security-s390-pv.s390x-latest.args | 3 +- ...v-missing-platform-info.x86_64-2.12.0.args | 3 +- .../launch-security-sev.x86_64-2.12.0.args | 3 +- .../launch-security-sev.x86_64-6.0.0.args | 3 +- ...memory-default-hugepage.x86_64-latest.args | 3 +- .../memfd-memory-numa.x86_64-latest.args | 3 +- ...mory-hotplug-virtio-mem.x86_64-latest.args | 3 +- ...mory-hotplug-virtio-pmem.x86_64-5.2.0.args | 3 +- ...ory-hotplug-virtio-pmem.x86_64-latest.args | 3 +- .../os-firmware-bios.x86_64-latest.args | 3 +- ...re-efi-no-enrolled-keys.x86_64-latest.args | 3 +- ...os-firmware-efi-secboot.x86_64-latest.args | 3 +- .../os-firmware-efi.x86_64-latest.args | 3 +- .../parallel-unix-chardev.x86_64-latest.args | 3 +- ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 3 +- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 3 +- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 3 +- ...t-cpu-kvm-ccw-virtio-2.7.s390x-latest.args | 3 +- ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 3 +- ...rtcard-passthrough-unix.x86_64-latest.args | 3 +- .../usb-redir-unix.x86_64-latest.args | 3 +- ...vhost-user-fs-fd-memory.x86_64-latest.args | 3 +- .../virtio-rng-builtin.x86_64-5.2.0.args | 3 +- .../virtio-rng-builtin.x86_64-latest.args | 3 +- .../virtio-rng-egd-unix.x86_64-5.2.0.args | 3 +- .../virtio-rng-egd-unix.x86_64-latest.args | 3 +- ...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 3 +- ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 3 +- 63 files changed, 154 insertions(+), 63 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3108bdd581..a8f73c2d3e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7027,6 +7027,23 @@ qemuBuildNameCommandLine(virCommand *cmd, return 0; } =20 +static void +qemuBuildAccelCommandLineKvmOptions(virCommand *cmd, + const virDomainDef *def) +{ + /* + * only handle the kvm case, tcg case use the legacy style + * not that either kvm or tcg can be specified by libvirt + * so do not worry about the conflict of specifying both + * */ + if ((virDomainVirtType)def->virtType =3D=3D VIR_DOMAIN_VIRT_KVM) { + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + virCommandAddArg(cmd, "-accel"); + virBufferAddLit(&buf, "kvm"); + virCommandAddArgBuffer(cmd, &buf); + } +} + static int qemuBuildMachineCommandLine(virCommand *cmd, virQEMUDriverConfig *cfg, @@ -7048,8 +7065,16 @@ qemuBuildMachineCommandLine(virCommand *cmd, virBufferAddLit(&buf, ",accel=3Dtcg"); break; =20 + /* + * QEMU greater than 2.9.0 support '-accel', change the way of + * building commandline from "accel=3Dkvm" to "-accel kvm", skip + * setting accel property if we have ACCEL cap, leave the + * "qemuBuildAccelCommandLine" do this. + **/ case VIR_DOMAIN_VIRT_KVM: - virBufferAddLit(&buf, ",accel=3Dkvm"); + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_ACCEL)) { + virBufferAddLit(&buf, ",accel=3Dkvm"); + } break; =20 case VIR_DOMAIN_VIRT_KQEMU: @@ -10705,6 +10730,10 @@ qemuBuildCommandLine(virQEMUDriver *driver, if (qemuBuildMachineCommandLine(cmd, cfg, def, qemuCaps, priv) < 0) return NULL; =20 + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ACCEL)) { + qemuBuildAccelCommandLineKvmOptions(cmd, def); + } + qemuBuildTSEGCommandLine(cmd, def); =20 if (qemuBuildCpuCommandLine(cmd, driver, def, qemuCaps) < 0) diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch6= 4-latest.args b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aar= ch64-latest.args index 0a21ce9493..c17bcad5cf 100644 --- a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-lates= t.args +++ b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-lates= t.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ --machine virt-4.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,gic-version= =3D3,memory-backend=3Dmach-virt.ram \ +-machine virt-4.2,usb=3Doff,dump-guest-core=3Doff,gic-version=3D3,memory-b= ackend=3Dmach-virt.ram \ +-accel kvm \ -m 4096 \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294= 967296}' \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.arg= s b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args index 9acd9b4081..9b5485c957 100644 --- a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ --machine virt,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,gic-version=3D3,= memory-backend=3Dmach-virt.ram \ +-machine virt,usb=3Doff,dump-guest-core=3Doff,gic-version=3D3,memory-backe= nd=3Dmach-virt.ram \ +-accel kvm \ -cpu host,sve512=3Don,sve384=3Doff,sve256=3Don,sve128=3Don,sve=3Don \ -m 1024 \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.arg= s b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args index f43ddb9627..6d34fa71bf 100644 --- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ diff --git a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args index 0c3d73acaf..1a5fc89d8a 100644 --- a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args +++ b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ --machine virt,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,gic-version=3D3,= memory-backend=3Dmach-virt.ram \ +-machine virt,usb=3Doff,dump-guest-core=3Doff,gic-version=3D3,memory-backe= nd=3Dmach-virt.ram \ +-accel kvm \ -cpu host,kvm-no-adjvtime=3Don \ -m 4096 \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294= 967296}' \ diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args = b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args index 4765ae6fb5..7803b4ff37 100644 --- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0= .args b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args index 26ec8b9213..5c9a0fd9d2 100644 --- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args +++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args @@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dtest,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test= /master-key.aes \ --machine pc-i440fx-3.1,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-3.1,usb=3Doff,dump-guest-core=3Doff \ +-accel kvm \ -cpu Icelake-Server,pconfig=3Doff,intel-pt=3Doff \ -m 214 \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-lates= t.args b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.ar= gs index 612b77581b..d8857f9c36 100644 --- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -name guest=3Dtest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test/master-key.aes"}' \ --machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ +-accel kvm \ -cpu Icelake-Server,intel-pt=3Doff \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-2.11.0.args b/tes= ts/qemuxml2argvdata/cpu-host-model.x86_64-2.11.0.args index db6488caed..2d74495626 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-2.11.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-2.11.0.args @@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-q35-2.11,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-q35-2.11,usb=3Doff,dump-guest-core=3Doff \ +-accel kvm \ -cpu Skylake-Client,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,clflu= shopt=3Don,umip=3Don,xsaves=3Don,pdpe1gb=3Don \ -m 214 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-2.12.0.args b/tes= ts/qemuxml2argvdata/cpu-host-model.x86_64-2.12.0.args index 006bdc885c..95bae07f4a 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-2.12.0.args @@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-q35-2.12,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-q35-2.12,usb=3Doff,dump-guest-core=3Doff \ +-accel kvm \ -cpu Haswell-noTSX,vme=3Don,ss=3Don,f16c=3Don,rdrand=3Don,hypervisor=3Don,= arat=3Don,tsc-adjust=3Don,xsaveopt=3Don,pdpe1gb=3Don,abm=3Don \ -m 214 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-3.0.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-3.0.0.args index 8ae8db3af2..10deeac2c8 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-3.0.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-3.0.0.args @@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-q35-3.0,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-q35-3.0,usb=3Doff,dump-guest-core=3Doff \ +-accel kvm \ -cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,= clflushopt=3Don,umip=3Don,xsaves=3Don,pdpe1gb=3Don,topoext=3Don \ -m 214 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args index 917ab69cd1..f7e48be757 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args @@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-q35-3.1,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-q35-3.1,usb=3Doff,dump-guest-core=3Doff \ +-accel kvm \ -cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,= clflushopt=3Don,umip=3Don,xsaves=3Don,pdpe1gb=3Don \ -m 214 \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args index 39e2a20328..4c7fcf8a31 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args @@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-q35-4.0,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff \ +-accel kvm \ -cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,= clflushopt=3Don,umip=3Don,ssbd=3Don,xsaves=3Don,pdpe1gb=3Don \ -m 214 \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args index bda5f557d9..8e126568d0 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args @@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-q35-4.1,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-q35-4.1,usb=3Doff,dump-guest-core=3Doff \ +-accel kvm \ -cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,= clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabilities=3Don,s= sbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don \ -m 214 \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args index 3bb4c35894..4b2b55be62 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-q35-4.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \ +-accel kvm \ -cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,= clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabilities=3Don,s= sbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange-mc-no=3D= on \ -m 214 \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args index 3c4f006566..2ea818cc13 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-q35-5.0,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-q35-5.0,usb=3Doff,dump-guest-core=3Doff \ +-accel kvm \ -cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,= clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabilities=3Don,s= sbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange-mc-no=3D= on \ -m 214 \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args index 43f857cfff..c6e2f345b8 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-q35-5.1,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-q35-5.1,usb=3Doff,dump-guest-core=3Doff \ +-accel kvm \ -cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D= on,stibp=3Don,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 214 \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args index 91aa8d12f2..5bb6545e62 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-q35-5.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-bac= kend=3Dpc.ram \ +-machine pc-q35-5.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m \ +-accel kvm \ -cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D= on,stibp=3Don,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 214 \ -object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args index 82039f466a..57ae8a19d8 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc-q35-6.0,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-bac= kend=3Dpc.ram \ +-machine pc-q35-6.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m \ +-accel kvm \ -cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D= on,stibp=3Don,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 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args index e17f959809..baf0955027 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc-q35-6.1,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-bac= kend=3Dpc.ram \ +-machine pc-q35-6.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m \ +-accel kvm \ -cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D= on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy=3Don,= amd-ssbd=3Don,virt-ssbd=3Don,svme-addr-chk=3Don,rdctl-no=3Don,skip-l1dfl-vm= entry=3Don,mds-no=3Don,pschange-mc-no=3Don \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args b/tes= ts/qemuxml2argvdata/cpu-host-model.x86_64-latest.args index c2bf0d9834..7ed0ee28b8 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine q35,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= pc.ram \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ +-accel kvm \ -cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D= on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy=3Don,= amd-ssbd=3Don,virt-ssbd=3Don,svme-addr-chk=3Don,rdctl-no=3Don,skip-l1dfl-vm= entry=3Don,mds-no=3Don,pschange-mc-no=3Don \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args b/t= ests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args index 66ada24c92..ba1606704f 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args @@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-4.0,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff \ +-accel kvm \ -cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,= clflushopt=3Don,umip=3Don,ssbd=3Don,xsaves=3Don,pdpe1gb=3Don,invtsc=3Don,ts= c-frequency=3D4567890000 \ -m 214 \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-late= st.args b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.= args index 46d1b14535..e13a2be3f0 100644 --- a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-default-video-type-a= /.config \ -name guest=3Ddefault-video-type-aarch64-test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-default-video-type-a/master-key.aes"}' \ --machine virt,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,gic-version=3D3,= memory-backend=3Dmach-virt.ram \ +-machine virt,usb=3Doff,dump-guest-core=3Doff,gic-version=3D3,memory-backe= nd=3Dmach-virt.ram \ +-accel kvm \ -m 1024 \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.a= rgs b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args index baefa66718..25c5eb3140 100644 --- a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-default-video-type-p= /.config \ -name guest=3Ddefault-video-type-ppc64-test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-default-video-type-p/master-key.aes"}' \ --machine pseries,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backen= d=3Dppc_spapr.ram \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ +-accel kvm \ -cpu host \ -m 1024 \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":1073= 741824}' \ diff --git a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.a= rgs b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args index 5fee246959..d323e5abf4 100644 --- a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-default-video-type-s= /.config \ -name guest=3Ddefault-video-type-s390x-test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-default-video-type-s/master-key.aes"}' \ --machine s390-ccw-virtio,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memor= y-backend=3Ds390.ram \ +-machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ +-accel kvm \ -cpu gen15a-base,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag318=3Don,c= sske=3Don,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa5=3Don,msa= 4=3Don,msa3=3Don,msa2=3Don,msa1=3Don,sthyi=3Don,edat=3Don,ri=3Don,deflate= =3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,mepochptff=3Don,ap=3Don,vxe= h=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2=3Don,esort=3Don,apqi=3Don,= apft=3Don,els=3Don,iep=3Don,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,gs=3Don,p= pa15=3Don,zpci=3Don,sea_esop2=3Don,te=3Don,cmm=3Don \ -m 1024 \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":107374182= 4}' \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args b= /tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args index 659cca40ea..aca93dd5ea 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args @@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-accel kvm \ -m 1024 \ -realtime mlock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args index 437d8c210e..6bc09072eb 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ +-accel kvm \ -cpu qemu64 \ -m 1024 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args index fbd979139b..f98f0815ee 100644 --- a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ diff --git a/tests/qemuxml2argvdata/disk-serial.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-serial.x86_64-latest.args index 6ae7245743..be4ed131e3 100644 --- a/tests/qemuxml2argvdata/disk-serial.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-serial.x86_64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args index 538bff2583..541634b807 100644 --- a/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-f14/.config \ -name guest=3Df14,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-f14/master-key.aes"}' \ --machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ +-accel kvm \ -cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds-cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-lm=3Don \ -m 1024 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args= b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args index db70baf028..1d8ecbcf52 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -name guest=3Dfedora,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-fedora/master-key.aes"}' \ --machine pc-i440fx-2.9,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-= backend=3Dpc.ram \ +-machine pc-i440fx-2.9,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel kvm \ -cpu qemu64 \ -m 4096 \ -object '{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/dev/= hugepages2M/libvirt/qemu/-1-fedora","share":true,"x-use-canonical-path-for-= ramblock-id":false,"prealloc":true,"size":4294967296}' \ diff --git a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args = b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args index b45f94a40c..f61ff3f8ff 100644 --- a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine q35,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,kernel_irqchip=3D= split,memory-backend=3Dpc.ram \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,kernel_irqchip=3Dsplit,memory= -backend=3Dpc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.= args b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args index c5a2c995d5..083c6bfe4b 100644 --- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine q35,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,kernel_irqchip=3D= split,memory-backend=3Dpc.ram \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,kernel_irqchip=3Dsplit,memory= -backend=3Dpc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ diff --git a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.= args b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args index b138ff2dc5..fc06e15191 100644 --- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine q35,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,kernel_irqchip=3D= split,memory-backend=3Dpc.ram \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,kernel_irqchip=3Dsplit,memory= -backend=3Dpc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args b/te= sts/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args index 6068549126..c8dd31c5fe 100644 --- a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine q35,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,kernel_irqchip=3D= split,memory-backend=3Dpc.ram \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,kernel_irqchip=3Dsplit,memory= -backend=3Dpc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ diff --git a/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.ar= gs b/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args index 5f18bd7174..1bb7b3f084 100644 --- a/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args +++ b/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine s390-ccw-virtio,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,confi= dential-guest-support=3Dlsec0,memory-backend=3Ds390.ram \ +-machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,confidential-gues= t-support=3Dlsec0,memory-backend=3Ds390.ram \ +-accel kvm \ -cpu gen15a-base,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag318=3Don,c= sske=3Don,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa5=3Don,msa= 4=3Don,msa3=3Don,msa2=3Don,msa1=3Don,sthyi=3Don,edat=3Don,ri=3Don,deflate= =3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,mepochptff=3Don,ap=3Don,vxe= h=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2=3Don,esort=3Don,apqi=3Don,= apft=3Don,els=3Don,iep=3Don,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,gs=3Don,p= pa15=3Don,zpci=3Don,sea_esop2=3Don,te=3Don,cmm=3Don \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ diff --git a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-in= fo.x86_64-2.12.0.args b/tests/qemuxml2argvdata/launch-security-sev-missing-= platform-info.x86_64-2.12.0.args index daa271c35c..20ad935a68 100644 --- a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_= 64-2.12.0.args +++ b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_= 64-2.12.0.args @@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-1.0,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-encrypt= ion=3Dlsec0 \ +-machine pc-1.0,usb=3Doff,dump-guest-core=3Doff,memory-encryption=3Dlsec0 \ +-accel kvm \ -m 214 \ -realtime mlock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args = b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args index 818d29be9f..f7000ea11d 100644 --- a/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args @@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory= -encryption=3Dlsec0 \ +-machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff,memory-encryption= =3Dlsec0 \ +-accel kvm \ -m 214 \ -realtime mlock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/launch-security-sev.x86_64-6.0.0.args b= /tests/qemuxml2argvdata/launch-security-sev.x86_64-6.0.0.args index 812a8f5637..5dfaf69063 100644 --- a/tests/qemuxml2argvdata/launch-security-sev.x86_64-6.0.0.args +++ b/tests/qemuxml2argvdata/launch-security-sev.x86_64-6.0.0.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc-i440fx-6.0,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,confide= ntial-guest-support=3Dlsec0,memory-backend=3Dpc.ram \ +-machine pc-i440fx-6.0,usb=3Doff,dump-guest-core=3Doff,confidential-guest-= support=3Dlsec0,memory-backend=3Dpc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ 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 cbbcbbd9c0..383635c8cd 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 @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-instance-00000092/.c= onfig \ -name guest=3Dinstance-00000092,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-instance-00000092/master-key.aes"}' \ --machine pc-i440fx-2.3,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-2.3,usb=3Doff,dump-guest-core=3Doff \ +-accel kvm \ -cpu qemu64 \ -m 14336 \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/= tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args index 1d6bd50458..9d1f9831d9 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-instance-00000092/.c= onfig \ -name guest=3Dinstance-00000092,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-instance-00000092/master-key.aes"}' \ --machine pc-i440fx-2.3,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,nvdimm= =3Don \ +-machine pc-i440fx-2.3,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don \ +-accel kvm \ -cpu qemu64 \ -m size=3D14680064k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest= .args b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args index 8aedc9a8f8..62b31689d7 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ +-accel kvm \ -cpu qemu64 \ -m size=3D2095104k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0= .args b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args index fe30e39a7f..cdd6970f70 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-5.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-5.2,usb=3Doff,dump-guest-core=3Doff \ +-accel kvm \ -cpu qemu64 \ -m size=3D2095104k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ 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 7f2f3e7daf..5ac1031cdf 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ +-accel kvm \ -cpu qemu64 \ -m size=3D2095104k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args b/t= ests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args index 6e359db564..dd159e2604 100644 --- a/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -name guest=3Dfedora,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-fedora/master-key.aes"}' \ --machine pc-q35-4.0,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-bac= kend=3Dpc.ram \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m \ +-accel kvm \ -cpu qemu64 \ -bios /usr/share/seabios/bios-256k.bin \ -m 8 \ diff --git a/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.x86_64= -latest.args b/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.x86_= 64-latest.args index 647dc632d6..57fc34cc4d 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.x86_64-latest= .args @@ -14,7 +14,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora= _VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disc= ard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,pflash0=3D= libvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,memory-backend=3Dpc= .ram \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,pflash0=3Dlibvirt-pfla= sh0-format,pflash1=3Dlibvirt-pflash1-format,memory-backend=3Dpc.ram \ +-accel kvm \ -cpu qemu64 \ -m 8 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \ diff --git a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args index e5d5886569..fdbf8deabe 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args @@ -14,7 +14,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora= _VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disc= ard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,accel=3Dkvm,usb=3Doff,smm=3Don,dump-guest-core=3Doff,p= flash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,memory-bac= kend=3Dpc.ram \ +-machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,pflash0=3Dlib= virt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,memory-backend=3Dpc.ra= m \ +-accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ -m 8 \ diff --git a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args b/te= sts/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args index a8bd9a2fe1..470fe31256 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args @@ -14,7 +14,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora= _VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disc= ard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,accel=3Dkvm,usb=3Doff,smm=3Don,dump-guest-core=3Doff,p= flash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,memory-bac= kend=3Dpc.ram \ +-machine pc-q35-4.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,pflash0=3Dlib= virt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,memory-backend=3Dpc.ra= m \ +-accel kvm \ -cpu qemu64 \ -m 8 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \ diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.arg= s b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args index 98c8c4c985..f9f9cde4e7 100644 --- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc= 64-latest.args index d9e1d24f65..65ba777f02 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest= .args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ --machine pseries-2.7,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-ba= ckend=3Dppc_spapr.ram \ +-machine pseries-2.7,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_= spapr.ram \ +-accel kvm \ -cpu POWER9 \ -m 4096 \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":4294= 967296}' \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc= 64-latest.args index 4ca2cfb960..0e01aa595d 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest= .args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ --machine pseries-3.1,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-ba= ckend=3Dppc_spapr.ram \ +-machine pseries-3.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_= spapr.ram \ +-accel kvm \ -cpu POWER9 \ -m 4096 \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":4294= 967296}' \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc= 64-latest.args index edb5806e9e..a44dac6afd 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest= .args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ --machine pseries-4.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-ba= ckend=3Dppc_spapr.ram \ +-machine pseries-4.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_= spapr.ram \ +-accel kvm \ -cpu POWER9 \ -m 4096 \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":4294= 967296}' \ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s39= 0x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7= .s390x-latest.args index 97983b2bc1..5aa9c7b142 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-late= st.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-late= st.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -name guest=3Dtest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test/master-key.aes"}' \ --machine s390-ccw-virtio-2.7,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,m= emory-backend=3Ds390.ram \ +-machine s390-ccw-virtio-2.7,usb=3Doff,dump-guest-core=3Doff,memory-backen= d=3Ds390.ram \ +-accel kvm \ -cpu host \ -m 256 \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456= }' \ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s39= 0x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2= .s390x-latest.args index 3eb4b4e793..db03ab2672 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-late= st.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-late= st.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -name guest=3Dtest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test/master-key.aes"}' \ --machine s390-ccw-virtio-4.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,m= emory-backend=3Ds390.ram \ +-machine s390-ccw-virtio-4.2,usb=3Doff,dump-guest-core=3Doff,memory-backen= d=3Ds390.ram \ +-accel kvm \ -cpu gen15a-base,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag318=3Don,c= sske=3Don,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa5=3Don,msa= 4=3Don,msa3=3Don,msa2=3Don,msa1=3Don,sthyi=3Don,edat=3Don,ri=3Don,deflate= =3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,mepochptff=3Don,ap=3Don,vxe= h=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2=3Don,esort=3Don,apqi=3Don,= apft=3Don,els=3Don,iep=3Don,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,gs=3Don,p= pa15=3Don,zpci=3Don,sea_esop2=3Don,te=3Don,cmm=3Don \ -m 256 \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456= }' \ diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-lates= t.args b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.ar= gs index 9ce09ff962..5b1e4e6161 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ diff --git a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args b/tes= ts/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args index 266d92b309..f8b98899c5 100644 --- a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ 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 7c4d2fe34d..e6e7ab3b6a 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 @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ --machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ +-accel kvm \ -cpu qemu64 \ -m 14336 \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-5.2.0.args b/= tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-5.2.0.args index 11cf01cd30..b22452dee7 100644 --- a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-5.2.0.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-5.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-= backend=3Dpc.ram \ +-machine pc-i440fx-5.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args b= /tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args index a3eff223b3..a0aeb74319 100644 --- a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-5.2.0.args b= /tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-5.2.0.args index bc23c6838b..def06e7cd3 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-5.2.0.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-5.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-= backend=3Dpc.ram \ +-machine pc-i440fx-5.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args index 51f6c22d0e..b5611e9fe4 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-la= test.args b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-lat= est.args index bbbd0ad05c..114cc06f46 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.ar= gs @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ --machine pc-i440fx-4.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-= backend=3Dpc.ram \ +-machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel kvm \ -cpu qemu64 \ -m 4096 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-l= atest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-l= atest.args index dbeb0c87a6..0368ecc699 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.a= rgs @@ -10,7 +10,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ --machine pc-q35-4.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-bac= kend=3Dpc.ram \ +-machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m \ +-accel kvm \ -cpu qemu64 \ -m 4096 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ --=20 2.27.0 From nobody Thu Apr 25 14:33:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 163739691521436.511027435921164; Sat, 20 Nov 2021 00:28:35 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-211-d4d-zQ8tOzmrKpC6cW2ODw-1; Sat, 20 Nov 2021 03:28:26 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8973B1023F4D; Sat, 20 Nov 2021 08:28: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 67EF419C79; Sat, 20 Nov 2021 08:28:21 +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 399B81832E88; Sat, 20 Nov 2021 08:28:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1AK8SAA1002983 for ; Sat, 20 Nov 2021 03:28:10 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1E9692026D64; Sat, 20 Nov 2021 08:28:10 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 19C4A2026D5D for ; Sat, 20 Nov 2021 08:28:07 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 333398001EA for ; Sat, 20 Nov 2021 08:28:06 +0000 (UTC) Received: from chinatelecom.cn (prt-mail.chinatelecom.cn [42.123.76.226]) by relay.mimecast.com with ESMTP id us-mta-424-2obb_qSNOrePIcnZCkbVFg-1; Sat, 20 Nov 2021 03:28:00 -0500 Received: from clientip-182.138.181.165 (unknown [172.18.0.188]) by chinatelecom.cn (HERMES) with SMTP id 16FA22800AE; Sat, 20 Nov 2021 16:20:55 +0800 (CST) Received: from ([172.18.0.188]) by app0023 with ESMTP id 5ee5ce3bce9141ef8fa3010bf4511a06 for libvir-list@redhat.com; Sat, 20 Nov 2021 16:21:00 CST X-MC-Unique: d4d-zQ8tOzmrKpC6cW2ODw-1 X-MC-Unique: 2obb_qSNOrePIcnZCkbVFg-1 HMM_SOURCE_IP: 172.18.0.188:46282.1299073927 HMM_ATTACHE_NUM: 0000 HMM_SOURCE_TYPE: SMTP X-189-SAVE-TO-SEND: +huangy81@chinatelecom.cn X-Transaction-ID: 5ee5ce3bce9141ef8fa3010bf4511a06 X-Real-From: huangy81@chinatelecom.cn X-Receive-IP: 172.18.0.188 X-MEDUSA-Status: 0 From: huangy81@chinatelecom.cn To: libvir-list@redhat.com Subject: [PATCH v6 3/4] conf: introduce dirty_ring_size field Date: Sat, 20 Nov 2021 03:20:47 -0500 Message-Id: <02770554366eabfb954a7935f643cf4eb2252086.1637395523.git.huangy81@chinatelecom.cn> In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 1AK8SAA1002983 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?J=C3=A1n=20Tomko?= , Han Han , Hyman X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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-ZM-MESSAGEID: 1637396915666100001 From: Hyman Huang(=E9=BB=84=E5=8B=87) introduce dirty_ring_size in struct "_virDomainDef" to hold the ring size configured by user, and pass dirty_ring_size when building qemu commandline if dirty ring feature enabled. Signed-off-by: Hyman Huang(=E9=BB=84=E5=8B=87) --- src/conf/domain_conf.c | 76 ++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 4 +++ src/qemu/qemu_command.c | 3 ++ 3 files changed, 82 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index deb32b3f6b..80a124557e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -205,6 +205,7 @@ VIR_ENUM_IMPL(virDomainKVM, "hint-dedicated", "poll-control", "pv-ipi", + "dirty-ring", ); =20 VIR_ENUM_IMPL(virDomainXen, @@ -4826,6 +4827,18 @@ virDomainDefPostParseMemtune(virDomainDef *def) } =20 =20 +static void +virDomainDefPostParseFeatures(virDomainDef *def) +{ + if (def->features[VIR_DOMAIN_FEATURE_KVM] =3D=3D VIR_TRISTATE_SWITCH_O= N && + def->kvm_features[VIR_DOMAIN_KVM_DIRTY_RING] =3D=3D VIR_TRISTATE_S= WITCH_ON && + def->dirty_ring_size =3D=3D 0) { + /* set 4096 as default size if dirty ring size not congfigured */ + def->dirty_ring_size =3D 4096; + } +} + + static int virDomainDefAddConsoleCompat(virDomainDef *def) { @@ -6062,6 +6075,8 @@ virDomainDefPostParseCommon(virDomainDef *def, =20 virDomainDefPostParseMemtune(def); =20 + virDomainDefPostParseFeatures(def); + if (virDomainDefRejectDuplicateControllers(def) < 0) return -1; =20 @@ -17566,8 +17581,10 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def, =20 static int virDomainFeaturesKVMDefParse(virDomainDef *def, + xmlXPathContextPtr ctxt, xmlNodePtr node) { + xmlNodePtr tmp_node =3D ctxt->node; def->features[VIR_DOMAIN_FEATURE_KVM] =3D VIR_TRISTATE_SWITCH_ON; =20 node =3D xmlFirstElementChild(node); @@ -17589,9 +17606,37 @@ virDomainFeaturesKVMDefParse(virDomainDef *def, =20 def->kvm_features[feature] =3D value; =20 + /* dirty ring feature should parse size property */ + if ((virDomainKVM) feature =3D=3D VIR_DOMAIN_KVM_DIRTY_RING) { + if (((virDomainKVM) feature) =3D=3D VIR_DOMAIN_KVM_DIRTY_RING = && + value =3D=3D VIR_TRISTATE_SWITCH_ON) { + ctxt->node =3D node; + + if (virXMLPropString(node, "size")) { + if (virXPathUInt("string(./@size)", ctxt, + &def->dirty_ring_size) < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid number of dirty ring size= ")); + return -1; + } + + if ((def->dirty_ring_size & (def->dirty_ring_size - 1)= ) !=3D 0 || + def->dirty_ring_size < 1024 || + def->dirty_ring_size > 65536) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("dirty ring must be power of 2 " + "and ranges [1024, 65536]")); + return -1; + } + } + } + } + node =3D xmlNextElementSibling(node); } =20 + ctxt->node =3D tmp_node; + return 0; } =20 @@ -17741,7 +17786,7 @@ virDomainFeaturesDefParse(virDomainDef *def, break; =20 case VIR_DOMAIN_FEATURE_KVM: - if (virDomainFeaturesKVMDefParse(def, nodes[i]) < 0) + if (virDomainFeaturesKVMDefParse(def, ctxt, nodes[i]) < 0) return -1; break; =20 @@ -21836,7 +21881,27 @@ virDomainDefFeaturesCheckABIStability(virDomainDef= *src, virTristateSwitchTypeToString(dst->kvm_= features[i])); return false; } + break; =20 + case VIR_DOMAIN_KVM_DIRTY_RING: + if (src->kvm_features[i] !=3D dst->kvm_features[i]) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("State of KVM feature '%s' differs: " + "source: '%s', destination: '%s'"), + virDomainKVMTypeToString(i), + virTristateSwitchTypeToString(src->kvm_= features[i]), + virTristateSwitchTypeToString(dst->kvm_= features[i])); + return false; + } + + if (src->dirty_ring_size !=3D dst->dirty_ring_size) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("dirty ring size of KVM feature '%s' = differs: " + "source: '%d', destination: '%d'"), + virDomainKVMTypeToString(i), + src->dirty_ring_size, dst->dirty_ring_s= ize); + return false; + } break; =20 case VIR_DOMAIN_KVM_LAST: @@ -27884,6 +27949,15 @@ virDomainDefFormatFeatures(virBuffer *buf, def->kvm_features[j])); break; =20 + case VIR_DOMAIN_KVM_DIRTY_RING: + if (def->kvm_features[j] !=3D VIR_TRISTATE_SWITCH_ABSE= NT) { + virBufferAsprintf(&childBuf, "<%s state=3D'%s' siz= e=3D'%d'/>\n", + virDomainKVMTypeToString(j), + virTristateSwitchTypeToString(de= f->kvm_features[j]), + def->dirty_ring_size); + } + break; + case VIR_DOMAIN_KVM_LAST: break; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 8634960313..026edde88f 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2084,6 +2084,7 @@ typedef enum { VIR_DOMAIN_KVM_DEDICATED, VIR_DOMAIN_KVM_POLLCONTROL, VIR_DOMAIN_KVM_PVIPI, + VIR_DOMAIN_KVM_DIRTY_RING, =20 VIR_DOMAIN_KVM_LAST } virDomainKVM; @@ -2933,6 +2934,9 @@ struct _virDomainDef { should be re-run before starting */ =20 unsigned int scsiBusMaxUnit; + + /* size of dirty ring for each vcpu */ + unsigned int dirty_ring_size; }; =20 =20 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a8f73c2d3e..145596d11a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6860,6 +6860,9 @@ qemuBuildCpuCommandLine(virCommand *cmd, virBufferAddLit(&buf, ",kvm-pv-ipi=3Doff"); break; =20 + case VIR_DOMAIN_KVM_DIRTY_RING: + break; + case VIR_DOMAIN_KVM_LAST: break; } --=20 2.27.0 From nobody Thu Apr 25 14:33:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1637396943356997.8465744370785; Sat, 20 Nov 2021 00:29:03 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-210-MtuWashNMBySh2oLAjmd9g-1; Sat, 20 Nov 2021 03:28:16 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0E7A71023F4D; Sat, 20 Nov 2021 08:28:11 +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 CE86D19C79; Sat, 20 Nov 2021 08:28:10 +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 9D9691832E86; Sat, 20 Nov 2021 08:28:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1AK8S669002958 for ; Sat, 20 Nov 2021 03:28:07 -0500 Received: by smtp.corp.redhat.com (Postfix) id 08769112131B; Sat, 20 Nov 2021 08:28:06 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 034B91121315 for ; Sat, 20 Nov 2021 08:28:03 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 14894101CC60 for ; Sat, 20 Nov 2021 08:28:03 +0000 (UTC) Received: from chinatelecom.cn (prt-mail.chinatelecom.cn [42.123.76.226]) by relay.mimecast.com with ESMTP id us-mta-259-G7j8fZ8_MyKmeUEJFNWe4g-1; Sat, 20 Nov 2021 03:27:58 -0500 Received: from clientip-182.138.181.165 (unknown [172.18.0.188]) by chinatelecom.cn (HERMES) with SMTP id 775692800A4; Sat, 20 Nov 2021 16:20:57 +0800 (CST) Received: from ([172.18.0.188]) by app0023 with ESMTP id 2c95ece7f9274843929e78dd1c6990a9 for libvir-list@redhat.com; Sat, 20 Nov 2021 16:21:04 CST X-MC-Unique: MtuWashNMBySh2oLAjmd9g-1 X-MC-Unique: G7j8fZ8_MyKmeUEJFNWe4g-1 HMM_SOURCE_IP: 172.18.0.188:46282.1299073927 HMM_ATTACHE_NUM: 0000 HMM_SOURCE_TYPE: SMTP X-189-SAVE-TO-SEND: +huangy81@chinatelecom.cn X-Transaction-ID: 2c95ece7f9274843929e78dd1c6990a9 X-Real-From: huangy81@chinatelecom.cn X-Receive-IP: 172.18.0.188 X-MEDUSA-Status: 0 From: huangy81@chinatelecom.cn To: libvir-list@redhat.com Subject: [PATCH v6 4/4] qemu: support dirty ring feature Date: Sat, 20 Nov 2021 03:20:48 -0500 Message-Id: <34e5b8b08efad7c9c8256e9e7a02729199dc9ae4.1637395523.git.huangy81@chinatelecom.cn> In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 1AK8S669002958 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?J=C3=A1n=20Tomko?= , Han Han , Hyman X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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-ZM-MESSAGEID: 1637396944760100001 From: Hyman Huang(=E9=BB=84=E5=8B=87) dirty ring feature was introduced in qemu-6.1, this patch add corresponding feature named 'dirty-ring', which enable dirty ring feature when starting vm. to enable the feature, libvirt add "-accel dirty-ring-size=3Dxxx" to QEMU command line, the following XML needs to be added to the guest's domain description: if property "state=3Don" but property "size" not be configured, set default ring size with 4096. since dirty ring can only be enabled by specifying "-accel" option and do not support the legacy style, it seems that there's no other way to work around this, so we use "-accel" option to specify accelerator instead of "-machine" when building qemu commandline. details about the qemu "-accel" option: https://lore.kernel.org/qemu-devel/3aa73987-40e8-3619-0723-9f17f73850bd@red= hat.com/ Signed-off-by: Hyman Huang(=E9=BB=84=E5=8B=87) --- docs/formatdomain.rst | 18 ++++++++++-------- docs/schemas/domaincommon.rng | 10 ++++++++++ src/qemu/qemu_command.c | 6 ++++++ 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index eb8c973cf1..ea69b61c70 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -1843,6 +1843,7 @@ Hypervisors may allow certain CPU / machine features = to be toggled on/off. + @@ -1925,14 +1926,15 @@ are: ``kvm`` Various features to change the behavior of the KVM hypervisor. =20 - =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D - Feature Description = Value Since - =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D - hidden Hide the KVM hypervisor from standard MSR based discover= y on, off :since:`1.2.8 (QEMU 2.1.0)` - hint-dedicated Allows a guest to enable optimizations when running on d= edicated vCPUs on, off :since:`5.7.0 (QEMU 2.12.0)` - poll-control Decrease IO completion latency by introducing a grace pe= riod of busy waiting on, off :since:`6.10.0 (QEMU 4.2)` - pv-ipi Paravirtualized send IPIs = on, off :since:`7.10.0 (QEMU 3.1)` - =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D + Feature Description = Value = Since + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D + hidden Hide the KVM hypervisor from standard MSR based discover= y on, off = :since:`1.2.8 (QEMU 2.1.0)` + hint-dedicated Allows a guest to enable optimizations when running on d= edicated vCPUs on, off = :since:`5.7.0 (QEMU 2.12.0)` + poll-control Decrease IO completion latency by introducing a grace pe= riod of busy waiting on, off = :since:`6.10.0 (QEMU 4.2)` + pv-ipi Paravirtualized send IPIs = on, off = :since:`7.10.0 (QEMU 3.1)` + dirty-ring Enable dirty ring feature = on, off; size - must be power of 2, range [1024,65536]= :since:`7.10.0 (QEMU 6.1)` + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D =20 ``xen`` Various features to change the behavior of the Xen hypervisor. diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f01b7a6470..5f9fe3cc58 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -7212,6 +7212,16 @@ + + + + + + + + + + diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 145596d11a..863876bfae 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7043,6 +7043,12 @@ qemuBuildAccelCommandLineKvmOptions(virCommand *cmd, g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virCommandAddArg(cmd, "-accel"); virBufferAddLit(&buf, "kvm"); + + if (def->features[VIR_DOMAIN_FEATURE_KVM] =3D=3D VIR_TRISTATE_SWIT= CH_ON && + def->kvm_features[VIR_DOMAIN_KVM_DIRTY_RING] =3D=3D VIR_TRISTA= TE_SWITCH_ON) { + virBufferAsprintf(&buf, ",dirty-ring-size=3D%d", def->dirty_ri= ng_size); + } + virCommandAddArgBuffer(cmd, &buf); } } --=20 2.27.0