From nobody Tue Apr 30 19:20:11 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1616164508; cv=none; d=zohomail.com; s=zohoarc; b=jKo/w+A6f2PuahAGG2F4m8W3lCRpVbHU5IDX9NcdJRUHWXjg8mLGnmbnzGve2YaOnRsAYd/DWsd9h5XCZ2I8riEUnRu8QPwA2lIlX/2WMtjRDxULzOcBakOssfmJSr17cLmmp15dYyrnFJXBj1EDQeLvs7a7YciIpm/Ecy/qBRo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616164508; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cuPC2EJGBpO2jb8KtKak3LL9LQb4JBnBrJd19exWPg4=; b=YTUzIa11/0R5hKZ8V40sR47Rz8hpnReI1TJUugGTYgoJ7Ins8RkigMbkkAltNl/q1JGvHNQaoQxAt7XOUcSeDcW8MqYnrUFSXCxdxE04qVixMl6xqFJBkwW334V6UA+p3/KJWQ3e7MfunIiruoSXi2YIZnfkujbppxjh1/Q5IVM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1616164508318586.2539021535326; Fri, 19 Mar 2021 07:35:08 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-205-ayqvYqISP2OhYkv20P1dKA-1; Fri, 19 Mar 2021 10:34:10 -0400 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 690281009465; Fri, 19 Mar 2021 14:34:03 +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 3490D610F3; Fri, 19 Mar 2021 14:34:03 +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 DEF854A7C9; Fri, 19 Mar 2021 14:34:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JEXoJb027499 for ; Fri, 19 Mar 2021 10:33:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 80C655D72F; Fri, 19 Mar 2021 14:33:50 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id D51CE5D72E for ; Fri, 19 Mar 2021 14:33:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616164507; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=cuPC2EJGBpO2jb8KtKak3LL9LQb4JBnBrJd19exWPg4=; b=AQWO0z1d2O49AQMe0uTGhm6uI7guVqGbbyu8KhAUcdIeVJSlCnofcuyIZdoD5fkBoGsHp5 ydbQUdlh6r2QXsHlOVXZyQj+eLBchKpBcfdnaPkCbdFj3aY0yAdSrOgy1R9I3kLSzP6EXL zufokIhH5Xv2Vh65veXnPRTEUIMfpsE= X-MC-Unique: ayqvYqISP2OhYkv20P1dKA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v4 01/13] qemuxml2argvdata: Remove unused output file 'disk-network-tlsx509.x86_64-latest.args' Date: Fri, 19 Mar 2021 15:33:32 +0100 Message-Id: <016fee176e21f703606df157d8e5643eee131bfe.1616164286.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- .../disk-network-tlsx509.x86_64-latest.args | 90 ------------------- 1 file changed, 90 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-late= st.args diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args deleted file mode 100644 index 4ac7e270d4..0000000000 --- a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args +++ /dev/null @@ -1,90 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --cpu qemu64 \ --m 214 \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --object secret,id=3Dobjlibvirt-4-storage_tls0-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ --object tls-creds-x509,id=3Dobjlibvirt-4-storage_tls0,\ -dir=3D/etc/pki/libvirt-vxhs/dummy,,path,endpoint=3Dclient,verify-peer=3Don= ,\ -passwordid=3Dobjlibvirt-4-storage_tls0-secret0 \ --blockdev '{"driver":"vxhs","tls-creds":"objlibvirt-4-storage_tls0",\ -"vdisk-id":"eb90327c-8302-4725-9e1b-4e85ed4dc251",\ -"server":{"host":"192.168.0.1","port":"9999"},"node-name":"libvirt-4-stora= ge",\ -"cache":{"direct":true,"no-flush":false},"auto-read-only":true,\ -"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-4-format","read-only":false,\ -"cache":{"direct":true,"no-flush":false},"driver":"raw",\ -"file":"libvirt-4-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-4-format,\ -id=3Dvirtio-disk0,bootindex=3D1,write-cache=3Don,\ -serial=3Deb90327c-8302-4725-9e1b-4e85ed4dc251 \ --object secret,id=3Dobjlibvirt-3-storage_tls0-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ --object tls-creds-x509,id=3Dobjlibvirt-3-storage_tls0,\ -dir=3D/etc/pki/libvirt-vxhs/dummy,,path,endpoint=3Dclient,verify-peer=3Don= ,\ -passwordid=3Dobjlibvirt-3-storage_tls0-secret0 \ --blockdev '{"driver":"vxhs","tls-creds":"objlibvirt-3-storage_tls0",\ -"vdisk-id":"eb90327c-8302-4725-9e1b-4e85ed4dc252",\ -"server":{"host":"192.168.0.2","port":"9999"},"node-name":"libvirt-3-stora= ge",\ -"cache":{"direct":true,"no-flush":false},"auto-read-only":true,\ -"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":false,\ -"cache":{"direct":true,"no-flush":false},"driver":"raw",\ -"file":"libvirt-3-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-3-format,\ -id=3Dvirtio-disk1,write-cache=3Don,serial=3Deb90327c-8302-4725-9e1b-4e85ed= 4dc252 \ --blockdev '{"driver":"vxhs","vdisk-id":"eb90327c-8302-4725-9e1b-4e85ed4dc2= 53",\ -"server":{"host":"192.168.0.3","port":"9999"},"node-name":"libvirt-2-stora= ge",\ -"cache":{"direct":true,"no-flush":false},"auto-read-only":true,\ -"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,\ -"cache":{"direct":true,"no-flush":false},"driver":"raw",\ -"file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-2-format,\ -id=3Dvirtio-disk2,write-cache=3Don,serial=3Deb90327c-8302-4725-9e1b-4e85ed= 4dc252 \ --object secret,id=3Dobjlibvirt-1-storage_tls0-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ --object tls-creds-x509,id=3Dobjlibvirt-1-storage_tls0,\ -dir=3D/etc/pki/libvirt-nbd/dummy,,path,endpoint=3Dclient,verify-peer=3Don,\ -passwordid=3Dobjlibvirt-1-storage_tls0-secret0 \ --blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.com",\ -"port":"1234"},"tls-creds":"objlibvirt-1-storage_tls0",\ -"node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},\ -"auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,\ -"cache":{"direct":true,"no-flush":false},"driver":"raw",\ -"file":"libvirt-1-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1-format,\ -id=3Dvirtio-disk3,write-cache=3Don \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ -resourcecontrol=3Ddeny \ --msg timestamp=3Don --=20 2.29.2 From nobody Tue Apr 30 19:20:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1616164569; cv=none; d=zohomail.com; s=zohoarc; b=NTF3c/9PDmSOChY3CcCJvaOxGYksJdqoY9wyDx87JJHalu9VxCCAWcnWEQUMvAL+uOF+6VVr4OJiCYfcAUMqCEqlS41ZTKVJZazqsxxv8HIUBFvlv6ukffNMBdXcmCb1txf1oJ78iph09Tr99l6A7AKSucJqMBB9qGfks9Iq95w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616164569; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/j1k66FDxsytNfoQwE+nrvjY08DIKp+/w9CeZRGkR0w=; b=TeSYQq7IAS64f2SC8uQB1KQS4ES1NxHLJawVVeS4GGQ2Iv5dFRIc4KohjzsRGmHoB2lsf8LObDVxaw+qpqdE1k2yrJevriBgeTbykn1Ob6AThpawr53xLCXJCVajK5X0lWkVhp8fvVuDf/zWPBwDrcpjTlOZz1qiRk0LhOeVJww= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1616164569593361.0249689835106; Fri, 19 Mar 2021 07:36:09 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-173-uEGK2eiGPdKcWXIw8opHZw-1; Fri, 19 Mar 2021 10:34:14 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 552D681622; Fri, 19 Mar 2021 14:34:08 +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 1C8E750C0D; Fri, 19 Mar 2021 14:34:08 +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 9BAF34A701; Fri, 19 Mar 2021 14:34:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JEXpiC027507 for ; Fri, 19 Mar 2021 10:33:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 875375D72F; Fri, 19 Mar 2021 14:33:51 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id E71645D72E for ; Fri, 19 Mar 2021 14:33:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616164568; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=/j1k66FDxsytNfoQwE+nrvjY08DIKp+/w9CeZRGkR0w=; b=Q6Do227SoyGcsxNYtC/+fc0Fl1AcZTO7rJmEIrMBuKvOU0kctlsA6A8fBRIW3OvmpcNs2U SV7OmeDRLvNczuJ+XNMtTUX3BJSTic1jda77syz1I/oibOkw96lT7Tt4LhF9mJlZYIHGMX GR8d5t1moNYapEshcmQ4hOUo59PznZQ= X-MC-Unique: uEGK2eiGPdKcWXIw8opHZw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v4 02/13] virQEMUQAPISchemaTraverse: Fix quoting in comment Date: Fri, 19 Mar 2021 15:33:33 +0100 Message-Id: <3697b3a4199db6413448cd0f720f1b433941b496.1616164286.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" It tripped up highlighter in my editor. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_qapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c index f7e4ca9324..f4047f507a 100644 --- a/src/qemu/qemu_qapi.c +++ b/src/qemu/qemu_qapi.c @@ -402,7 +402,7 @@ virQEMUQAPISchemaTraverse(const char *baseName, * 'subattribute': selects a plain object member named 'subattribute' * '*subattribute': same as above but the selected member must be option= al * (has a property named 'default' in the schema) - * '+variant": In the case of unionized objects, select a specific varia= nt of + * '+variant': In the case of unionized objects, select a specific varia= nt of * the previously selected member * * - Boolean queries - @entry remains NULL, return value indicates success: --=20 2.29.2 From nobody Tue Apr 30 19:20:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1616164446; cv=none; d=zohomail.com; s=zohoarc; b=b5dR+U6E3fWH2l2zJvTvA6u5trN8VQtbUF5S4fd8kZDpXO2KwhyDmj8F0+RDqUxrFxSDhJxzLW3Q4Aa3Xm82ODldVgFvd7fF9Yhq/vP2Copku6S0tpyQyO78uFWeS40jZQ+vL94WEkJRB6gax7G3Bg1vYSXJ9yuMVq0GMwA+s8Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616164446; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LXSwhJXM+KNtC3oup4rFmV/rdekaIjvDIP3kw3uhqdY=; b=L3LcpmovU9mMgyjv+lEcT2ZM5rXKDDEF5rQ6v+BLlF7WhHeglowuxBj/IOLsO1d5lWSYZjqrEDnaN/A9rlZgEjW5THtV+LezU72E5q66vswY+3BXLuO+yxWOiQUlIQ12QGXF2mjzf0dQxmwnMKFilM92B99qMvKlUW+b7aPnJwU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1616164446463954.6350730416405; Fri, 19 Mar 2021 07:34:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-27-xHlnRyQ9Ovy9z9FhD7tKTw-1; Fri, 19 Mar 2021 10:34:01 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 025CE81623; Fri, 19 Mar 2021 14:33:55 +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 CC8D75C1D1; Fri, 19 Mar 2021 14:33:54 +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 89F674BB7C; Fri, 19 Mar 2021 14:33:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JEXqFZ027519 for ; Fri, 19 Mar 2021 10:33:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9E5305D72F; Fri, 19 Mar 2021 14:33:52 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id F0C3E5D72E for ; Fri, 19 Mar 2021 14:33:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616164445; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=LXSwhJXM+KNtC3oup4rFmV/rdekaIjvDIP3kw3uhqdY=; b=SDP1jIPkfSqyGxa0xrh+ZSal4HjBreJlwFYefR3cRu23iZk6AT9uO15VG83Sm+eSCbx3YQ A0KslX/xZodQDkbLve6diA37wG4fuU/2Ob4GcoqTXSj5DWwJgB15jQzDrJmmZXWBYOBJyn RZLE2GgISkUgi1ePNVdSQFVgxycUNwM= X-MC-Unique: xHlnRyQ9Ovy9z9FhD7tKTw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v4 03/13] qemu: capabilities: Introduce QEMU_CAPS_OBJECT_QAPIFIED Date: Fri, 19 Mar 2021 15:33:34 +0100 Message-Id: <6ce53d1f0dcfcd30953f5692cab133a1638d2d91.1616164286.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Starting from qemu-6.0 the parameters of -object/object-add are formally described by the QAPI schema. Additionally this changes the nesting of the properties as the 'props' nested object will be flattened to the parent. We'll need to detect whether qemu switched to this new approach to generate the objects with proper nesting and also allow testing. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_capabilities.c | 1 + src/qemu/qemu_capabilities.h | 1 + 2 files changed, 2 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 447cf77875..1ae7b2b704 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -622,6 +622,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 395 */ "vnc-power-control", "audiodev", + "object.qapified", ); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ee321df66c..657044854a 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -602,6 +602,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ /* 395 */ QEMU_CAPS_VNC_POWER_CONTROL, /* -vnc power-control option */ QEMU_CAPS_AUDIODEV, /* -audiodev instead of QEMU_AUDIO_DRV */ + QEMU_CAPS_OBJECT_QAPIFIED, /* parameters for object-add are formally d= escribed */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; --=20 2.29.2 From nobody Tue Apr 30 19:20:11 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1616164446; cv=none; d=zohomail.com; s=zohoarc; b=hcFk441srs3euatvG2tzUOTz3AHAzSMmCkxl9Hck0nrMk1JDAeU1Xn6rP4b5iDeTiSV3+DOx94GzPNgGZ1QgOlm9NvIk6OdL1R+mLHz1Cp2r1OmhsIyRL0f6uL/vP5kiNGTb5Cmy0E2tf0TIlqBAfLx53RBgQDjOYPG5JogNs/c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616164446; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SnZ/u9Z+vz/0jWXxHkAaiF9kFwkiRwsY4QE0QYf8lic=; b=GKxeVvwEKoFBMAuLe2MS1oukccKvJtRE0rq62135DtCZlb3tniTPBS+zqAqd3D0QtRRcd+SXHErY/f3OLUQ8OGg+9oyjXQg5vEpzjEG7LjgA8JNeILUgnazd6nRVn8WYV8dMwWBsO3P1C30S2XWCxCgtYuOElVYPPIgRmLuasCw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 161616444643289.59116215126267; Fri, 19 Mar 2021 07:34:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-242-m73p7e-HMSOKczbjRV0pqg-1; Fri, 19 Mar 2021 10:34:03 -0400 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 C17CE814339; Fri, 19 Mar 2021 14:33:56 +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 9B49B60C04; Fri, 19 Mar 2021 14:33:56 +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 5519A1800216; Fri, 19 Mar 2021 14:33:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JEXrEW027527 for ; Fri, 19 Mar 2021 10:33:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id B1B355D72F; Fri, 19 Mar 2021 14:33:53 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 118775D72E for ; Fri, 19 Mar 2021 14:33:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616164445; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=SnZ/u9Z+vz/0jWXxHkAaiF9kFwkiRwsY4QE0QYf8lic=; b=LuVDiQoOuITJiW5GQJboj5aeWlqOPURKuvSrQA442jGWuG5Np6YDh3oL/Y3dgqvJP1GuW4 w4Gqc/YhbhK71E99RwgzKgUsNvy9oGDj0P+9uWiWcF/cCs21qht9bSB/iWDQb/DQ0baKvK 5+5xTPq0lIjUT//WinN/e1zCsrwQUvo= X-MC-Unique: m73p7e-HMSOKczbjRV0pqg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v4 04/13] qemu: monitor: Make wrapping of 'props' of 'object-add' optional Date: Fri, 19 Mar 2021 15:33:35 +0100 Message-Id: <421b8a40ad532d1fefe52f1ba5e6fe50972f6cc1.1616164286.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Construct the JSON object which is used for object-add without the 'props' wrapper and add the wrapper only in the monitor code. This simplifies the JSON->commandline generator in the first place and also prepares for upcoming qemu where 'props' will be removed. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_monitor.c | 68 +++++++++++++++++++++++++++++------------ src/util/virqemu.c | 34 ++++++--------------- 2 files changed, 58 insertions(+), 44 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index c43c6f180e..5a5a98d3e7 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -109,6 +109,9 @@ struct _qemuMonitor { qemuMonitorReportDomainLogError logFunc; void *logOpaque; virFreeCallback logDestroy; + + /* true if qemu no longer wants 'props' sub-object of object-add */ + bool objectAddNoWrap; }; /** @@ -3019,14 +3022,12 @@ qemuMonitorCreateObjectPropsWrap(const char *type, const char *alias, virJSONValuePtr *props) { - virJSONValuePtr ret; - ignore_value(virJSONValueObjectCreate(&ret, - "s:qom-type", type, - "s:id", alias, - "A:props", props, - NULL)); - return ret; + if (virJSONValueObjectPrependString(*props, "id", alias) < 0 || + virJSONValueObjectPrependString(*props, "qom-type", type)) + return NULL; + + return g_steal_pointer(props); } @@ -3046,26 +3047,28 @@ qemuMonitorCreateObjectProps(virJSONValuePtr *props= ret, const char *alias, ...) { - virJSONValuePtr props =3D NULL; - int ret =3D -1; + g_autoptr(virJSONValue) props =3D NULL; + int rc; va_list args; - *propsret =3D NULL; + if (virJSONValueObjectCreate(&props, + "s:qom-type", type, + "s:id", alias, + NULL) < 0) + return -1; + va_start(args, alias); - if (virJSONValueObjectCreateVArgs(&props, args) < 0) - goto cleanup; + rc =3D virJSONValueObjectAddVArgs(props, args); - if (!(*propsret =3D qemuMonitorCreateObjectPropsWrap(type, alias, &pro= ps))) - goto cleanup; + va_end(args); - ret =3D 0; + if (rc < 0) + return -1; - cleanup: - virJSONValueFree(props); - va_end(args); - return ret; + *propsret =3D g_steal_pointer(&props); + return 0; } @@ -3085,6 +3088,7 @@ qemuMonitorAddObject(qemuMonitorPtr mon, virJSONValuePtr *props, char **alias) { + g_autoptr(virJSONValue) pr =3D NULL; const char *type =3D NULL; const char *id =3D NULL; g_autofree char *aliasCopy =3D NULL; @@ -3112,7 +3116,31 @@ qemuMonitorAddObject(qemuMonitorPtr mon, if (alias) aliasCopy =3D g_strdup(id); - if (qemuMonitorJSONAddObject(mon, props) < 0) + if (mon->objectAddNoWrap) { + pr =3D g_steal_pointer(props); + } else { + /* we need to create a wrapper which has the 'qom-type' and 'id' a= nd + * store everything else under a 'props' sub-object */ + g_autoptr(virJSONValue) typeobj =3D NULL; + g_autoptr(virJSONValue) idobj =3D NULL; + + ignore_value(virJSONValueObjectRemoveKey(*props, "qom-type", &type= obj)); + ignore_value(virJSONValueObjectRemoveKey(*props, "id", &idobj)); + + if (!virJSONValueObjectGetKey(*props, 0)) { + virJSONValueFree(*props); + *props =3D NULL; + } + + if (virJSONValueObjectCreate(&pr, + "s:qom-type", type, + "s:id", id, + "A:props", props, + NULL) < 0) + return -1; + } + + if (qemuMonitorJSONAddObject(mon, &pr) < 0) return -1; if (alias) diff --git a/src/util/virqemu.c b/src/util/virqemu.c index 57ee42dd16..a206da1852 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -303,12 +303,13 @@ virQEMUBuildNetdevCommandlineFromJSON(virJSONValuePtr= props, } -static int -virQEMUBuildObjectCommandlineFromJSONInternal(virBufferPtr buf, - const char *type, - const char *alias, - virJSONValuePtr props) +int +virQEMUBuildObjectCommandlineFromJSON(virBufferPtr buf, + virJSONValuePtr objprops) { + const char *type =3D virJSONValueObjectGetString(objprops, "qom-type"); + const char *alias =3D virJSONValueObjectGetString(objprops, "id"); + if (!type || !alias) { virReportError(VIR_ERR_INTERNAL_ERROR, _("missing 'type'(%s) or 'alias'(%s) field of QOM '= object'"), @@ -316,31 +317,16 @@ virQEMUBuildObjectCommandlineFromJSONInternal(virBuff= erPtr buf, return -1; } - virBufferAsprintf(buf, "%s,id=3D%s", type, alias); + virBufferAsprintf(buf, "%s,", type); - if (props) { - virBufferAddLit(buf, ","); - if (virQEMUBuildCommandLineJSON(props, buf, NULL, - virQEMUBuildCommandLineJSONArrayBitmap) < = 0) - return -1; - } + if (virQEMUBuildCommandLineJSON(objprops, buf, "qom-type", + virQEMUBuildCommandLineJSONArrayBitmap= ) < 0) + return -1; return 0; } -int -virQEMUBuildObjectCommandlineFromJSON(virBufferPtr buf, - virJSONValuePtr objprops) -{ - const char *type =3D virJSONValueObjectGetString(objprops, "qom-type"); - const char *alias =3D virJSONValueObjectGetString(objprops, "id"); - virJSONValuePtr props =3D virJSONValueObjectGetObject(objprops, "props= "); - - return virQEMUBuildObjectCommandlineFromJSONInternal(buf, type, alias,= props); -} - - char * virQEMUBuildDriveCommandlineFromJSON(virJSONValuePtr srcdef) { --=20 2.29.2 From nobody Tue Apr 30 19:20:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1616164461; cv=none; d=zohomail.com; s=zohoarc; b=MX3yixhXaVi9QwdolKnZhOIRc11bgDvH6kGhSWXo8DsLoD2Z1DjdS/49XeBXTOLyW4EfYTq4b96FMU+42a2u16e1V+8zQvqxjLKc+7dekPW+srituzerRk34FZv7FoY9Z2uIup077mmmF3SWo6gRdEyKI04JHBYK1FjL7iJNaTo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616164461; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MZCh25WLkLiRwWAmkNCZ2Mad8E13XvdFqlLpi84z+mw=; b=aZIlF68Jazt5YgOimIhz7vbJMOGbxfNE3gfn1MgX6A8x3zRZMcRiTXrQJXIoaF/HUcLAymv1A8KHJYhH5l4+bvezEMPJftCDX7Nczt2+6RFKHhXReMs7ZTxshtpYA7icyTCIlIP88nGLIk/ju34xQJTVm/S33bByL4evnI1wfes= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1616164461490163.005875345631; Fri, 19 Mar 2021 07:34:21 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-412-q9y280V7OaGC6TBTdt9_lA-1; Fri, 19 Mar 2021 10:34:18 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A11CE81626; Fri, 19 Mar 2021 14:34:12 +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 7E38F5C3E6; Fri, 19 Mar 2021 14:34:12 +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 3AA1C180C5AA; Fri, 19 Mar 2021 14:34:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JEXsQ3027542 for ; Fri, 19 Mar 2021 10:33:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id C1D145D72F; Fri, 19 Mar 2021 14:33:54 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 288CD5D72E for ; Fri, 19 Mar 2021 14:33:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616164460; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=MZCh25WLkLiRwWAmkNCZ2Mad8E13XvdFqlLpi84z+mw=; b=YlpthrPvP/FNZA4ifjqpfhW9W1cv9r4va/4x/cTd7y4pmfh9tR4K6Rh92C7IMmgsZcnfgp SrQ9sHYd0RyKlFggxzDleKLLznpX3kRX2Z0DCzLS3wNK/1QBKrr7Htn5Mft8pxl8k4R0Kw kQ2TbUdW4CtdIfdr4tkYm2nDMjnl1oQ= X-MC-Unique: q9y280V7OaGC6TBTdt9_lA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v4 05/13] qemuMonitorCreateObjectPropsWrap: Open-code in qemuBuildMemoryBackendProps Date: Fri, 19 Mar 2021 15:33:36 +0100 Message-Id: <448699109cf707687c3b35bfc35227423a98d6ed.1616164286.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" There's just one caller left. Since qemuBuildMemoryBackendProps is too complex to be modified for now, just move the adding of 'id' and 'qom' type directly into the function. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 6 ++++-- src/qemu/qemu_monitor.c | 15 --------------- src/qemu/qemu_monitor.h | 4 ---- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5717f7b98d..b60f297331 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3284,10 +3284,12 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backen= dProps, rc =3D 0; } - if (!(*backendProps =3D qemuMonitorCreateObjectPropsWrap(backendType, = alias, - &props))) + if (virJSONValueObjectPrependString(props, "id", alias) < 0 || + virJSONValueObjectPrependString(props, "qom-type", backendType) < = 0) return -1; + *backendProps =3D g_steal_pointer(&props); + return rc; } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 5a5a98d3e7..d26ea94803 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3017,21 +3017,6 @@ qemuMonitorAddDeviceArgs(qemuMonitorPtr mon, } -virJSONValuePtr -qemuMonitorCreateObjectPropsWrap(const char *type, - const char *alias, - virJSONValuePtr *props) -{ - - if (virJSONValueObjectPrependString(*props, "id", alias) < 0 || - virJSONValueObjectPrependString(*props, "qom-type", type)) - return NULL; - - return g_steal_pointer(props); -} - - - /** * qemuMonitorCreateObjectProps: * @propsret: returns full object properties diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index c812aa9cc3..9106f966da 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1006,10 +1006,6 @@ int qemuMonitorAddDeviceWithFd(qemuMonitorPtr mon, int qemuMonitorDelDevice(qemuMonitorPtr mon, const char *devalias); -virJSONValuePtr qemuMonitorCreateObjectPropsWrap(const char *type, - const char *alias, - virJSONValuePtr *props); - int qemuMonitorCreateObjectProps(virJSONValuePtr *propsret, const char *type, const char *alias, --=20 2.29.2 From nobody Tue Apr 30 19:20:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1616164454; cv=none; d=zohomail.com; s=zohoarc; b=nFhntRvvS5IRtSaCEtII+qNRauhhj9b5slK+zEW4lf8zraIgaKUa9X4r4D9pk5N+FUi0xy/+lgf/IdrbgGrgEXaT299Bz6g20vyEPGI8WK8YVlZJ1igFH3wQYtRUswIiPJAUfkn0jOdn06aTws+A5rXo+vxdSr/G9j5XQkoPuH8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616164454; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FiNgJJZiyyhS4XCF8k4fCvzuqbjNL+VPcImr9USwjus=; b=iqeZ5tl4JAQXLbhdrC6vwg7mMineLWfuLVyTdx353b+yG6cd3Da5mThTwAFaUAQ7iOO0Ip1R4NablqPsMmwcXPyZ4OnHQdDOdcGTyXZbsitntfAulNpP1aQ9RB0WAlyKv5sFD1WSdOaHVOyOcwDwXvxmavRpg6vi1dahZHFxb5M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1616164454159106.69684973595201; Fri, 19 Mar 2021 07:34:14 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-366-oEPH4auPMYeG2OAPgD05zw-1; Fri, 19 Mar 2021 10:34:09 -0400 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 147D6180FCA4; Fri, 19 Mar 2021 14:34:02 +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 E0CE260C04; Fri, 19 Mar 2021 14:34:01 +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 993551802135; Fri, 19 Mar 2021 14:34:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JEXtiO027549 for ; Fri, 19 Mar 2021 10:33:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id CDD955D72E; Fri, 19 Mar 2021 14:33:55 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B1D05D740 for ; Fri, 19 Mar 2021 14:33:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616164452; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=FiNgJJZiyyhS4XCF8k4fCvzuqbjNL+VPcImr9USwjus=; b=c/AjxYGdGaX5/AdFAePmTJMdGrjEVuXfopGkBeeQefa+vqMlZhu4awrFou1C98xfBkXEgF IlyQt7PEpS6/kTqDum4tnhsnhfkz0n+F30rH6oysWYwtOFZwG/tNdVNHkHrWx2B8A9Bmlw j6oSMATu40Xo3qUcWkgYz26DMXwruA8= X-MC-Unique: oEPH4auPMYeG2OAPgD05zw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v4 06/13] qemu: monitor: Don't add 'props' wrapper if qemu has QEMU_CAPS_OBJECT_QAPIFIED Date: Fri, 19 Mar 2021 15:33:37 +0100 Message-Id: <02420ac04191cc12aa049fbd33d59bfd679f46d2.1616164286.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Set 'objectAddNoWrap' when the capability is present. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_monitor.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index d26ea94803..6b32c4cfe3 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -32,6 +32,7 @@ #include "qemu_monitor_json.h" #include "qemu_domain.h" #include "qemu_process.h" +#include "qemu_capabilities.h" #include "virerror.h" #include "viralloc.h" #include "virlog.h" @@ -672,6 +673,7 @@ qemuMonitorOpenInternal(virDomainObjPtr vm, qemuMonitorCallbacksPtr cb, void *opaque) { + qemuDomainObjPrivatePtr priv =3D vm->privateData; qemuMonitorPtr mon; g_autoptr(GError) gerr =3D NULL; @@ -704,6 +706,9 @@ qemuMonitorOpenInternal(virDomainObjPtr vm, mon->cb =3D cb; mon->callbackOpaque =3D opaque; + if (priv) + mon->objectAddNoWrap =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_= OBJECT_QAPIFIED); + if (virSetCloseExec(mon->fd) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to set monitor close-on-exec flag")= ); --=20 2.29.2 From nobody Tue Apr 30 19:20:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1616164505; cv=none; d=zohomail.com; s=zohoarc; b=V3+/nd29b/8tqopj80fkS5aykcXT9B7M0x31zo74k+9yZyxcXV9T1lSqZu+zpbypL6uJfujD6YopReWsbQnakKZu0nHFW3S0vDm5JvVZXWLNCPBt/4wDMQwGGJ+g8gfq7aA5HeWanmVB9FO6401IeDIRLcnEc3wAc9kUbL6clTM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616164505; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TaaAnks1Jacwk73geOQ84rX0SOirZ4iXT/MzpKo73F4=; b=kVUJ9AxCstT2yu/IWBXhuPQrqYcOqV5WHp9hsEmRejq9HabFvj43EmGAOfUORgHNf9oNob788xZoyuQ456CVrlyqJiJLEqtXNFcRXtbkvmeAdhJWd16Xv+XteqOABbHl+uyWnMoJAcQgxWygRtOeNq2/HYzVx9/2Bp+3kLcVvWY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1616164505110262.3203960550899; Fri, 19 Mar 2021 07:35:05 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-479-LhupM3eGO7yNhNMUew3zig-1; Fri, 19 Mar 2021 10:34:12 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 65FDA180FCA5; Fri, 19 Mar 2021 14:34:06 +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 EBEDB5D740; Fri, 19 Mar 2021 14:34:05 +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 973054A7CB; Fri, 19 Mar 2021 14:34:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JEXvwG027557 for ; Fri, 19 Mar 2021 10:33:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id 11D1D5D730; Fri, 19 Mar 2021 14:33:57 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44D955D72E for ; Fri, 19 Mar 2021 14:33:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616164504; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=TaaAnks1Jacwk73geOQ84rX0SOirZ4iXT/MzpKo73F4=; b=YyH5S4deV+RfTGbvnDhyv1N8dyRKwAs5yaGpht9MK/rAJQTNU5dpkVACNyEjRrHMOmtG/C FH2TE367Y9cUkSJuTPnMqqP4fdxx44qKPW+zqMf2WMebAqvHwWFhICaBZa6hab8FJVLFYA AAolFPrMMVoui0T7ieaG6mFNGtCx7Pc= X-MC-Unique: LhupM3eGO7yNhNMUew3zig-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v4 07/13] qemu: command: Use JSON for QAPIfied -object directly Date: Fri, 19 Mar 2021 15:33:38 +0100 Message-Id: <59f69e9adae19fc6645e6277c9adff7276928f81.1616164286.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Skip the lossy conversion to legacy commandline arguments by using the JSON props directly when -object is QAPIfied. This avoids issues with conversion of bitmaps and also allows validation of the generated JSON against the QMP schema in the tests. Since the new approach is triggered by a qemu capability the code from 'virQEMUBuildObjectCommandlineFromJSON' in util/virqemu.c was moved to 'qemuBuildObjectCommandlineFromJSON' in qemu/qemu_command.c which has the virQEMUCaps type. Some functions needed to be modified to propagate qemuCaps. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/libvirt_private.syms | 1 - src/qemu/qemu_command.c | 92 +++++++++++++++++++++++++++------------- src/util/virqemu.c | 24 ----------- src/util/virqemu.h | 3 -- 4 files changed, 63 insertions(+), 57 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 526dcee11a..c27a4a7d2e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3065,7 +3065,6 @@ virQEMUBuildCommandLineJSONArrayBitmap; virQEMUBuildCommandLineJSONArrayNumbered; virQEMUBuildDriveCommandlineFromJSON; virQEMUBuildNetdevCommandlineFromJSON; -virQEMUBuildObjectCommandlineFromJSON; # util/virrandom.h diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b60f297331..1b4fa77867 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -192,6 +192,31 @@ VIR_ENUM_IMPL(qemuAudioDriver, ); +static int +qemuBuildObjectCommandlineFromJSON(virBuffer *buf, + virJSONValue *props, + virQEMUCaps *qemuCaps) +{ + const char *type =3D virJSONValueObjectGetString(props, "qom-type"); + const char *alias =3D virJSONValueObjectGetString(props, "id"); + + if (!type || !alias) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("missing 'type'(%s) or 'alias'(%s) field of QOM '= object'"), + NULLSTR(type), NULLSTR(alias)); + return -1; + } + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_QAPIFIED)) { + return virJSONValueToBuffer(props, buf, false); + } else { + virBufferAsprintf(buf, "%s,", type); + + return virQEMUBuildCommandLineJSON(props, buf, "qom-type", + virQEMUBuildCommandLineJSONArra= yBitmap); + } +} + /** * qemuBuildMasterKeyCommandLine: @@ -238,7 +263,7 @@ qemuBuildMasterKeyCommandLine(virCommandPtr cmd, NULL) < 0) return -1; - if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0) + if (qemuBuildObjectCommandlineFromJSON(&buf, props, priv->qemuCaps) < = 0) return -1; virCommandAddArg(cmd, "-object"); @@ -714,6 +739,7 @@ qemuBuildSecretInfoProps(qemuDomainSecretInfoPtr secinf= o, * qemuBuildObjectSecretCommandLine: * @cmd: the command to modify * @secinfo: pointer to the secret info object + * @qemuCaps: qemu capabilities * * If the secinfo is available and associated with an AES secret, * then format the command line for the secret object. This object @@ -724,7 +750,8 @@ qemuBuildSecretInfoProps(qemuDomainSecretInfoPtr secinf= o, */ static int qemuBuildObjectSecretCommandLine(virCommandPtr cmd, - qemuDomainSecretInfoPtr secinfo) + qemuDomainSecretInfoPtr secinfo, + virQEMUCaps *qemuCaps) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; g_autoptr(virJSONValue) props =3D NULL; @@ -732,7 +759,7 @@ qemuBuildObjectSecretCommandLine(virCommandPtr cmd, if (qemuBuildSecretInfoProps(secinfo, &props) < 0) return -1; - if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0) + if (qemuBuildObjectCommandlineFromJSON(&buf, props, qemuCaps) < 0) return -1; virCommandAddArg(cmd, "-object"); @@ -901,7 +928,7 @@ qemuBuildTLSx509CommandLine(virCommandPtr cmd, certEncSecretAlias, qemuCaps, &props)= < 0) return -1; - if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0) + if (qemuBuildObjectCommandlineFromJSON(&buf, props, qemuCaps) < 0) return -1; virCommandAddArg(cmd, "-object"); @@ -1991,14 +2018,15 @@ qemuBuildFloppyCommandLineControllerOptions(virComm= andPtr cmd, static int qemuBuildObjectCommandline(virCommandPtr cmd, - virJSONValuePtr objProps) + virJSONValuePtr objProps, + virQEMUCaps *qemuCaps) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; if (!objProps) return 0; - if (virQEMUBuildObjectCommandlineFromJSON(&buf, objProps) < 0) + if (qemuBuildObjectCommandlineFromJSON(&buf, objProps, qemuCaps) < 0) return -1; virCommandAddArg(cmd, "-object"); @@ -2010,16 +2038,17 @@ qemuBuildObjectCommandline(virCommandPtr cmd, static int qemuBuildBlockStorageSourceAttachDataCommandline(virCommandPtr cmd, - qemuBlockStorageSourceAtt= achDataPtr data) + qemuBlockStorageSourceAtt= achDataPtr data, + virQEMUCaps *qemuCaps) { char *tmp; - if (qemuBuildObjectCommandline(cmd, data->prmgrProps) < 0 || - qemuBuildObjectCommandline(cmd, data->authsecretProps) < 0 || - qemuBuildObjectCommandline(cmd, data->encryptsecretProps) < 0 || - qemuBuildObjectCommandline(cmd, data->httpcookiesecretProps) < 0 || - qemuBuildObjectCommandline(cmd, data->tlsKeySecretProps) < 0 || - qemuBuildObjectCommandline(cmd, data->tlsProps) < 0) + if (qemuBuildObjectCommandline(cmd, data->prmgrProps, qemuCaps) < 0 || + qemuBuildObjectCommandline(cmd, data->authsecretProps, qemuCaps) <= 0 || + qemuBuildObjectCommandline(cmd, data->encryptsecretProps, qemuCaps= ) < 0 || + qemuBuildObjectCommandline(cmd, data->httpcookiesecretProps, qemuC= aps) < 0 || + qemuBuildObjectCommandline(cmd, data->tlsKeySecretProps, qemuCaps)= < 0 || + qemuBuildObjectCommandline(cmd, data->tlsProps, qemuCaps) < 0) return -1; if (data->driveCmd) @@ -2088,7 +2117,8 @@ qemuBuildDiskSourceCommandLine(virCommandPtr cmd, for (i =3D data->nsrcdata; i > 0; i--) { if (qemuBuildBlockStorageSourceAttachDataCommandline(cmd, - data->srcdata= [i - 1]) < 0) + data->srcdata= [i - 1], + qemuCaps) < 0) return -1; } @@ -3318,7 +3348,7 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def, priv, def, &mem, false, false)) = < 0) return -1; - if (virQEMUBuildObjectCommandlineFromJSON(buf, props) < 0) + if (qemuBuildObjectCommandlineFromJSON(buf, props, priv->qemuCaps) < 0) return -1; return rc; @@ -3347,7 +3377,7 @@ qemuBuildMemoryDimmBackendStr(virBufferPtr buf, priv, def, mem, true, false) < 0) return -1; - if (virQEMUBuildObjectCommandlineFromJSON(buf, props) < 0) + if (qemuBuildObjectCommandlineFromJSON(buf, props, priv->qemuCaps) < 0) return -1; return 0; @@ -4971,7 +5001,8 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, * functions can just check the config fields */ if (chrSourcePriv && chrSourcePriv->secinfo) { if (qemuBuildObjectSecretCommandLine(cmd, - chrSourcePriv->secinf= o) < 0) + chrSourcePriv->secinf= o, + qemuCaps) < 0) return NULL; tlsCertEncSecAlias =3D chrSourcePriv->secinfo->s.aes.alias; @@ -5209,7 +5240,7 @@ qemuBuildHostdevSCSICommandLine(virCommandPtr cmd, if (!(data =3D qemuBuildHostdevSCSIAttachPrepare(hostdev, &backendAlia= s, qemuCaps))) return -1; - if (qemuBuildBlockStorageSourceAttachDataCommandline(cmd, data) < 0) + if (qemuBuildBlockStorageSourceAttachDataCommandline(cmd, data, qemuCa= ps) < 0) return -1; virCommandAddArg(cmd, "-device"); @@ -5615,7 +5646,7 @@ qemuBuildRNGCommandLine(virLogManagerPtr logManager, if (qemuBuildRNGBackendProps(rng, &props) < 0) return -1; - rc =3D virQEMUBuildObjectCommandlineFromJSON(&buf, props); + rc =3D qemuBuildObjectCommandlineFromJSON(&buf, props, qemuCaps); if (rc < 0) return -1; @@ -7192,7 +7223,7 @@ qemuBuildMemCommandLineMemoryDefaultBackend(virComman= dPtr cmd, priv, def, &mem, false, true) < 0) return -1; - if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0) + if (qemuBuildObjectCommandlineFromJSON(&buf, props, priv->qemuCaps) < = 0) return -1; virCommandAddArg(cmd, "-object"); @@ -7265,7 +7296,8 @@ qemuBuildMemCommandLine(virCommandPtr cmd, static int qemuBuildIOThreadCommandLine(virCommandPtr cmd, - const virDomainDef *def) + const virDomainDef *def, + virQEMUCaps *qemuCaps) { size_t i; @@ -7280,7 +7312,7 @@ qemuBuildIOThreadCommandLine(virCommandPtr cmd, if (qemuMonitorCreateObjectProps(&props, "iothread", alias, NULL) = < 0) return -1; - if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0) + if (qemuBuildObjectCommandlineFromJSON(&buf, props, qemuCaps) < 0) return -1; virCommandAddArg(cmd, "-object"); @@ -8098,7 +8130,8 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPt= r cfg, if (gfxPriv->secinfo) { if (qemuBuildObjectSecretCommandLine(cmd, - gfxPriv->secinfo) < 0) + gfxPriv->secinfo, + qemuCaps) < 0) return -1; secretAlias =3D gfxPriv->secinfo->s.aes.alias; } @@ -9149,7 +9182,7 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager, if (!(memProps =3D qemuBuildShmemBackendMemProps(shmem))) return -1; - rc =3D virQEMUBuildObjectCommandlineFromJSON(&buf, memProps); + rc =3D qemuBuildObjectCommandlineFromJSON(&buf, memProps, qemuCaps= ); if (rc < 0) return -1; @@ -9903,7 +9936,7 @@ qemuBuildSEVCommandLine(virDomainObjPtr vm, virComman= dPtr cmd, NULL) < 0) return -1; - if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0) + if (qemuBuildObjectCommandlineFromJSON(&buf, props, priv->qemuCaps) < = 0) return -1; virCommandAddArg(cmd, "-object"); @@ -10021,7 +10054,7 @@ qemuBuildManagedPRCommandLine(virCommandPtr cmd, if (!(props =3D qemuBuildPRManagedManagerInfoProps(priv))) return -1; - if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0) + if (qemuBuildObjectCommandlineFromJSON(&buf, props, priv->qemuCaps) < = 0) return -1; virCommandAddArg(cmd, "-object"); @@ -10045,7 +10078,8 @@ qemuBuildPflashBlockdevOne(virCommandPtr cmd, for (i =3D data->nsrcdata; i > 0; i--) { if (qemuBuildBlockStorageSourceAttachDataCommandline(cmd, - data->srcdata= [i - 1]) < 0) + data->srcdata= [i - 1], + qemuCaps) < 0) return -1; } @@ -10110,7 +10144,7 @@ qemuBuildDBusVMStateCommandLine(virCommandPtr cmd, if (!(props =3D qemuBuildDBusVMStateInfoProps(driver, vm))) return -1; - if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0) + if (qemuBuildObjectCommandlineFromJSON(&buf, props, priv->qemuCaps) < = 0) return -1; virCommandAddArg(cmd, "-object"); @@ -10385,7 +10419,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, if (qemuBuildSmpCommandLine(cmd, def, qemuCaps) < 0) return NULL; - if (qemuBuildIOThreadCommandLine(cmd, def) < 0) + if (qemuBuildIOThreadCommandLine(cmd, def, qemuCaps) < 0) return NULL; if (virDomainNumaGetNodeCount(def->numa) && diff --git a/src/util/virqemu.c b/src/util/virqemu.c index a206da1852..a1f57dea66 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -303,30 +303,6 @@ virQEMUBuildNetdevCommandlineFromJSON(virJSONValuePtr = props, } -int -virQEMUBuildObjectCommandlineFromJSON(virBufferPtr buf, - virJSONValuePtr objprops) -{ - const char *type =3D virJSONValueObjectGetString(objprops, "qom-type"); - const char *alias =3D virJSONValueObjectGetString(objprops, "id"); - - if (!type || !alias) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing 'type'(%s) or 'alias'(%s) field of QOM '= object'"), - NULLSTR(type), NULLSTR(alias)); - return -1; - } - - virBufferAsprintf(buf, "%s,", type); - - if (virQEMUBuildCommandLineJSON(objprops, buf, "qom-type", - virQEMUBuildCommandLineJSONArrayBitmap= ) < 0) - return -1; - - return 0; -} - - char * virQEMUBuildDriveCommandlineFromJSON(virJSONValuePtr srcdef) { diff --git a/src/util/virqemu.h b/src/util/virqemu.h index 849b7df0c2..361abddd11 100644 --- a/src/util/virqemu.h +++ b/src/util/virqemu.h @@ -48,9 +48,6 @@ char * virQEMUBuildNetdevCommandlineFromJSON(virJSONValuePtr props, bool rawjson); -int virQEMUBuildObjectCommandlineFromJSON(virBufferPtr buf, - virJSONValuePtr objprops); - char *virQEMUBuildDriveCommandlineFromJSON(virJSONValuePtr src); void virQEMUBuildBufferEscapeComma(virBufferPtr buf, const char *str); --=20 2.29.2 From nobody Tue Apr 30 19:20:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1616164466; cv=none; d=zohomail.com; s=zohoarc; b=OtbJEF0jbBW8Mp7mFzhhxEWNVlyJwUQbKaOXm/FwcJwrvX/P7gMNJaxO4dGoUsP5u+IQXKO9fpTiftwr9ArCAA70AB9qq5xcHkJEt6NBm7c+pMp3Kb7J7o+RVyd0GD21VswkXo3g20nMBJ0rVYIA24phs435aqiJ30K1PYVbAls= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616164466; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DZT7d3kIrqxSJ0GMSmmImFe+DpJUVIXHiFwAJQZ6bAw=; b=dQXjKJSKoz9J2fC8ZrAop+GdLuw4MUOZqjkAyqjr1cjpIPAcwolpUwe8IiGTDaYmMgawzMCYGhjHEnz47ZsUr65ehmqctn3+vLRha+spWhSw831bHgHNIxIwQse6KqGTwvYKgIvCxSBR9QMFKfipYgQUNXQ4iEFHd2EMkf019z8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1616164466215483.8857448464562; Fri, 19 Mar 2021 07:34:26 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-589-Oh48xEv8MsGDDG60MqYZiA-1; Fri, 19 Mar 2021 10:34:22 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6294E800D53; Fri, 19 Mar 2021 14:34:16 +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 078CE1B580; Fri, 19 Mar 2021 14:34:16 +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 B27D54A708; Fri, 19 Mar 2021 14:34:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JEXwdH027570 for ; Fri, 19 Mar 2021 10:33:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id C9AC05D743; Fri, 19 Mar 2021 14:33:58 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7444D5D72E for ; Fri, 19 Mar 2021 14:33:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616164465; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=DZT7d3kIrqxSJ0GMSmmImFe+DpJUVIXHiFwAJQZ6bAw=; b=JfSnuZzK8Uk0GGCBJ0L/WLsfBX7ckvWW7u41geNtxUFwC+zssS9+yVKUYVeisCphsx5m/6 8Xm1h4zF6c9yvcZr7cW6UXl2uYCHKLYNZJVEDa7Fe1WbLOeHx4QzvbEkhfc+DtgJvA8nFC aUyW/F3Q5Z2RWnHPkNgJu2KoTpCKprk= X-MC-Unique: Oh48xEv8MsGDDG60MqYZiA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v4 08/13] tests: qemuxml2argv: Validate generation of JSON props for object-add Date: Fri, 19 Mar 2021 15:33:39 +0100 Message-Id: <5ddec5fe3c1c7041a73ce199c98dfeb83c8e398c.1616164286.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Similarly to the validation for blockdev-add and netdev_add, use the qemuxml2argv test repository to drive validation of props for object-add. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/qemuxml2argvtest.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 44c2a316b0..1f53d95f13 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -603,6 +603,24 @@ testCompareXMLToArgvValidateSchema(virQEMUDriverPtr dr= v, return -1; } + i++; + } else if (STREQ(args[i], "-object")) { + + if (*args[i + 1] !=3D '{') { + i++; + continue; + } + + if (!(jsonargs =3D virJSONValueFromString(args[i + 1]))) + return -1; + + if (testQEMUSchemaValidateCommand("object-add", jsonargs, + schema, false, false, &debug= ) < 0) { + VIR_TEST_VERBOSE("failed to validate -object '%s' against = QAPI schema: %s", + args[i + 1], virBufferCurrentContent(&deb= ug)); + return -1; + } + i++; } } --=20 2.29.2 From nobody Tue Apr 30 19:20:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1616164471; cv=none; d=zohomail.com; s=zohoarc; b=mgTX36XtR4RIpcYRQE6+1MPsbBsahgrl5yFm7129rhK6XC1KUoj7DuWjsKwcNtwof/XjQtmYh4HMeOcsMLO1zto9FAy8mRIOSgbRZl/Ln9vUiRKg1Q6LBYEs/g6GpZACEAzEzhggOsHCxoh/+ml6+S1WPZZXKej5/tJX84P7/go= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616164471; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=O/XAuuwkvYirwQ4gEaYbDYZ5ZtoEMwyQrQmmKRTHomo=; b=M98GIf42ZxE0stBl524mEk2fTTFG0VEp/IsUy+kXmHIlBaMz9dHaHw8EYQ/yi6w5VCvOLmcBoNxfEUFe12rIS+x3WBHFF6SXah8agIiLNYAkPeLlB2Bu7HKlJo8fbbuKfGPGjPfNZRmOy2tdbii5wPSw9p6eCvULajZCM/IpMBM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1616164471804338.9213489556131; Fri, 19 Mar 2021 07:34:31 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-271-mIgjAK8IP--g1ce406rAog-1; Fri, 19 Mar 2021 10:34:26 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E7318881283; Fri, 19 Mar 2021 14:34:19 +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 B9835614FC; Fri, 19 Mar 2021 14:34:19 +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 3FF8C180213C; Fri, 19 Mar 2021 14:34:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JEXxPJ027576 for ; Fri, 19 Mar 2021 10:33:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id D51495D743; Fri, 19 Mar 2021 14:33:59 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 31CE35D740 for ; Fri, 19 Mar 2021 14:33:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616164470; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=O/XAuuwkvYirwQ4gEaYbDYZ5ZtoEMwyQrQmmKRTHomo=; b=W4TG8J6wS+JzOqZ+jNPCkFCUV0QQzpsZjoKPZGzUn3RFkcJ26rHZlrzdpprFl7L4EiKxvR 4Y2WzbpBx4z9z7Rj+mSpdT0ENAGtyD63M1aY2S66fypt2AelMtWAUj/ML5qh+d2QppEAGG k8t0wmb/36luasZ6E5e7hRCJlDRyAtA= X-MC-Unique: mIgjAK8IP--g1ce406rAog-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v4 09/13] qemumonitorjsontest: Remove tripwire guarding object-add QAPIfication Date: Fri, 19 Mar 2021 15:33:40 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Libvirt is now prepared for QAPIfied object-add. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/qemumonitorjsontest.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 82c74e2ef9..48b41c908a 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2740,20 +2740,6 @@ testQAPISchemaObjectDeviceAdd(const void *opaque) return -1; } - if (virQEMUQAPISchemaPathGet("object-add/arg-type", schema, &entry) < = 0) { - fprintf(stderr, "schema for 'objectadd' not found\n"); - return -1; - } - - if (testQEMUSchemaEntryMatchTemplate(entry, - "str:qom-type", - "str:id", - "any:props", - NULL) < 0) { - VIR_TEST_VERBOSE("object-add has unexpected members in schema"); - return -1; - } - return 0; } --=20 2.29.2 From nobody Tue Apr 30 19:20:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1616164462; cv=none; d=zohomail.com; s=zohoarc; b=fMmCOjDbx0djmq3xSDpot23OpDMSr/M71edyr+5DqMIEPIJBHzuj2DxarDjsl8alwKe837IhgAWeU1+Xz6xM2ScUScOZ6hPGLAP0iF6RnGYDmxtFYZ0/dnUrT+v7Rs4VF7zRX+k5qFpxDbZgABy8uS+IW1t1Zg3wcfICogev1vs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616164462; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Q6kzKZDYFHQcQ2bP6HjTedTPtC+i0w4GBmLMrgfyHpA=; b=LXs6BcYKoqPLLSguELKMcPT+91ZC+/UuLBakZeyecpoDDPSokqh97dXyrcqqhv7f1ED2dzf5GmxCnF0qExepOa9CseleZFWOfCEhdt9D9mn/GHLP/7w9KCIYcRsZNpYnd9of9Vsnj58fw4Nep3mOZxykOgx7fq6HWMaqlJjm4I0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1616164462422861.200160102927; Fri, 19 Mar 2021 07:34:22 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-592-86VMKryxPhG8N84f3hRCVg-1; Fri, 19 Mar 2021 10:34:17 -0400 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 177EB1084D77; Fri, 19 Mar 2021 14:34:12 +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 D9A0860240; Fri, 19 Mar 2021 14:34:11 +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 83B91180BADC; Fri, 19 Mar 2021 14:34:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JEY5mU027616 for ; Fri, 19 Mar 2021 10:34:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id BB61B5D743; Fri, 19 Mar 2021 14:34:05 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 100F55D740 for ; Fri, 19 Mar 2021 14:34:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616164460; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Q6kzKZDYFHQcQ2bP6HjTedTPtC+i0w4GBmLMrgfyHpA=; b=i4sYWJYGhORr6W7eyYHL43cdD2XCbfu3W05X9NnAbxHDSrQKXMTgjE95hxYqpT5aFr3C9k SG5rVMB/yS3ZogmCCHYAjH34xBJffldfEKfpJnSRidprmFglK3d3LQYwk5OhDbT3drt+/G QXg9URdrxQVtBziv4g2O4P0MgvgaHvY= X-MC-Unique: 86VMKryxPhG8N84f3hRCVg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v4 10/13] tests: qemucapabilities: Update qemu caps for object-add qapification Date: Fri, 19 Mar 2021 15:33:41 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" qemu qapified object-add, which means that it's introspectable via query-qmp-schema. Update the qemu-6.0 capabilities to commit v5.2.0-3205-g92566947b3 Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.replies | 5103 +++++++++++------ .../caps_6.0.0.x86_64.xml | 85 +- 5 files changed, 3300 insertions(+), 1891 deletions(-) diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_6.0.0-q35.x86_64.xml index ae0d4a6264..5319fb46f9 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -104,6 +104,7 @@ Haswell-IBRS Haswell EPYC-Rome + EPYC-Milan EPYC-IBPB EPYC Dhyana diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_6.0.0-tcg.x86_64.xml index bd2c51f34b..f861681157 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -109,6 +109,7 @@ Haswell-IBRS Haswell EPYC-Rome + EPYC-Milan EPYC-IBPB EPYC Dhyana diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsd= ata/qemu_6.0.0.x86_64.xml index e104a6b2d8..7f38d87a06 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -103,6 +103,7 @@ Haswell-IBRS Haswell EPYC-Rome + EPYC-Milan EPYC-IBPB EPYC Dhyana diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_6.0.0.x86_64.replies index 04ebd04583..db43b08db5 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies @@ -21,7 +21,7 @@ "minor": 2, "major": 5 }, - "package": "v5.2.0-2208-gc79f01c945" + "package": "v5.2.0-3205-g92566947b3" }, "id": "libvirt-2" } @@ -45,9 +45,6 @@ { "return": [ - { - "name": "object-add" - }, { "name": "device_add" }, @@ -198,9 +195,6 @@ { "name": "query-cpus-fast" }, - { - "name": "query-cpus" - }, { "name": "device_del" }, @@ -210,6 +204,9 @@ { "name": "object-del" }, + { + "name": "object-add" + }, { "name": "qom-list-properties" }, @@ -228,9 +225,6 @@ { "name": "quit" }, - { - "name": "query-events" - }, { "name": "query-commands" }, @@ -297,18 +291,6 @@ { "name": "migrate" }, - { - "name": "query-migrate-cache-size" - }, - { - "name": "migrate-set-cache-size" - }, - { - "name": "migrate_set_speed" - }, - { - "name": "migrate_set_downtime" - }, { "name": "migrate-continue" }, @@ -393,6 +375,9 @@ { "name": "query-rocker" }, + { + "name": "query-netdev" + }, { "name": "announce-self" }, @@ -895,14 +880,14 @@ "name": "memory-backend-ram", "parent": "memory-backend" }, - { - "name": "PCIE", - "parent": "PCI" - }, { "name": "e1000e", "parent": "pci-device" }, + { + "name": "PCIE", + "parent": "PCI" + }, { "name": "n270-x86_64-cpu", "parent": "x86_64-cpu" @@ -911,10 +896,6 @@ "name": "pxb-host", "parent": "pci-host-bridge" }, - { - "name": "scsi-disk", - "parent": "scsi-disk-base" - }, { "name": "chardev-file", "parent": "chardev-fd" @@ -979,14 +960,14 @@ "name": "pci-ipmi-kcs", "parent": "pci-device" }, - { - "name": "intel-iommu-iommu-memory-region", - "parent": "qemu:iommu-memory-region" - }, { "name": "xio3130-downstream", "parent": "pcie-slot" }, + { + "name": "intel-iommu-iommu-memory-region", + "parent": "qemu:iommu-memory-region" + }, { "name": "vhost-user-vsock-pci-non-transitional", "parent": "vhost-user-vsock-pci-base" @@ -1171,6 +1152,10 @@ "name": "sysbus-xhci", "parent": "sys-bus-device" }, + { + "name": "chardev-memory", + "parent": "chardev-ringbuf" + }, { "name": "i82557a", "parent": "pci-device" @@ -1183,10 +1168,6 @@ "name": "vmmouse", "parent": "isa-device" }, - { - "name": "chardev-udp", - "parent": "chardev" - }, { "name": "pc-q35-2.8-machine", "parent": "generic-pc-machine" @@ -1212,8 +1193,8 @@ "parent": "x86_64-cpu" }, { - "name": "chardev-memory", - "parent": "chardev-ringbuf" + "name": "chardev-udp", + "parent": "chardev" }, { "name": "EPYC-Rome-v1-x86_64-cpu", @@ -1279,6 +1260,10 @@ "name": "isa-pcspk", "parent": "isa-device" }, + { + "name": "qemu:memory-region", + "parent": "object" + }, { "name": "vhost-scsi", "parent": "vhost-scsi-common" @@ -1305,20 +1290,20 @@ }, { "name": "esp", - "parent": "sys-bus-device" + "parent": "device" }, { "name": "isabus-bridge", "parent": "sys-bus-device" }, - { - "name": "IvyBridge-v2-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "ne2k_pci", "parent": "pci-device" }, + { + "name": "IvyBridge-v2-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "usb-bus", "parent": "bus" @@ -1327,14 +1312,14 @@ "name": "ide-cd", "parent": "ide-device" }, - { - "name": "qemu:memory-region", - "parent": "object" - }, { "name": "tcg-accel", "parent": "accel" }, + { + "name": "piix4-ide", + "parent": "pci-ide" + }, { "name": "virtio-balloon-pci", "parent": "virtio-balloon-pci-base" @@ -1359,14 +1344,6 @@ "name": "acpi-ged-x86", "parent": "acpi-ged" }, - { - "name": "ES1370", - "parent": "pci-device" - }, - { - "name": "pc-i440fx-2.6-machine", - "parent": "generic-pc-machine" - }, { "name": "i82551", "parent": "pci-device" @@ -1384,8 +1361,8 @@ "parent": "x86_64-cpu" }, { - "name": "piix4-ide", - "parent": "pci-ide" + "name": "pc-i440fx-2.6-machine", + "parent": "generic-pc-machine" }, { "name": "SandyBridge-x86_64-cpu", @@ -1403,14 +1380,14 @@ "name": "pc-q35-6.0-machine", "parent": "generic-pc-machine" }, - { - "name": "mioe3680_pci", - "parent": "pci-device" - }, { "name": "vhost-user-backend", "parent": "object" }, + { + "name": "mioe3680_pci", + "parent": "pci-device" + }, { "name": "vmxnet3", "parent": "pci-device" @@ -1419,6 +1396,10 @@ "name": "nec-usb-xhci", "parent": "pci-xhci" }, + { + "name": "ES1370", + "parent": "pci-device" + }, { "name": "Conroe-v1-x86_64-cpu", "parent": "x86_64-cpu" @@ -1451,6 +1432,10 @@ "name": "virtio-serial-device", "parent": "virtio-device" }, + { + "name": "virtio-serial-pci", + "parent": "virtio-serial-pci-base" + }, { "name": "Denverton-v2-x86_64-cpu", "parent": "x86_64-cpu" @@ -1479,14 +1464,14 @@ "name": "ati-vga", "parent": "pci-device" }, - { - "name": "kvm-i8259", - "parent": "pic-common" - }, { "name": "pentium3-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "kvm-i8259", + "parent": "pic-common" + }, { "name": "isa-serial", "parent": "isa-device" @@ -1503,14 +1488,6 @@ "name": "core2duo-v1-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "vhost-user-blk-pci-non-transitional", - "parent": "vhost-user-blk-pci-base" - }, - { - "name": "virtio-rng-pci-non-transitional", - "parent": "virtio-rng-pci-base" - }, { "name": "cirrus-vga", "parent": "pci-device" @@ -1536,8 +1513,8 @@ "parent": "pcie-host-bridge" }, { - "name": "virtio-serial-pci", - "parent": "virtio-serial-pci-base" + "name": "virtio-rng-pci-non-transitional", + "parent": "virtio-rng-pci-base" }, { "name": "Skylake-Client-x86_64-cpu", @@ -1547,6 +1524,10 @@ "name": "Opteron_G3-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "vhost-user-blk-pci-non-transitional", + "parent": "vhost-user-blk-pci-base" + }, { "name": "isa-ide", "parent": "isa-device" @@ -1687,14 +1668,14 @@ "name": "pci-ohci", "parent": "pci-device" }, - { - "name": "Haswell-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "virtio-tablet-device", "parent": "virtio-input-hid-device" }, + { + "name": "Haswell-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "ccid-card-passthru", "parent": "ccid-card" @@ -1719,10 +1700,6 @@ "name": "isapc-machine", "parent": "generic-pc-machine" }, - { - "name": "ide-drive", - "parent": "ide-device" - }, { "name": "cryptodev-vhost-user", "parent": "cryptodev-backend" @@ -1828,11 +1805,11 @@ "parent": "vhost-user-scsi-pci-base" }, { - "name": "i82559a", + "name": "kvaser_pci", "parent": "pci-device" }, { - "name": "kvaser_pci", + "name": "i82559a", "parent": "pci-device" }, { @@ -1852,8 +1829,8 @@ "parent": "chardev-spice" }, { - "name": "qio-channel-command", - "parent": "qio-channel" + "name": "tls-creds-x509", + "parent": "tls-creds" }, { "name": "Opteron_G3-v1-x86_64-cpu", @@ -1868,8 +1845,8 @@ "parent": "virtio-blk-pci-base" }, { - "name": "tls-creds-x509", - "parent": "tls-creds" + "name": "qio-channel-command", + "parent": "qio-channel" }, { "name": "pc-i440fx-2.4-machine", @@ -1940,20 +1917,20 @@ "parent": "virtio-iommu-device-base" }, { - "name": "vmcoreinfo", - "parent": "device" + "name": "chardev-braille", + "parent": "chardev" }, { "name": "Icelake-Client-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "tpci200", - "parent": "pci-device" + "name": "vmcoreinfo", + "parent": "device" }, { - "name": "chardev-braille", - "parent": "chardev" + "name": "tpci200", + "parent": "pci-device" }, { "name": "rocker", @@ -2028,7 +2005,7 @@ "parent": "device" }, { - "name": "Westmere-v2-x86_64-cpu", + "name": "Cascadelake-Server-noTSX-x86_64-cpu", "parent": "x86_64-cpu" }, { @@ -2052,21 +2029,21 @@ "parent": "isa-device" }, { - "name": "virtio-iommu-pci-non-transitional", - "parent": "virtio-iommu-device-base" + "name": "hyperv-testdev", + "parent": "isa-device" }, { "name": "scsi-hd", "parent": "scsi-disk-base" }, - { - "name": "Cascadelake-Server-noTSX-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "usb-kbd", "parent": "usb-hid" }, + { + "name": "lsi53c810", + "parent": "lsi53c895a" + }, { "name": "isa-fdc", "parent": "isa-device" @@ -2092,20 +2069,24 @@ "parent": "object" }, { - "name": "ccid-card-emulated", - "parent": "ccid-card" + "name": "Westmere-v2-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "pc-q35-2.9-machine", "parent": "generic-pc-machine" }, + { + "name": "tpm-tis", + "parent": "isa-device" + }, { "name": "Skylake-Server-IBRS-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "hyperv-testdev", - "parent": "isa-device" + "name": "virtio-iommu-pci-non-transitional", + "parent": "virtio-iommu-device-base" }, { "name": "s3c-sdhci", @@ -2124,8 +2105,8 @@ "parent": "generic-pc-machine" }, { - "name": "tpm-tis", - "parent": "isa-device" + "name": "ccid-card-emulated", + "parent": "ccid-card" }, { "name": "pc-q35-5.1-machine", @@ -2140,16 +2121,16 @@ "parent": "virtio-input-hid-device" }, { - "name": "lsi53c810", - "parent": "lsi53c895a" + "name": "Skylake-Client-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "ioh3420", "parent": "pcie-root-port-base" }, { - "name": "Skylake-Client-v1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "guest-loader", + "parent": "device" }, { "name": "x-remote-machine", @@ -2203,10 +2184,6 @@ "name": "vhost-user-input", "parent": "virtio-input-device" }, - { - "name": "vt82c686b-usb-uhci", - "parent": "pci-uhci-usb" - }, { "name": "ich9-intel-hda", "parent": "intel-hda-generic" @@ -2251,14 +2228,14 @@ "name": "pc-dimm", "parent": "device" }, - { - "name": "virtio-net-pci-transitional", - "parent": "virtio-net-pci-base" - }, { "name": "virtio-balloon-pci-non-transitional", "parent": "virtio-balloon-pci-base" }, + { + "name": "virtio-net-pci-transitional", + "parent": "virtio-net-pci-base" + }, { "name": "ipmi-bmc-sim", "parent": "ipmi-bmc" @@ -2331,6 +2308,10 @@ "name": "Broadwell-v1-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "EPYC-Milan-v1-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "KnightsMill-v1-x86_64-cpu", "parent": "x86_64-cpu" @@ -2355,14 +2336,14 @@ "name": "Skylake-Server-v4-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "kvmvapic", - "parent": "sys-bus-device" - }, { "name": "Nehalem-v1-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "kvmvapic", + "parent": "sys-bus-device" + }, { "name": "nvme-ns", "parent": "device" @@ -2415,6 +2396,10 @@ "name": "IvyBridge-v1-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "sysbus-esp", + "parent": "sys-bus-device" + }, { "name": "qxl", "parent": "pci-qxl" @@ -2563,10 +2548,6 @@ "name": "pvpanic-pci", "parent": "pci-device" }, - { - "name": "virtio-balloon-device", - "parent": "virtio-device" - }, { "name": "Cooperlake-v1-x86_64-cpu", "parent": "x86_64-cpu" @@ -2576,24 +2557,28 @@ "parent": "x86_64-cpu" }, { - "name": "cfi.pflash01", - "parent": "sys-bus-device" + "name": "Nehalem-IBRS-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "isa-parallel", - "parent": "isa-device" + "name": "virtio-balloon-device", + "parent": "virtio-device" }, { - "name": "pc-q35-2.7-machine", - "parent": "generic-pc-machine" + "name": "cfi.pflash01", + "parent": "sys-bus-device" }, { "name": "Skylake-Server-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "Nehalem-IBRS-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pc-q35-2.7-machine", + "parent": "generic-pc-machine" + }, + { + "name": "isa-parallel", + "parent": "isa-device" }, { "name": "pentium2-v1-x86_64-cpu", @@ -2691,21 +2676,25 @@ "name": "virtio-pmem-pci", "parent": "virtio-pmem-pci-base" }, - { - "name": "accel", - "parent": "object" - }, { "name": "virtio-tablet-pci", "parent": "virtio-tablet-pci-base-type" }, + { + "name": "accel", + "parent": "object" + }, { "name": "dc390", "parent": "am53c974" }, { - "name": "i6300esb", - "parent": "pci-device" + "name": "EPYC-Milan-x86_64-cpu", + "parent": "x86_64-cpu" + }, + { + "name": "i6300esb", + "parent": "pci-device" }, { "name": "floppy", @@ -2812,8 +2801,8 @@ "parent": "x86_64-cpu" }, { - "name": "pcie-root-port", - "parent": "pcie-root-port-base" + "name": "kvm64-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "IDE", @@ -2824,8 +2813,8 @@ "parent": "x86_64-cpu" }, { - "name": "kvm64-v1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pcie-root-port", + "parent": "pcie-root-port-base" }, { "name": "mptsas1068", @@ -2903,13 +2892,17 @@ "name": "Skylake-Server-v1-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "vhost-user-blk", + "parent": "virtio-device" + }, { "name": "SandyBridge-v2-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "vhost-user-blk", - "parent": "virtio-device" + "name": "nvme-subsys", + "parent": "device" }, { "name": "Haswell-noTSX-IBRS-x86_64-cpu", @@ -3120,29 +3113,33 @@ "type": "uint32" }, { - "default-value": 0, - "name": "heads", - "type": "uint32" + "name": "serial", + "type": "str" }, { "name": "iothread", "type": "link" }, - { - "default-value": 0, - "name": "lheads", - "type": "uint32" - }, { "default-value": 65535, "name": "num-queues", "type": "uint16" }, + { + "default-value": 0, + "name": "heads", + "type": "uint32" + }, { "default-value": 0, "name": "cyls", "type": "uint32" }, + { + "default-value": 0, + "name": "lheads", + "type": "uint32" + }, { "default-value": 0, "name": "secs", @@ -3183,6 +3180,11 @@ "description": "Error handling policy, report/ignore/enospc/stop/aut= o", "type": "BlockdevOnError" }, + { + "default-value": true, + "name": "report-discard-granularity", + "type": "bool" + }, { "default-value": "auto", "name": "rerror", @@ -3290,11 +3292,6 @@ "description": "on/off", "type": "bool" }, - { - "default-value": true, - "name": "x-enable-wce-if-config-wce", - "type": "bool" - }, { "default-value": true, "name": "indirect_desc", @@ -3302,8 +3299,9 @@ "type": "bool" }, { - "name": "serial", - "type": "str" + "default-value": true, + "name": "x-enable-wce-if-config-wce", + "type": "bool" } ], "id": "libvirt-7" @@ -3433,7 +3431,7 @@ "type": "bool" }, { - "default-value": 3, + "default-value": 4294967295, "name": "vectors", "type": "uint32" }, @@ -4595,11 +4593,6 @@ "name": "smb_io_base", "type": "uint32" }, - { - "default-value": 2, - "name": "s4_val", - "type": "uint8" - }, { "default-value": 0, "name": "disable_s3", @@ -4610,14 +4603,24 @@ "name": "acpi-root-pci-hotplug", "type": "bool" }, + { + "default-value": 0, + "name": "disable_s4", + "type": "uint8" + }, { "default-value": true, "name": "memory-hotplug-support", "type": "bool" }, { - "default-value": 0, - "name": "disable_s4", + "default-value": false, + "name": "smm-compat", + "type": "bool" + }, + { + "default-value": 2, + "name": "s4_val", "type": "uint8" } ], @@ -4638,12 +4641,6 @@ "name": "pcap", "type": "str" }, - { - "default-value": true, - "name": "full-path", - "description": "on/off", - "type": "bool" - }, { "name": "port", "type": "str" @@ -4867,12 +4864,6 @@ "name": "pcap", "type": "str" }, - { - "default-value": true, - "name": "full-path", - "description": "on/off", - "type": "bool" - }, { "name": "port", "type": "str" @@ -5692,16 +5683,21 @@ }, { "default-value": true, - "name": "x-smi-cpu-hotunplug", + "name": "x-smi-cpu-hotplug", "description": "on/off", "type": "bool" }, { "default-value": true, - "name": "x-smi-cpu-hotplug", + "name": "x-smi-cpu-hotunplug", "description": "on/off", "type": "bool" }, + { + "default-value": false, + "name": "smm-compat", + "type": "bool" + }, { "default-value": true, "name": "noreboot", @@ -6569,12 +6565,6 @@ "name": "pcap", "type": "str" }, - { - "default-value": true, - "name": "full-path", - "description": "on/off", - "type": "bool" - }, { "name": "port", "type": "str" @@ -7595,6 +7585,10 @@ "name": "cr8legacy", "type": "bool" }, + { + "name": "vmx-invept-single-context-noglobals", + "type": "bool" + }, { "name": "vmx-zero-len-inject", "type": "bool" @@ -7628,7 +7622,7 @@ "type": "bool" }, { - "name": "vmx-invept-single-context-noglobals", + "name": "ibrs", "type": "bool" }, { @@ -8056,6 +8050,10 @@ "name": "vmx-ple", "type": "bool" }, + { + "name": "bus-lock-detect", + "type": "bool" + }, { "name": "vmx-apicv-vid", "type": "bool" @@ -8307,23 +8305,23 @@ "type": "bool" }, { - "name": "vmx-wbinvd-exit", + "name": "vmx-exit-load-perf-global-ctrl", "type": "bool" }, { - "name": "vmx-exit-load-perf-global-ctrl", + "name": "xgetbv1", "type": "bool" }, { - "name": "3dnow", + "name": "vmx-wbinvd-exit", "type": "bool" }, { - "name": "la57", + "name": "3dnow", "type": "bool" }, { - "name": "xgetbv1", + "name": "kvm-asyncpf-int", "type": "bool" }, { @@ -8331,7 +8329,7 @@ "type": "bool" }, { - "name": "kvm-asyncpf-int", + "name": "la57", "type": "bool" }, { @@ -10392,6 +10390,39 @@ "migration-safe": true, "deprecated": false }, + { + "name": "EPYC-Milan-v1", + "typename": "EPYC-Milan-v1-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "pku", + "fsrm", + "ibrs", + "pku" + ], + "static": false, + "migration-safe": true, + "deprecated": false + }, + { + "name": "EPYC-Milan", + "typename": "EPYC-Milan-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "pku", + "fsrm", + "ibrs", + "pku" + ], + "alias-of": "EPYC-Milan-v1", + "static": false, + "migration-safe": true, + "deprecated": false + }, { "name": "EPYC-IBPB", "typename": "EPYC-IBPB-x86_64-cpu", @@ -11102,6 +11133,99 @@ ], "option": "fsdev" }, + { + "parameters": [ + { + "name": "power-control", + "type": "boolean" + }, + { + "name": "audiodev", + "type": "string" + }, + { + "name": "non-adaptive", + "type": "boolean" + }, + { + "name": "lossy", + "type": "boolean" + }, + { + "name": "sasl-authz", + "type": "string" + }, + { + "name": "tls-authz", + "type": "string" + }, + { + "name": "sasl", + "type": "boolean" + }, + { + "name": "key-delay-ms", + "type": "number" + }, + { + "name": "lock-key-sync", + "type": "boolean" + }, + { + "name": "reverse", + "type": "boolean" + }, + { + "name": "password-secret", + "type": "string" + }, + { + "name": "password", + "type": "boolean" + }, + { + "name": "ipv6", + "type": "boolean" + }, + { + "name": "ipv4", + "type": "boolean" + }, + { + "name": "to", + "type": "number" + }, + { + "name": "connections", + "type": "number" + }, + { + "name": "head", + "type": "number" + }, + { + "name": "display", + "type": "string" + }, + { + "name": "share", + "type": "string" + }, + { + "name": "tls-creds", + "type": "string" + }, + { + "name": "websocket", + "type": "string" + }, + { + "name": "vnc", + "type": "string" + } + ], + "option": "vnc" + }, { "parameters": [ { @@ -11230,6 +11354,10 @@ "name": "disable-ticketing", "type": "boolean" }, + { + "name": "password-secret", + "type": "string" + }, { "name": "password", "type": "string" @@ -11264,108 +11392,15 @@ { "parameters": [ { - "name": "power-control", - "type": "boolean" - }, - { - "name": "audiodev", + "name": "watchdog", "type": "string" }, { - "name": "non-adaptive", - "type": "boolean" - }, - { - "name": "lossy", - "type": "boolean" + "name": "panic", + "type": "string" }, { - "name": "sasl-authz", - "type": "string" - }, - { - "name": "tls-authz", - "type": "string" - }, - { - "name": "acl", - "type": "boolean" - }, - { - "name": "sasl", - "type": "boolean" - }, - { - "name": "key-delay-ms", - "type": "number" - }, - { - "name": "lock-key-sync", - "type": "boolean" - }, - { - "name": "reverse", - "type": "boolean" - }, - { - "name": "password", - "type": "boolean" - }, - { - "name": "ipv6", - "type": "boolean" - }, - { - "name": "ipv4", - "type": "boolean" - }, - { - "name": "to", - "type": "number" - }, - { - "name": "connections", - "type": "number" - }, - { - "name": "head", - "type": "number" - }, - { - "name": "display", - "type": "string" - }, - { - "name": "share", - "type": "string" - }, - { - "name": "tls-creds", - "type": "string" - }, - { - "name": "websocket", - "type": "string" - }, - { - "name": "vnc", - "type": "string" - } - ], - "option": "vnc" - }, - { - "parameters": [ - { - "name": "watchdog", - "type": "string" - }, - { - "name": "panic", - "type": "string" - }, - { - "name": "reboot", + "name": "reboot", "type": "string" }, { @@ -11893,6 +11928,10 @@ "name": "reconnect", "type": "number" }, + { + "name": "nodelay", + "type": "boolean" + }, { "name": "delay", "type": "boolean" @@ -12927,50 +12966,56 @@ "meta-type": "event", "arg-type": "106" }, + { + "name": "query-netdev", + "ret-type": "[107]", + "meta-type": "command", + "arg-type": "0" + }, { "name": "RDMA_GID_STATUS_CHANGED", "meta-type": "event", - "arg-type": "107" + "arg-type": "108" }, { "name": "query-rocker", - "ret-type": "109", + "ret-type": "110", "meta-type": "command", - "arg-type": "108" + "arg-type": "109" }, { "name": "query-rocker-ports", - "ret-type": "[111]", + "ret-type": "[112]", "meta-type": "command", - "arg-type": "110" + "arg-type": "111" }, { "name": "query-rocker-of-dpa-flows", - "ret-type": "[113]", + "ret-type": "[114]", "meta-type": "command", - "arg-type": "112" + "arg-type": "113" }, { "name": "query-rocker-of-dpa-groups", - "ret-type": "[115]", + "ret-type": "[116]", "meta-type": "command", - "arg-type": "114" + "arg-type": "115" }, { "name": "query-tpm-models", - "ret-type": "[116]", + "ret-type": "[117]", "meta-type": "command", "arg-type": "0" }, { "name": "query-tpm-types", - "ret-type": "[117]", + "ret-type": "[118]", "meta-type": "command", "arg-type": "0" }, { "name": "query-tpm", - "ret-type": "[118]", + "ret-type": "[119]", "meta-type": "command", "arg-type": "0" }, @@ -12978,40 +13023,40 @@ "name": "set_password", "ret-type": "0", "meta-type": "command", - "arg-type": "119" + "arg-type": "120" }, { "name": "expire_password", "ret-type": "0", "meta-type": "command", - "arg-type": "120" + "arg-type": "121" }, { "name": "screendump", "ret-type": "0", "meta-type": "command", - "arg-type": "121" + "arg-type": "122" }, { "name": "query-spice", - "ret-type": "122", + "ret-type": "123", "meta-type": "command", "arg-type": "0" }, { "name": "SPICE_CONNECTED", "meta-type": "event", - "arg-type": "123" + "arg-type": "124" }, { "name": "SPICE_INITIALIZED", "meta-type": "event", - "arg-type": "124" + "arg-type": "125" }, { "name": "SPICE_DISCONNECTED", "meta-type": "event", - "arg-type": "125" + "arg-type": "126" }, { "name": "SPICE_MIGRATE_COMPLETED", @@ -13020,13 +13065,13 @@ }, { "name": "query-vnc", - "ret-type": "126", + "ret-type": "127", "meta-type": "command", "arg-type": "0" }, { "name": "query-vnc-servers", - "ret-type": "[127]", + "ret-type": "[128]", "meta-type": "command", "arg-type": "0" }, @@ -13034,26 +13079,26 @@ "name": "change-vnc-password", "ret-type": "0", "meta-type": "command", - "arg-type": "128" + "arg-type": "129" }, { "name": "VNC_CONNECTED", "meta-type": "event", - "arg-type": "129" + "arg-type": "130" }, { "name": "VNC_INITIALIZED", "meta-type": "event", - "arg-type": "130" + "arg-type": "131" }, { "name": "VNC_DISCONNECTED", "meta-type": "event", - "arg-type": "131" + "arg-type": "132" }, { "name": "query-mice", - "ret-type": "[132]", + "ret-type": "[133]", "meta-type": "command", "arg-type": "0" }, @@ -13061,23 +13106,23 @@ "name": "send-key", "ret-type": "0", "meta-type": "command", - "arg-type": "133" + "arg-type": "134" }, { "name": "input-send-event", "ret-type": "0", "meta-type": "command", - "arg-type": "134" + "arg-type": "135" }, { "name": "query-display-options", - "ret-type": "135", + "ret-type": "136", "meta-type": "command", "arg-type": "0" }, { "name": "query-migrate", - "ret-type": "136", + "ret-type": "137", "meta-type": "command", "arg-type": "0" }, @@ -13085,11 +13130,11 @@ "name": "migrate-set-capabilities", "ret-type": "0", "meta-type": "command", - "arg-type": "137" + "arg-type": "138" }, { "name": "query-migrate-capabilities", - "ret-type": "[138]", + "ret-type": "[139]", "meta-type": "command", "arg-type": "0" }, @@ -13097,11 +13142,11 @@ "name": "migrate-set-parameters", "ret-type": "0", "meta-type": "command", - "arg-type": "139" + "arg-type": "140" }, { "name": "query-migrate-parameters", - "ret-type": "140", + "ret-type": "141", "meta-type": "command", "arg-type": "0" }, @@ -13109,7 +13154,7 @@ "name": "client_migrate_info", "ret-type": "0", "meta-type": "command", - "arg-type": "141" + "arg-type": "142" }, { "name": "migrate-start-postcopy", @@ -13120,17 +13165,17 @@ { "name": "MIGRATION", "meta-type": "event", - "arg-type": "142" + "arg-type": "143" }, { "name": "MIGRATION_PASS", "meta-type": "event", - "arg-type": "143" + "arg-type": "144" }, { "name": "COLO_EXIT", "meta-type": "event", - "arg-type": "144" + "arg-type": "145" }, { "name": "x-colo-lost-heartbeat", @@ -13148,83 +13193,47 @@ "name": "migrate-continue", "ret-type": "0", "meta-type": "command", - "arg-type": "145" - }, - { - "name": "migrate_set_downtime", - "ret-type": "0", - "meta-type": "command", - "arg-type": "146", - "features": [ - "deprecated" - ] - }, - { - "name": "migrate_set_speed", - "ret-type": "0", - "meta-type": "command", - "arg-type": "147", - "features": [ - "deprecated" - ] - }, - { - "name": "migrate-set-cache-size", - "ret-type": "0", - "meta-type": "command", - "arg-type": "148", - "features": [ - "deprecated" - ] - }, - { - "name": "query-migrate-cache-size", - "ret-type": "int", - "meta-type": "command", - "arg-type": "0", - "features": [ - "deprecated" - ] + "arg-type": "146" }, { "name": "migrate", "ret-type": "0", "meta-type": "command", - "arg-type": "149" + "arg-type": "147" }, { "name": "migrate-incoming", "ret-type": "0", "meta-type": "command", - "arg-type": "150" + "arg-type": "148" }, { "name": "xen-save-devices-state", "ret-type": "0", "meta-type": "command", - "arg-type": "151" + "arg-type": "149" }, { "name": "xen-set-global-dirty-log", "ret-type": "0", "meta-type": "command", - "arg-type": "152" + "arg-type": "150" }, { "name": "xen-load-devices-state", "ret-type": "0", "meta-type": "command", - "arg-type": "153" + "arg-type": "151" }, { "name": "xen-set-replication", "ret-type": "0", "meta-type": "command", - "arg-type": "154" + "arg-type": "152" }, { "name": "query-xen-replication-status", - "ret-type": "155", + "ret-type": "153", "meta-type": "command", "arg-type": "0" }, @@ -13236,7 +13245,7 @@ }, { "name": "query-colo-status", - "ret-type": "156", + "ret-type": "154", "meta-type": "command", "arg-type": "0" }, @@ -13245,7 +13254,7 @@ "ret-type": "0", "allow-oob": true, "meta-type": "command", - "arg-type": "157" + "arg-type": "155" }, { "name": "migrate-pause", @@ -13257,17 +13266,17 @@ { "name": "UNPLUG_PRIMARY", "meta-type": "event", - "arg-type": "158" + "arg-type": "156" }, { "name": "calc-dirty-rate", "ret-type": "0", "meta-type": "command", - "arg-type": "159" + "arg-type": "157" }, { "name": "query-dirty-rate", - "ret-type": "160", + "ret-type": "158", "meta-type": "command", "arg-type": "0" }, @@ -13275,65 +13284,56 @@ "name": "snapshot-save", "ret-type": "0", "meta-type": "command", - "arg-type": "161" + "arg-type": "159" }, { "name": "snapshot-load", "ret-type": "0", "meta-type": "command", - "arg-type": "162" + "arg-type": "160" }, { "name": "snapshot-delete", "ret-type": "0", "meta-type": "command", - "arg-type": "163" + "arg-type": "161" }, { "name": "transaction", "ret-type": "0", "meta-type": "command", - "arg-type": "164" + "arg-type": "162" }, { "name": "trace-event-get-state", - "ret-type": "[166]", + "ret-type": "[164]", "meta-type": "command", - "arg-type": "165" + "arg-type": "163" }, { "name": "trace-event-set-state", "ret-type": "0", "meta-type": "command", - "arg-type": "167" + "arg-type": "165" }, { "name": "qmp_capabilities", "ret-type": "0", "meta-type": "command", - "arg-type": "168" + "arg-type": "166" }, { "name": "query-version", - "ret-type": "169", + "ret-type": "167", "meta-type": "command", "arg-type": "0" }, { "name": "query-commands", - "ret-type": "[170]", + "ret-type": "[168]", "meta-type": "command", "arg-type": "0" }, - { - "name": "query-events", - "ret-type": "[171]", - "meta-type": "command", - "arg-type": "0", - "features": [ - "deprecated" - ] - }, { "name": "quit", "ret-type": "0", @@ -13342,117 +13342,108 @@ }, { "name": "query-qmp-schema", - "ret-type": "[172]", + "ret-type": "[169]", "meta-type": "command", "arg-type": "0" }, { "name": "qom-list", - "ret-type": "[174]", + "ret-type": "[171]", "meta-type": "command", - "arg-type": "173" + "arg-type": "170" }, { "name": "qom-get", "ret-type": "any", "meta-type": "command", - "arg-type": "175" + "arg-type": "172" }, { "name": "qom-set", "ret-type": "0", "meta-type": "command", - "arg-type": "176" + "arg-type": "173" }, { "name": "qom-list-types", - "ret-type": "[178]", + "ret-type": "[175]", "meta-type": "command", - "arg-type": "177" + "arg-type": "174" }, { "name": "qom-list-properties", - "ret-type": "[174]", + "ret-type": "[171]", "meta-type": "command", - "arg-type": "179" + "arg-type": "176" }, { "name": "object-add", "ret-type": "0", "meta-type": "command", - "arg-type": "180" + "arg-type": "177" }, { "name": "object-del", "ret-type": "0", "meta-type": "command", - "arg-type": "181" + "arg-type": "178" }, { "name": "device-list-properties", - "ret-type": "[174]", + "ret-type": "[171]", "meta-type": "command", - "arg-type": "182" + "arg-type": "179" }, { "name": "device_add", "ret-type": "0", "meta-type": "command", - "arg-type": "183" + "arg-type": "180" }, { "name": "device_del", "ret-type": "0", "meta-type": "command", - "arg-type": "184" + "arg-type": "181" }, { "name": "DEVICE_DELETED", "meta-type": "event", - "arg-type": "185" - }, - { - "name": "query-cpus", - "ret-type": "[186]", - "meta-type": "command", - "arg-type": "0", - "features": [ - "deprecated" - ] + "arg-type": "182" }, { "name": "query-cpus-fast", - "ret-type": "[187]", + "ret-type": "[183]", "meta-type": "command", "arg-type": "0" }, { "name": "query-machines", - "ret-type": "[188]", + "ret-type": "[184]", "meta-type": "command", "arg-type": "0" }, { "name": "query-current-machine", - "ret-type": "189", + "ret-type": "185", "meta-type": "command", "arg-type": "0" }, { "name": "query-target", - "ret-type": "190", + "ret-type": "186", "meta-type": "command", "arg-type": "0" }, { "name": "query-uuid", - "ret-type": "191", + "ret-type": "187", "meta-type": "command", "arg-type": "0" }, { "name": "query-vm-generation-id", - "ret-type": "192", + "ret-type": "188", "meta-type": "command", "arg-type": "0" }, @@ -13482,7 +13473,7 @@ }, { "name": "query-kvm", - "ret-type": "193", + "ret-type": "189", "meta-type": "command", "arg-type": "0" }, @@ -13490,23 +13481,23 @@ "name": "memsave", "ret-type": "0", "meta-type": "command", - "arg-type": "194" + "arg-type": "190" }, { "name": "pmemsave", "ret-type": "0", "meta-type": "command", - "arg-type": "195" + "arg-type": "191" }, { "name": "query-memdev", - "ret-type": "[196]", + "ret-type": "[192]", "meta-type": "command", "arg-type": "0" }, { "name": "query-hotpluggable-cpus", - "ret-type": "[197]", + "ret-type": "[193]", "meta-type": "command", "arg-type": "0" }, @@ -13514,62 +13505,62 @@ "name": "set-numa-node", "ret-type": "0", "meta-type": "command", - "arg-type": "198" + "arg-type": "194" }, { "name": "balloon", "ret-type": "0", "meta-type": "command", - "arg-type": "199" + "arg-type": "195" }, { "name": "query-balloon", - "ret-type": "200", + "ret-type": "196", "meta-type": "command", "arg-type": "0" }, { "name": "BALLOON_CHANGE", "meta-type": "event", - "arg-type": "201" + "arg-type": "197" }, { "name": "query-memory-size-summary", - "ret-type": "202", + "ret-type": "198", "meta-type": "command", "arg-type": "0" }, { "name": "query-memory-devices", - "ret-type": "[203]", + "ret-type": "[199]", "meta-type": "command", "arg-type": "0" }, { "name": "MEMORY_DEVICE_SIZE_CHANGE", "meta-type": "event", - "arg-type": "204" + "arg-type": "200" }, { "name": "MEM_UNPLUG_ERROR", "meta-type": "event", - "arg-type": "205" + "arg-type": "201" }, { "name": "query-cpu-model-expansion", - "ret-type": "211", + "ret-type": "207", "meta-type": "command", - "arg-type": "210" + "arg-type": "206" }, { "name": "query-cpu-definitions", - "ret-type": "[212]", + "ret-type": "[208]", "meta-type": "command", "arg-type": "0" }, { "name": "query-replay", - "ret-type": "213", + "ret-type": "209", "meta-type": "command", "arg-type": "0" }, @@ -13577,7 +13568,7 @@ "name": "replay-break", "ret-type": "0", "meta-type": "command", - "arg-type": "214" + "arg-type": "210" }, { "name": "replay-delete-break", @@ -13589,18 +13580,18 @@ "name": "replay-seek", "ret-type": "0", "meta-type": "command", - "arg-type": "215" + "arg-type": "211" }, { "name": "yank", "ret-type": "0", "allow-oob": true, "meta-type": "command", - "arg-type": "216" + "arg-type": "212" }, { "name": "query-yank", - "ret-type": "[217]", + "ret-type": "[213]", "allow-oob": true, "meta-type": "command", "arg-type": "0" @@ -13609,17 +13600,17 @@ "name": "add_client", "ret-type": "0", "meta-type": "command", - "arg-type": "218" + "arg-type": "214" }, { "name": "query-name", - "ret-type": "219", + "ret-type": "215", "meta-type": "command", "arg-type": "0" }, { "name": "query-iothreads", - "ret-type": "[220]", + "ret-type": "[216]", "meta-type": "command", "arg-type": "0" }, @@ -13645,7 +13636,7 @@ "name": "human-monitor-command", "ret-type": "str", "meta-type": "command", - "arg-type": "221", + "arg-type": "217", "features": [ "savevm-monitor-nodes" ] @@ -13654,42 +13645,42 @@ "name": "getfd", "ret-type": "0", "meta-type": "command", - "arg-type": "222" + "arg-type": "218" }, { "name": "closefd", "ret-type": "0", "meta-type": "command", - "arg-type": "223" + "arg-type": "219" }, { "name": "add-fd", - "ret-type": "225", + "ret-type": "221", "meta-type": "command", - "arg-type": "224" + "arg-type": "220" }, { "name": "remove-fd", "ret-type": "0", "meta-type": "command", - "arg-type": "226" + "arg-type": "222" }, { "name": "query-fdsets", - "ret-type": "[227]", + "ret-type": "[223]", "meta-type": "command", "arg-type": "0" }, { "name": "query-command-line-options", - "ret-type": "[229]", + "ret-type": "[225]", "meta-type": "command", - "arg-type": "228" + "arg-type": "224" }, { "name": "RTC_CHANGE", "meta-type": "event", - "arg-type": "230" + "arg-type": "226" }, { "name": "rtc-reset-reinjection", @@ -13699,19 +13690,19 @@ }, { "name": "query-sev", - "ret-type": "231", + "ret-type": "227", "meta-type": "command", "arg-type": "0" }, { "name": "query-sev-launch-measure", - "ret-type": "232", + "ret-type": "228", "meta-type": "command", "arg-type": "0" }, { "name": "query-sev-capabilities", - "ret-type": "233", + "ret-type": "229", "meta-type": "command", "arg-type": "0" }, @@ -13719,22 +13710,22 @@ "name": "sev-inject-launch-secret", "ret-type": "0", "meta-type": "command", - "arg-type": "234" + "arg-type": "230" }, { "name": "query-acpi-ospm-status", - "ret-type": "[237]", + "ret-type": "[233]", "meta-type": "command", "arg-type": "0" }, { "name": "ACPI_DEVICE_OST", "meta-type": "event", - "arg-type": "238" + "arg-type": "234" }, { "name": "query-pci", - "ret-type": "[239]", + "ret-type": "[235]", "meta-type": "command", "arg-type": "0" }, @@ -13757,7 +13748,7 @@ }, { "name": "status", - "type": "240" + "type": "236" } ], "meta-type": "object" @@ -13771,7 +13762,7 @@ }, { "name": "reason", - "type": "241" + "type": "237" } ], "meta-type": "object" @@ -13785,7 +13776,7 @@ }, { "name": "reason", - "type": "241" + "type": "237" } ], "meta-type": "object" @@ -13795,7 +13786,7 @@ "members": [ { "name": "action", - "type": "242" + "type": "238" } ], "meta-type": "object" @@ -13805,7 +13796,7 @@ "members": [ { "name": "action", - "type": "242" + "type": "238" } ], "meta-type": "object" @@ -13816,22 +13807,22 @@ { "name": "reboot", "default": null, - "type": "243" + "type": "239" }, { "name": "shutdown", "default": null, - "type": "244" + "type": "240" }, { "name": "panic", "default": null, - "type": "245" + "type": "241" }, { "name": "watchdog", "default": null, - "type": "242" + "type": "238" } ], "meta-type": "object" @@ -13841,12 +13832,12 @@ "members": [ { "name": "action", - "type": "246" + "type": "242" }, { "name": "info", "default": null, - "type": "247" + "type": "243" } ], "meta-type": "object" @@ -13856,12 +13847,12 @@ "members": [ { "name": "action", - "type": "246" + "type": "242" }, { "name": "info", "default": null, - "type": "247" + "type": "243" } ], "meta-type": "object" @@ -13871,15 +13862,15 @@ "members": [ { "name": "recipient", - "type": "248" + "type": "244" }, { "name": "action", - "type": "249" + "type": "245" }, { "name": "flags", - "type": "250" + "type": "246" } ], "meta-type": "object" @@ -14022,7 +14013,7 @@ { "name": "read-only-mode", "default": null, - "type": "251" + "type": "247" } ], "meta-type": "object" @@ -14244,15 +14235,7 @@ { "name": "io-status", "default": null, - "type": "252" - }, - { - "name": "dirty-bitmaps", - "default": null, - "type": "[253]", - "features": [ - "deprecated" - ] + "type": "248" } ], "meta-type": "object" @@ -14293,12 +14276,12 @@ }, { "name": "stats", - "type": "254" + "type": "249" }, { "name": "driver-specific", "default": null, - "type": "255" + "type": "250" }, { "name": "parent", @@ -14351,7 +14334,7 @@ }, { "name": "io-status", - "type": "252" + "type": "248" }, { "name": "ready", @@ -14359,7 +14342,7 @@ }, { "name": "status", - "type": "256" + "type": "251" }, { "name": "auto-finalize", @@ -14447,7 +14430,7 @@ { "name": "mode", "default": null, - "type": "257" + "type": "252" } ], "meta-type": "object" @@ -14535,7 +14518,7 @@ { "name": "on-error", "default": null, - "type": "258" + "type": "253" }, { "name": "filter-node-name", @@ -14569,7 +14552,7 @@ }, { "name": "sync", - "type": "259" + "type": "254" }, { "name": "speed", @@ -14584,7 +14567,7 @@ { "name": "bitmap-mode", "default": null, - "type": "260" + "type": "255" }, { "name": "compress", @@ -14594,12 +14577,12 @@ { "name": "on-source-error", "default": null, - "type": "258" + "type": "253" }, { "name": "on-target-error", "default": null, - "type": "258" + "type": "253" }, { "name": "auto-finalize", @@ -14619,7 +14602,7 @@ { "name": "x-perf", "default": null, - "type": "261" + "type": "256" }, { "name": "target", @@ -14633,7 +14616,7 @@ { "name": "mode", "default": null, - "type": "257" + "type": "252" } ], "meta-type": "object" @@ -14652,7 +14635,7 @@ }, { "name": "sync", - "type": "259" + "type": "254" }, { "name": "speed", @@ -14667,7 +14650,7 @@ { "name": "bitmap-mode", "default": null, - "type": "260" + "type": "255" }, { "name": "compress", @@ -14677,12 +14660,12 @@ { "name": "on-source-error", "default": null, - "type": "258" + "type": "253" }, { "name": "on-target-error", "default": null, - "type": "258" + "type": "253" }, { "name": "auto-finalize", @@ -14702,7 +14685,7 @@ { "name": "x-perf", "default": null, - "type": "261" + "type": "256" }, { "name": "target", @@ -14760,16 +14743,9 @@ "name": "encrypted", "type": "bool" }, - { - "name": "encryption_key_missing", - "type": "bool", - "features": [ - "deprecated" - ] - }, { "name": "detect_zeroes", - "type": "262" + "type": "257" }, { "name": "bps", @@ -14797,7 +14773,7 @@ }, { "name": "image", - "type": "263" + "type": "258" }, { "name": "bps_max", @@ -14871,7 +14847,7 @@ }, { "name": "cache", - "type": "264" + "type": "259" }, { "name": "write_threshold", @@ -14880,7 +14856,7 @@ { "name": "dirty-bitmaps", "default": null, - "type": "[253]" + "type": "[260]" } ], "meta-type": "object" @@ -14890,11 +14866,11 @@ "members": [ { "name": "nodes", - "type": "[265]" + "type": "[261]" }, { "name": "edges", - "type": "[266]" + "type": "[262]" } ], "meta-type": "object" @@ -14932,12 +14908,12 @@ }, { "name": "sync", - "type": "259" + "type": "254" }, { "name": "mode", "default": null, - "type": "257" + "type": "252" }, { "name": "speed", @@ -14957,12 +14933,12 @@ { "name": "on-source-error", "default": null, - "type": "258" + "type": "253" }, { "name": "on-target-error", "default": null, - "type": "258" + "type": "253" }, { "name": "unmap", @@ -14972,7 +14948,7 @@ { "name": "copy-mode", "default": null, - "type": "267" + "type": "263" }, { "name": "auto-finalize", @@ -15043,7 +15019,7 @@ }, { "name": "bitmaps", - "type": "[268]" + "type": "[264]" } ], "meta-type": "object" @@ -15081,7 +15057,7 @@ }, { "name": "sync", - "type": "259" + "type": "254" }, { "name": "speed", @@ -15101,12 +15077,12 @@ { "name": "on-source-error", "default": null, - "type": "258" + "type": "253" }, { "name": "on-target-error", "default": null, - "type": "258" + "type": "253" }, { "name": "filter-node-name", @@ -15116,7 +15092,7 @@ { "name": "copy-mode", "default": null, - "type": "267" + "type": "263" }, { "name": "auto-finalize", @@ -15171,7 +15147,7 @@ { "name": "on-error", "default": null, - "type": "258" + "type": "253" }, { "name": "filter-node-name", @@ -15276,173 +15252,173 @@ "variants": [ { "case": "blkdebug", - "type": "272" + "type": "268" }, { "case": "blklogwrites", - "type": "273" + "type": "269" }, { "case": "blkverify", - "type": "274" + "type": "270" }, { "case": "blkreplay", - "type": "275" + "type": "271" }, { "case": "bochs", - "type": "276" + "type": "272" }, { "case": "cloop", - "type": "276" + "type": "272" }, { "case": "compress", - "type": "276" + "type": "272" }, { "case": "copy-on-read", - "type": "277" + "type": "273" }, { "case": "dmg", - "type": "276" + "type": "272" }, { "case": "file", - "type": "278" + "type": "274" }, { "case": "ftp", - "type": "279" + "type": "275" }, { "case": "ftps", - "type": "280" + "type": "276" }, { "case": "gluster", - "type": "281" + "type": "277" }, { "case": "host_cdrom", - "type": "278" + "type": "274" }, { "case": "host_device", - "type": "278" + "type": "274" }, { "case": "http", - "type": "282" + "type": "278" }, { "case": "https", - "type": "283" + "type": "279" }, { "case": "iscsi", - "type": "284" + "type": "280" }, { "case": "luks", - "type": "285" + "type": "281" }, { "case": "nbd", - "type": "286" + "type": "282" }, { "case": "nfs", - "type": "287" + "type": "283" }, { "case": "null-aio", - "type": "288" + "type": "284" }, { "case": "null-co", - "type": "288" + "type": "284" }, { "case": "nvme", - "type": "289" + "type": "285" }, { "case": "parallels", - "type": "276" + "type": "272" }, { "case": "preallocate", - "type": "290" + "type": "286" }, { "case": "qcow2", - "type": "291" + "type": "287" }, { "case": "qcow", - "type": "292" + "type": "288" }, { "case": "qed", - "type": "293" + "type": "289" }, { "case": "quorum", - "type": "294" + "type": "290" }, { "case": "raw", - "type": "295" + "type": "291" }, { "case": "rbd", - "type": "296" + "type": "292" }, { "case": "replication", - "type": "297" + "type": "293" }, { "case": "sheepdog", - "type": "298" + "type": "294" }, { "case": "ssh", - "type": "299" + "type": "295" }, { "case": "throttle", - "type": "300" + "type": "296" }, { "case": "vdi", - "type": "276" + "type": "272" }, { "case": "vhdx", - "type": "276" + "type": "272" }, { "case": "vmdk", - "type": "293" + "type": "289" }, { "case": "vpc", - "type": "276" + "type": "272" }, { "case": "vvfat", - "type": "301" + "type": "297" } ], "members": [ { "name": "driver", - "type": "269" + "type": "265" }, { "name": "node-name", @@ -15452,12 +15428,12 @@ { "name": "discard", "default": null, - "type": "270" + "type": "266" }, { "name": "cache", "default": null, - "type": "271" + "type": "267" }, { "name": "read-only", @@ -15477,7 +15453,7 @@ { "name": "detect-zeroes", "default": null, - "type": "262" + "type": "257" } ], "meta-type": "object" @@ -15501,7 +15477,7 @@ }, { "name": "options", - "type": "302" + "type": "298" } ], "meta-type": "object" @@ -15519,7 +15495,7 @@ }, { "name": "options", - "type": "303" + "type": "299" }, { "name": "force", @@ -15576,11 +15552,11 @@ }, { "name": "operation", - "type": "304" + "type": "300" }, { "name": "action", - "type": "305" + "type": "301" }, { "name": "nospace", @@ -15599,7 +15575,7 @@ "members": [ { "name": "type", - "type": "306" + "type": "302" }, { "name": "device", @@ -15630,7 +15606,7 @@ "members": [ { "name": "type", - "type": "306" + "type": "302" }, { "name": "device", @@ -15660,11 +15636,11 @@ }, { "name": "operation", - "type": "304" + "type": "300" }, { "name": "action", - "type": "305" + "type": "301" } ], "meta-type": "object" @@ -15674,7 +15650,7 @@ "members": [ { "name": "type", - "type": "306" + "type": "302" }, { "name": "device", @@ -15700,7 +15676,7 @@ "members": [ { "name": "type", - "type": "306" + "type": "302" }, { "name": "id", @@ -15770,7 +15746,7 @@ }, { "name": "iothread", - "type": "307" + "type": "303" }, { "name": "force", @@ -15803,7 +15779,7 @@ "members": [ { "name": "type", - "type": "308" + "type": "304" }, { "name": "error", @@ -15907,7 +15883,7 @@ }, { "name": "status", - "type": "256" + "type": "251" } ], "meta-type": "object" @@ -15986,11 +15962,11 @@ }, { "name": "type", - "type": "306" + "type": "302" }, { "name": "status", - "type": "256" + "type": "251" }, { "name": "current-progress", @@ -16013,7 +15989,7 @@ "members": [ { "name": "addr", - "type": "309" + "type": "305" }, { "name": "tls-creds", @@ -16073,7 +16049,7 @@ { "name": "mode", "default": null, - "type": "310" + "type": "306" } ], "meta-type": "object" @@ -16084,17 +16060,17 @@ "variants": [ { "case": "nbd", - "type": "312" + "type": "308" }, { "case": "vhost-user-blk", - "type": "313" + "type": "309" } ], "members": [ { "name": "type", - "type": "311" + "type": "307" }, { "name": "id", @@ -16137,7 +16113,7 @@ { "name": "mode", "default": null, - "type": "310" + "type": "306" } ], "meta-type": "object" @@ -16166,7 +16142,7 @@ }, { "name": "type", - "type": "311" + "type": "307" }, { "name": "node-name", @@ -16231,7 +16207,7 @@ { "name": "format", "default": null, - "type": "315" + "type": "311" } ], "meta-type": "object" @@ -16250,7 +16226,7 @@ { "name": "format", "default": null, - "type": "315" + "type": "311" } ], "meta-type": "object" @@ -16269,7 +16245,7 @@ }, { "name": "backend", - "type": "316" + "type": "312" } ], "meta-type": "object" @@ -16294,7 +16270,7 @@ }, { "name": "backend", - "type": "316" + "type": "312" } ], "meta-type": "object" @@ -16362,7 +16338,7 @@ { "name": "format", "default": null, - "type": "317" + "type": "313" } ], "meta-type": "object" @@ -16372,7 +16348,7 @@ "members": [ { "name": "status", - "type": "318" + "type": "314" }, { "name": "completed", @@ -16405,7 +16381,7 @@ "members": [ { "name": "formats", - "type": "[317]" + "type": "[313]" } ], "meta-type": "object" @@ -16430,47 +16406,47 @@ "variants": [ { "case": "nic", - "type": "320" + "type": "316" }, { "case": "user", - "type": "321" + "type": "317" }, { "case": "tap", - "type": "322" + "type": "318" }, { "case": "l2tpv3", - "type": "323" + "type": "319" }, { "case": "socket", - "type": "324" + "type": "320" }, { "case": "vde", - "type": "325" + "type": "321" }, { "case": "bridge", - "type": "326" + "type": "322" }, { "case": "hubport", - "type": "327" + "type": "323" }, { "case": "netmap", - "type": "328" + "type": "324" }, { "case": "vhost-user", - "type": "329" + "type": "325" }, { "case": "vhost-vdpa", - "type": "330" + "type": "326" }, { "case": "none", @@ -16484,7 +16460,7 @@ }, { "name": "type", - "type": "319" + "type": "315" } ], "meta-type": "object" @@ -16528,15 +16504,15 @@ }, { "name": "multicast", - "type": "331" + "type": "327" }, { "name": "unicast", - "type": "331" + "type": "327" }, { "name": "vlan", - "type": "331" + "type": "327" }, { "name": "broadcast-allowed", @@ -16626,40 +16602,103 @@ ], "meta-type": "object" }, + { + "name": "[107]", + "element-type": "107", + "meta-type": "array" + }, { "name": "107", - "members": [ + "tag": "type", + "variants": [ { - "name": "netdev", - "type": "str" + "case": "bridge", + "type": "322" }, { - "name": "gid-status", - "type": "bool" + "case": "l2tpv3", + "type": "319" }, { - "name": "subnet-prefix", - "type": "int" + "case": "netmap", + "type": "324" }, { - "name": "interface-id", - "type": "int" - } - ], - "meta-type": "object" - }, - { - "name": "108", - "members": [ - { - "name": "name", + "case": "socket", + "type": "320" + }, + { + "case": "tap", + "type": "318" + }, + { + "case": "user", + "type": "317" + }, + { + "case": "vde", + "type": "321" + }, + { + "case": "vhost-user", + "type": "325" + }, + { + "case": "vhost-vdpa", + "type": "326" + } + ], + "members": [ + { + "name": "id", + "type": "str" + }, + { + "name": "type", + "type": "328" + }, + { + "name": "peer-id", + "default": null, + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "108", + "members": [ + { + "name": "netdev", "type": "str" + }, + { + "name": "gid-status", + "type": "bool" + }, + { + "name": "subnet-prefix", + "type": "int" + }, + { + "name": "interface-id", + "type": "int" } ], "meta-type": "object" }, { "name": "109", + "members": [ + { + "name": "name", + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "110", "members": [ { "name": "name", @@ -16677,7 +16716,7 @@ "meta-type": "object" }, { - "name": "110", + "name": "111", "members": [ { "name": "name", @@ -16687,12 +16726,12 @@ "meta-type": "object" }, { - "name": "[111]", - "element-type": "111", + "name": "[112]", + "element-type": "112", "meta-type": "array" }, { - "name": "111", + "name": "112", "members": [ { "name": "name", @@ -16712,17 +16751,17 @@ }, { "name": "duplex", - "type": "332" + "type": "329" }, { "name": "autoneg", - "type": "333" + "type": "330" } ], "meta-type": "object" }, { - "name": "112", + "name": "113", "members": [ { "name": "name", @@ -16737,12 +16776,12 @@ "meta-type": "object" }, { - "name": "[113]", - "element-type": "113", + "name": "[114]", + "element-type": "114", "meta-type": "array" }, { - "name": "113", + "name": "114", "members": [ { "name": "cookie", @@ -16754,21 +16793,21 @@ }, { "name": "key", - "type": "334" + "type": "331" }, { "name": "mask", - "type": "335" + "type": "332" }, { "name": "action", - "type": "336" + "type": "333" } ], "meta-type": "object" }, { - "name": "114", + "name": "115", "members": [ { "name": "name", @@ -16783,12 +16822,12 @@ "meta-type": "object" }, { - "name": "[115]", - "element-type": "115", + "name": "[116]", + "element-type": "116", "meta-type": "array" }, { - "name": "115", + "name": "116", "members": [ { "name": "id", @@ -16857,12 +16896,12 @@ "meta-type": "object" }, { - "name": "[116]", - "element-type": "116", + "name": "[117]", + "element-type": "117", "meta-type": "array" }, { - "name": "116", + "name": "117", "meta-type": "enum", "values": [ "tpm-tis", @@ -16871,12 +16910,12 @@ ] }, { - "name": "[117]", - "element-type": "117", + "name": "[118]", + "element-type": "118", "meta-type": "array" }, { - "name": "117", + "name": "118", "meta-type": "enum", "values": [ "passthrough", @@ -16884,12 +16923,12 @@ ] }, { - "name": "[118]", - "element-type": "118", + "name": "[119]", + "element-type": "119", "meta-type": "array" }, { - "name": "118", + "name": "119", "members": [ { "name": "id", @@ -16897,17 +16936,17 @@ }, { "name": "model", - "type": "116" + "type": "117" }, { "name": "options", - "type": "337" + "type": "334" } ], "meta-type": "object" }, { - "name": "119", + "name": "120", "members": [ { "name": "protocol", @@ -16926,7 +16965,7 @@ "meta-type": "object" }, { - "name": "120", + "name": "121", "members": [ { "name": "protocol", @@ -16940,7 +16979,7 @@ "meta-type": "object" }, { - "name": "121", + "name": "122", "members": [ { "name": "filename", @@ -16960,7 +16999,7 @@ "meta-type": "object" }, { - "name": "122", + "name": "123", "members": [ { "name": "enabled", @@ -16997,60 +17036,60 @@ }, { "name": "mouse-mode", - "type": "338" + "type": "335" }, { "name": "channels", "default": null, - "type": "[339]" + "type": "[336]" } ], "meta-type": "object" }, { - "name": "123", + "name": "124", "members": [ { "name": "server", - "type": "340" + "type": "337" }, { "name": "client", - "type": "340" + "type": "337" } ], "meta-type": "object" }, { - "name": "124", + "name": "125", "members": [ { "name": "server", - "type": "341" + "type": "338" }, { "name": "client", - "type": "339" + "type": "336" } ], "meta-type": "object" }, { - "name": "125", + "name": "126", "members": [ { "name": "server", - "type": "340" + "type": "337" }, { "name": "client", - "type": "340" + "type": "337" } ], "meta-type": "object" }, { - "name": "126", + "name": "127", "members": [ { "name": "enabled", @@ -17064,7 +17103,7 @@ { "name": "family", "default": null, - "type": "342" + "type": "339" }, { "name": "service", @@ -17079,18 +17118,18 @@ { "name": "clients", "default": null, - "type": "[343]" + "type": "[340]" } ], "meta-type": "object" }, { - "name": "[127]", - "element-type": "127", + "name": "[128]", + "element-type": "128", "meta-type": "array" }, { - "name": "127", + "name": "128", "members": [ { "name": "id", @@ -17098,20 +17137,20 @@ }, { "name": "server", - "type": "[344]" + "type": "[341]" }, { "name": "clients", - "type": "[343]" + "type": "[340]" }, { "name": "auth", - "type": "345" + "type": "342" }, { "name": "vencrypt", "default": null, - "type": "346" + "type": "343" }, { "name": "display", @@ -17122,7 +17161,7 @@ "meta-type": "object" }, { - "name": "128", + "name": "129", "members": [ { "name": "password", @@ -17132,54 +17171,54 @@ "meta-type": "object" }, { - "name": "129", + "name": "130", "members": [ { "name": "server", - "type": "347" + "type": "344" }, { "name": "client", - "type": "348" + "type": "345" } ], "meta-type": "object" }, { - "name": "130", + "name": "131", "members": [ { "name": "server", - "type": "347" + "type": "344" }, { "name": "client", - "type": "343" + "type": "340" } ], "meta-type": "object" }, { - "name": "131", + "name": "132", "members": [ { "name": "server", - "type": "347" + "type": "344" }, { "name": "client", - "type": "343" + "type": "340" } ], "meta-type": "object" }, { - "name": "[132]", - "element-type": "132", + "name": "[133]", + "element-type": "133", "meta-type": "array" }, { - "name": "132", + "name": "133", "members": [ { "name": "name", @@ -17201,11 +17240,11 @@ "meta-type": "object" }, { - "name": "133", + "name": "134", "members": [ { "name": "keys", - "type": "[349]" + "type": "[346]" }, { "name": "hold-time", @@ -17216,7 +17255,7 @@ "meta-type": "object" }, { - "name": "134", + "name": "135", "members": [ { "name": "device", @@ -17230,26 +17269,26 @@ }, { "name": "events", - "type": "[350]" + "type": "[347]" } ], "meta-type": "object" }, { - "name": "135", + "name": "136", "tag": "type", "variants": [ { "case": "gtk", - "type": "353" + "type": "350" }, { "case": "curses", - "type": "354" + "type": "351" }, { "case": "egl-headless", - "type": "355" + "type": "352" }, { "case": "default", @@ -17275,7 +17314,7 @@ "members": [ { "name": "type", - "type": "351" + "type": "348" }, { "name": "full-screen", @@ -17295,38 +17334,38 @@ { "name": "gl", "default": null, - "type": "352" + "type": "349" } ], "meta-type": "object" }, { - "name": "136", + "name": "137", "members": [ { "name": "status", "default": null, - "type": "356" + "type": "353" }, { "name": "ram", "default": null, - "type": "357" + "type": "354" }, { "name": "disk", "default": null, - "type": "357" + "type": "354" }, { "name": "vfio", "default": null, - "type": "358" + "type": "355" }, { "name": "xbzrle-cache", "default": null, - "type": "359" + "type": "356" }, { "name": "total-time", @@ -17380,37 +17419,37 @@ { "name": "compression", "default": null, - "type": "360" + "type": "357" }, { "name": "socket-address", "default": null, - "type": "[361]" + "type": "[358]" } ], "meta-type": "object" }, { - "name": "137", + "name": "138", "members": [ { "name": "capabilities", - "type": "[138]" + "type": "[139]" } ], "meta-type": "object" }, { - "name": "[138]", - "element-type": "138", + "name": "[139]", + "element-type": "139", "meta-type": "array" }, { - "name": "138", + "name": "139", "members": [ { "name": "capability", - "type": "362" + "type": "359" }, { "name": "state", @@ -17420,7 +17459,7 @@ "meta-type": "object" }, { - "name": "139", + "name": "140", "members": [ { "name": "announce-initial", @@ -17485,17 +17524,17 @@ { "name": "tls-creds", "default": null, - "type": "307" + "type": "303" }, { "name": "tls-hostname", "default": null, - "type": "307" + "type": "303" }, { "name": "tls-authz", "default": null, - "type": "307" + "type": "303" }, { "name": "max-bandwidth", @@ -17540,7 +17579,7 @@ { "name": "multifd-compression", "default": null, - "type": "363" + "type": "360" }, { "name": "multifd-zlib-level", @@ -17555,13 +17594,13 @@ { "name": "block-bitmap-mapping", "default": null, - "type": "[364]" + "type": "[361]" } ], "meta-type": "object" }, { - "name": "140", + "name": "141", "members": [ { "name": "announce-initial", @@ -17681,7 +17720,7 @@ { "name": "multifd-compression", "default": null, - "type": "363" + "type": "360" }, { "name": "multifd-zlib-level", @@ -17696,13 +17735,13 @@ { "name": "block-bitmap-mapping", "default": null, - "type": "[364]" + "type": "[361]" } ], "meta-type": "object" }, { - "name": "141", + "name": "142", "members": [ { "name": "protocol", @@ -17731,17 +17770,17 @@ "meta-type": "object" }, { - "name": "142", + "name": "143", "members": [ { "name": "status", - "type": "356" + "type": "353" } ], "meta-type": "object" }, { - "name": "143", + "name": "144", "members": [ { "name": "pass", @@ -17751,25 +17790,15 @@ "meta-type": "object" }, { - "name": "144", + "name": "145", "members": [ { "name": "mode", - "type": "365" + "type": "362" }, { "name": "reason", - "type": "366" - } - ], - "meta-type": "object" - }, - { - "name": "145", - "members": [ - { - "name": "state", - "type": "356" + "type": "363" } ], "meta-type": "object" @@ -17778,8 +17807,8 @@ "name": "146", "members": [ { - "name": "value", - "type": "number" + "name": "state", + "type": "353" } ], "meta-type": "object" @@ -17788,34 +17817,9 @@ "name": "147", "members": [ { - "name": "value", - "type": "int" - } - ], - "meta-type": "object" - }, - { - "name": "148", - "members": [ - { - "name": "value", - "type": "int" - } - ], - "meta-type": "object" - }, - { - "name": "int", - "json-type": "int", - "meta-type": "builtin" - }, - { - "name": "149", - "members": [ - { - "name": "uri", - "type": "str" - }, + "name": "uri", + "type": "str" + }, { "name": "blk", "default": null, @@ -17840,7 +17844,7 @@ "meta-type": "object" }, { - "name": "150", + "name": "148", "members": [ { "name": "uri", @@ -17850,7 +17854,7 @@ "meta-type": "object" }, { - "name": "151", + "name": "149", "members": [ { "name": "filename", @@ -17865,7 +17869,7 @@ "meta-type": "object" }, { - "name": "152", + "name": "150", "members": [ { "name": "enable", @@ -17875,7 +17879,7 @@ "meta-type": "object" }, { - "name": "153", + "name": "151", "members": [ { "name": "filename", @@ -17885,7 +17889,7 @@ "meta-type": "object" }, { - "name": "154", + "name": "152", "members": [ { "name": "enable", @@ -17904,7 +17908,7 @@ "meta-type": "object" }, { - "name": "155", + "name": "153", "members": [ { "name": "error", @@ -17919,25 +17923,25 @@ "meta-type": "object" }, { - "name": "156", + "name": "154", "members": [ { "name": "mode", - "type": "365" + "type": "362" }, { "name": "last-mode", - "type": "365" + "type": "362" }, { "name": "reason", - "type": "366" + "type": "363" } ], "meta-type": "object" }, { - "name": "157", + "name": "155", "members": [ { "name": "uri", @@ -17947,7 +17951,7 @@ "meta-type": "object" }, { - "name": "158", + "name": "156", "members": [ { "name": "device-id", @@ -17957,7 +17961,7 @@ "meta-type": "object" }, { - "name": "159", + "name": "157", "members": [ { "name": "calc-time", @@ -17967,7 +17971,7 @@ "meta-type": "object" }, { - "name": "160", + "name": "158", "members": [ { "name": "dirty-rate", @@ -17976,7 +17980,7 @@ }, { "name": "status", - "type": "367" + "type": "364" }, { "name": "start-time", @@ -17990,7 +17994,7 @@ "meta-type": "object" }, { - "name": "161", + "name": "159", "members": [ { "name": "job-id", @@ -18012,7 +18016,7 @@ "meta-type": "object" }, { - "name": "162", + "name": "160", "members": [ { "name": "job-id", @@ -18034,7 +18038,7 @@ "meta-type": "object" }, { - "name": "163", + "name": "161", "members": [ { "name": "job-id", @@ -18052,22 +18056,22 @@ "meta-type": "object" }, { - "name": "164", + "name": "162", "members": [ { "name": "actions", - "type": "[368]" + "type": "[365]" }, { "name": "properties", "default": null, - "type": "369" + "type": "366" } ], "meta-type": "object" }, { - "name": "165", + "name": "163", "members": [ { "name": "name", @@ -18082,12 +18086,12 @@ "meta-type": "object" }, { - "name": "[166]", - "element-type": "166", + "name": "[164]", + "element-type": "164", "meta-type": "array" }, { - "name": "166", + "name": "164", "members": [ { "name": "name", @@ -18095,7 +18099,7 @@ }, { "name": "state", - "type": "370" + "type": "367" }, { "name": "vcpu", @@ -18105,7 +18109,7 @@ "meta-type": "object" }, { - "name": "167", + "name": "165", "members": [ { "name": "name", @@ -18129,22 +18133,22 @@ "meta-type": "object" }, { - "name": "168", + "name": "166", "members": [ { "name": "enable", "default": null, - "type": "[371]" + "type": "[368]" } ], "meta-type": "object" }, { - "name": "169", + "name": "167", "members": [ { "name": "qemu", - "type": "372" + "type": "369" }, { "name": "package", @@ -18154,27 +18158,12 @@ "meta-type": "object" }, { - "name": "[170]", - "element-type": "170", - "meta-type": "array" - }, - { - "name": "170", - "members": [ - { - "name": "name", - "type": "str" - } - ], - "meta-type": "object" - }, - { - "name": "[171]", - "element-type": "171", + "name": "[168]", + "element-type": "168", "meta-type": "array" }, { - "name": "171", + "name": "168", "members": [ { "name": "name", @@ -18184,41 +18173,41 @@ "meta-type": "object" }, { - "name": "[172]", - "element-type": "172", + "name": "[169]", + "element-type": "169", "meta-type": "array" }, { - "name": "172", + "name": "169", "tag": "meta-type", "variants": [ { "case": "builtin", - "type": "374" + "type": "371" }, { "case": "enum", - "type": "375" + "type": "372" }, { "case": "array", - "type": "376" + "type": "373" }, { "case": "object", - "type": "377" + "type": "374" }, { "case": "alternate", - "type": "378" + "type": "375" }, { "case": "command", - "type": "379" + "type": "376" }, { "case": "event", - "type": "380" + "type": "377" } ], "members": [ @@ -18228,7 +18217,7 @@ }, { "name": "meta-type", - "type": "373" + "type": "370" }, { "name": "features", @@ -18239,7 +18228,7 @@ "meta-type": "object" }, { - "name": "173", + "name": "170", "members": [ { "name": "path", @@ -18249,12 +18238,12 @@ "meta-type": "object" }, { - "name": "[174]", - "element-type": "174", + "name": "[171]", + "element-type": "171", "meta-type": "array" }, { - "name": "174", + "name": "171", "members": [ { "name": "name", @@ -18278,7 +18267,7 @@ "meta-type": "object" }, { - "name": "175", + "name": "172", "members": [ { "name": "path", @@ -18297,7 +18286,7 @@ "meta-type": "builtin" }, { - "name": "176", + "name": "173", "members": [ { "name": "path", @@ -18315,7 +18304,7 @@ "meta-type": "object" }, { - "name": "177", + "name": "174", "members": [ { "name": "implements", @@ -18331,12 +18320,12 @@ "meta-type": "object" }, { - "name": "[178]", - "element-type": "178", + "name": "[175]", + "element-type": "175", "meta-type": "array" }, { - "name": "178", + "name": "175", "members": [ { "name": "name", @@ -18356,7 +18345,7 @@ "meta-type": "object" }, { - "name": "179", + "name": "176", "members": [ { "name": "typename", @@ -18366,26 +18355,164 @@ "meta-type": "object" }, { - "name": "180", + "name": "177", + "tag": "qom-type", + "variants": [ + { + "case": "authz-list", + "type": "379" + }, + { + "case": "authz-listfile", + "type": "380" + }, + { + "case": "authz-pam", + "type": "381" + }, + { + "case": "authz-simple", + "type": "382" + }, + { + "case": "can-host-socketcan", + "type": "383" + }, + { + "case": "colo-compare", + "type": "384" + }, + { + "case": "cryptodev-backend", + "type": "385" + }, + { + "case": "cryptodev-backend-builtin", + "type": "385" + }, + { + "case": "dbus-vmstate", + "type": "387" + }, + { + "case": "filter-buffer", + "type": "388" + }, + { + "case": "filter-dump", + "type": "389" + }, + { + "case": "filter-mirror", + "type": "390" + }, + { + "case": "filter-redirector", + "type": "391" + }, + { + "case": "filter-replay", + "type": "392" + }, + { + "case": "filter-rewriter", + "type": "393" + }, + { + "case": "input-barrier", + "type": "394" + }, + { + "case": "input-linux", + "type": "395" + }, + { + "case": "iothread", + "type": "396" + }, + { + "case": "memory-backend-file", + "type": "397" + }, + { + "case": "memory-backend-memfd", + "type": "398" + }, + { + "case": "memory-backend-ram", + "type": "399" + }, + { + "case": "pr-manager-helper", + "type": "400" + }, + { + "case": "rng-builtin", + "type": "401" + }, + { + "case": "rng-egd", + "type": "402" + }, + { + "case": "rng-random", + "type": "403" + }, + { + "case": "secret", + "type": "404" + }, + { + "case": "secret_keyring", + "type": "405" + }, + { + "case": "throttle-group", + "type": "407" + }, + { + "case": "tls-creds-anon", + "type": "408" + }, + { + "case": "tls-creds-psk", + "type": "409" + }, + { + "case": "tls-creds-x509", + "type": "410" + }, + { + "case": "tls-cipher-suites", + "type": "411" + }, + { + "case": "x-remote-object", + "type": "412" + }, + { + "case": "can-bus", + "type": "0" + }, + { + "case": "s390-pv-guest", + "type": "0" + } + ], "members": [ { "name": "qom-type", - "type": "str" + "type": "378" }, { "name": "id", "type": "str" - }, - { - "name": "props", - "default": null, - "type": "any" } ], "meta-type": "object" }, { - "name": "181", + "name": "178", "members": [ { "name": "id", @@ -18395,7 +18522,7 @@ "meta-type": "object" }, { - "name": "182", + "name": "179", "members": [ { "name": "typename", @@ -18405,7 +18532,7 @@ "meta-type": "object" }, { - "name": "183", + "name": "180", "members": [ { "name": "driver", @@ -18425,7 +18552,7 @@ "meta-type": "object" }, { - "name": "184", + "name": "181", "members": [ { "name": "id", @@ -18435,7 +18562,7 @@ "meta-type": "object" }, { - "name": "185", + "name": "182", "members": [ { "name": "device", @@ -18450,96 +18577,21 @@ "meta-type": "object" }, { - "name": "[186]", - "element-type": "186", + "name": "[183]", + "element-type": "183", "meta-type": "array" }, { - "name": "186", - "tag": "arch", + "name": "183", + "tag": "target", "variants": [ { - "case": "x86", - "type": "383" + "case": "s390x", + "type": "415" }, { - "case": "sparc", - "type": "384" - }, - { - "case": "ppc", - "type": "385" - }, - { - "case": "mips", - "type": "386" - }, - { - "case": "tricore", - "type": "387" - }, - { - "case": "s390", - "type": "388" - }, - { - "case": "riscv", - "type": "389" - }, - { - "case": "other", - "type": "0" - } - ], - "members": [ - { - "name": "CPU", - "type": "int" - }, - { - "name": "current", - "type": "bool" - }, - { - "name": "halted", - "type": "bool" - }, - { - "name": "qom_path", - "type": "str" - }, - { - "name": "thread_id", - "type": "int" - }, - { - "name": "props", - "default": null, - "type": "381" - }, - { - "name": "arch", - "type": "382" - } - ], - "meta-type": "object" - }, - { - "name": "[187]", - "element-type": "187", - "meta-type": "array" - }, - { - "name": "187", - "tag": "target", - "variants": [ - { - "case": "s390x", - "type": "388" - }, - { - "case": "aarch64", - "type": "0" + "case": "aarch64", + "type": "0" }, { "case": "alpha", @@ -18682,29 +18734,22 @@ { "name": "props", "default": null, - "type": "381" - }, - { - "name": "arch", - "type": "382", - "features": [ - "deprecated" - ] + "type": "413" }, { "name": "target", - "type": "390" + "type": "414" } ], "meta-type": "object" }, { - "name": "[188]", - "element-type": "188", + "name": "[184]", + "element-type": "184", "meta-type": "array" }, { - "name": "188", + "name": "184", "members": [ { "name": "name", @@ -18750,7 +18795,7 @@ "meta-type": "object" }, { - "name": "189", + "name": "185", "members": [ { "name": "wakeup-suspend-support", @@ -18760,17 +18805,17 @@ "meta-type": "object" }, { - "name": "190", + "name": "186", "members": [ { "name": "arch", - "type": "390" + "type": "414" } ], "meta-type": "object" }, { - "name": "191", + "name": "187", "members": [ { "name": "UUID", @@ -18780,7 +18825,7 @@ "meta-type": "object" }, { - "name": "192", + "name": "188", "members": [ { "name": "guid", @@ -18790,7 +18835,7 @@ "meta-type": "object" }, { - "name": "193", + "name": "189", "members": [ { "name": "enabled", @@ -18804,7 +18849,7 @@ "meta-type": "object" }, { - "name": "194", + "name": "190", "members": [ { "name": "val", @@ -18827,7 +18872,7 @@ "meta-type": "object" }, { - "name": "195", + "name": "191", "members": [ { "name": "val", @@ -18845,12 +18890,12 @@ "meta-type": "object" }, { - "name": "[196]", - "element-type": "196", + "name": "[192]", + "element-type": "192", "meta-type": "array" }, { - "name": "196", + "name": "192", "members": [ { "name": "id", @@ -18879,18 +18924,18 @@ }, { "name": "policy", - "type": "391" + "type": "416" } ], "meta-type": "object" }, { - "name": "[197]", - "element-type": "197", + "name": "[193]", + "element-type": "193", "meta-type": "array" }, { - "name": "197", + "name": "193", "members": [ { "name": "type", @@ -18902,7 +18947,7 @@ }, { "name": "props", - "type": "381" + "type": "413" }, { "name": "qom-path", @@ -18913,40 +18958,40 @@ "meta-type": "object" }, { - "name": "198", + "name": "194", "tag": "type", "variants": [ { "case": "node", - "type": "393" + "type": "418" }, { "case": "dist", - "type": "394" + "type": "419" }, { "case": "cpu", - "type": "395" + "type": "420" }, { "case": "hmat-lb", - "type": "396" + "type": "421" }, { "case": "hmat-cache", - "type": "397" + "type": "422" } ], "members": [ { "name": "type", - "type": "392" + "type": "417" } ], "meta-type": "object" }, { - "name": "199", + "name": "195", "members": [ { "name": "value", @@ -18956,7 +19001,7 @@ "meta-type": "object" }, { - "name": "200", + "name": "196", "members": [ { "name": "actual", @@ -18966,7 +19011,7 @@ "meta-type": "object" }, { - "name": "201", + "name": "197", "members": [ { "name": "actual", @@ -18976,7 +19021,7 @@ "meta-type": "object" }, { - "name": "202", + "name": "198", "members": [ { "name": "base-memory", @@ -18991,41 +19036,41 @@ "meta-type": "object" }, { - "name": "[203]", - "element-type": "203", + "name": "[199]", + "element-type": "199", "meta-type": "array" }, { - "name": "203", + "name": "199", "tag": "type", "variants": [ { "case": "dimm", - "type": "399" + "type": "424" }, { "case": "nvdimm", - "type": "399" + "type": "424" }, { "case": "virtio-pmem", - "type": "400" + "type": "425" }, { "case": "virtio-mem", - "type": "401" + "type": "426" } ], "members": [ { "name": "type", - "type": "398" + "type": "423" } ], "meta-type": "object" }, { - "name": "204", + "name": "200", "members": [ { "name": "id", @@ -19040,7 +19085,7 @@ "meta-type": "object" }, { - "name": "205", + "name": "201", "members": [ { "name": "device", @@ -19054,36 +19099,36 @@ "meta-type": "object" }, { - "name": "210", + "name": "206", "members": [ { "name": "type", - "type": "404" + "type": "429" }, { "name": "model", - "type": "402" + "type": "427" } ], "meta-type": "object" }, { - "name": "211", + "name": "207", "members": [ { "name": "model", - "type": "402" + "type": "427" } ], "meta-type": "object" }, { - "name": "[212]", - "element-type": "212", + "name": "[208]", + "element-type": "208", "meta-type": "array" }, { - "name": "212", + "name": "208", "members": [ { "name": "name", @@ -19120,11 +19165,11 @@ "meta-type": "object" }, { - "name": "213", + "name": "209", "members": [ { "name": "mode", - "type": "405" + "type": "430" }, { "name": "filename", @@ -19139,7 +19184,7 @@ "meta-type": "object" }, { - "name": "214", + "name": "210", "members": [ { "name": "icount", @@ -19149,7 +19194,7 @@ "meta-type": "object" }, { - "name": "215", + "name": "211", "members": [ { "name": "icount", @@ -19159,31 +19204,31 @@ "meta-type": "object" }, { - "name": "216", + "name": "212", "members": [ { "name": "instances", - "type": "[217]" + "type": "[213]" } ], "meta-type": "object" }, { - "name": "[217]", - "element-type": "217", + "name": "[213]", + "element-type": "213", "meta-type": "array" }, { - "name": "217", + "name": "213", "tag": "type", "variants": [ { "case": "block-node", - "type": "407" + "type": "432" }, { "case": "chardev", - "type": "408" + "type": "433" }, { "case": "migration", @@ -19193,13 +19238,13 @@ "members": [ { "name": "type", - "type": "406" + "type": "431" } ], "meta-type": "object" }, { - "name": "218", + "name": "214", "members": [ { "name": "protocol", @@ -19223,7 +19268,7 @@ "meta-type": "object" }, { - "name": "219", + "name": "215", "members": [ { "name": "name", @@ -19234,12 +19279,12 @@ "meta-type": "object" }, { - "name": "[220]", - "element-type": "220", + "name": "[216]", + "element-type": "216", "meta-type": "array" }, { - "name": "220", + "name": "216", "members": [ { "name": "id", @@ -19265,7 +19310,7 @@ "meta-type": "object" }, { - "name": "221", + "name": "217", "members": [ { "name": "command-line", @@ -19280,7 +19325,7 @@ "meta-type": "object" }, { - "name": "222", + "name": "218", "members": [ { "name": "fdname", @@ -19290,7 +19335,7 @@ "meta-type": "object" }, { - "name": "223", + "name": "219", "members": [ { "name": "fdname", @@ -19300,7 +19345,7 @@ "meta-type": "object" }, { - "name": "224", + "name": "220", "members": [ { "name": "fdset-id", @@ -19316,7 +19361,7 @@ "meta-type": "object" }, { - "name": "225", + "name": "221", "members": [ { "name": "fdset-id", @@ -19330,7 +19375,7 @@ "meta-type": "object" }, { - "name": "226", + "name": "222", "members": [ { "name": "fdset-id", @@ -19345,12 +19390,12 @@ "meta-type": "object" }, { - "name": "[227]", - "element-type": "227", + "name": "[223]", + "element-type": "223", "meta-type": "array" }, { - "name": "227", + "name": "223", "members": [ { "name": "fdset-id", @@ -19358,13 +19403,13 @@ }, { "name": "fds", - "type": "[409]" + "type": "[434]" } ], "meta-type": "object" }, { - "name": "228", + "name": "224", "members": [ { "name": "option", @@ -19375,12 +19420,12 @@ "meta-type": "object" }, { - "name": "[229]", - "element-type": "229", + "name": "[225]", + "element-type": "225", "meta-type": "array" }, { - "name": "229", + "name": "225", "members": [ { "name": "option", @@ -19388,13 +19433,13 @@ }, { "name": "parameters", - "type": "[410]" + "type": "[435]" } ], "meta-type": "object" }, { - "name": "230", + "name": "226", "members": [ { "name": "offset", @@ -19404,7 +19449,7 @@ "meta-type": "object" }, { - "name": "231", + "name": "227", "members": [ { "name": "enabled", @@ -19428,7 +19473,7 @@ }, { "name": "state", - "type": "411" + "type": "436" }, { "name": "handle", @@ -19438,7 +19483,7 @@ "meta-type": "object" }, { - "name": "232", + "name": "228", "members": [ { "name": "data", @@ -19448,7 +19493,7 @@ "meta-type": "object" }, { - "name": "233", + "name": "229", "members": [ { "name": "pdh", @@ -19470,7 +19515,7 @@ "meta-type": "object" }, { - "name": "234", + "name": "230", "members": [ { "name": "packet-header", @@ -19489,12 +19534,12 @@ "meta-type": "object" }, { - "name": "[237]", - "element-type": "237", + "name": "[233]", + "element-type": "233", "meta-type": "array" }, { - "name": "237", + "name": "233", "members": [ { "name": "device", @@ -19507,7 +19552,7 @@ }, { "name": "slot-type", - "type": "412" + "type": "437" }, { "name": "source", @@ -19521,22 +19566,22 @@ "meta-type": "object" }, { - "name": "238", + "name": "234", "members": [ { "name": "info", - "type": "237" + "type": "233" } ], "meta-type": "object" }, { - "name": "[239]", - "element-type": "239", + "name": "[235]", + "element-type": "235", "meta-type": "array" }, { - "name": "239", + "name": "235", "members": [ { "name": "bus", @@ -19544,7 +19589,7 @@ }, { "name": "devices", - "type": "[413]" + "type": "[438]" } ], "meta-type": "object" @@ -19555,7 +19600,7 @@ "meta-type": "builtin" }, { - "name": "240", + "name": "236", "meta-type": "enum", "values": [ "debug", @@ -19577,7 +19622,7 @@ ] }, { - "name": "241", + "name": "237", "meta-type": "enum", "values": [ "none", @@ -19593,7 +19638,7 @@ ] }, { - "name": "242", + "name": "238", "meta-type": "enum", "values": [ "reset", @@ -19606,7 +19651,7 @@ ] }, { - "name": "243", + "name": "239", "meta-type": "enum", "values": [ "reset", @@ -19614,7 +19659,7 @@ ] }, { - "name": "244", + "name": "240", "meta-type": "enum", "values": [ "poweroff", @@ -19622,7 +19667,7 @@ ] }, { - "name": "245", + "name": "241", "meta-type": "enum", "values": [ "pause", @@ -19631,7 +19676,7 @@ ] }, { - "name": "246", + "name": "242", "meta-type": "enum", "values": [ "pause", @@ -19640,28 +19685,28 @@ ] }, { - "name": "247", + "name": "243", "tag": "type", "variants": [ { "case": "hyper-v", - "type": "415" + "type": "440" }, { "case": "s390", - "type": "416" + "type": "441" } ], "members": [ { "name": "type", - "type": "414" + "type": "439" } ], "meta-type": "object" }, { - "name": "248", + "name": "244", "meta-type": "enum", "values": [ "hypervisor", @@ -19669,7 +19714,7 @@ ] }, { - "name": "249", + "name": "245", "meta-type": "enum", "values": [ "ignore", @@ -19679,7 +19724,7 @@ ] }, { - "name": "250", + "name": "246", "members": [ { "name": "action-required", @@ -19693,7 +19738,7 @@ "meta-type": "object" }, { - "name": "251", + "name": "247", "meta-type": "enum", "values": [ "retain", @@ -19701,13 +19746,18 @@ "read-write" ] }, + { + "name": "int", + "json-type": "int", + "meta-type": "builtin" + }, { "name": "[int]", "element-type": "int", "meta-type": "array" }, { - "name": "252", + "name": "248", "meta-type": "enum", "values": [ "ok", @@ -19716,79 +19766,31 @@ ] }, { - "name": "[253]", - "element-type": "253", - "meta-type": "array" - }, - { - "name": "253", + "name": "249", "members": [ { - "name": "name", - "default": null, - "type": "str" + "name": "rd_bytes", + "type": "int" }, { - "name": "count", + "name": "wr_bytes", "type": "int" }, { - "name": "granularity", + "name": "unmap_bytes", "type": "int" }, { - "name": "recording", - "type": "bool" + "name": "rd_operations", + "type": "int" }, { - "name": "busy", - "type": "bool" + "name": "wr_operations", + "type": "int" }, { - "name": "status", - "type": "417", - "features": [ - "deprecated" - ] - }, - { - "name": "persistent", - "type": "bool" - }, - { - "name": "inconsistent", - "default": null, - "type": "bool" - } - ], - "meta-type": "object" - }, - { - "name": "254", - "members": [ - { - "name": "rd_bytes", - "type": "int" - }, - { - "name": "wr_bytes", - "type": "int" - }, - { - "name": "unmap_bytes", - "type": "int" - }, - { - "name": "rd_operations", - "type": "int" - }, - { - "name": "wr_operations", - "type": "int" - }, - { - "name": "flush_operations", - "type": "int" + "name": "flush_operations", + "type": "int" }, { "name": "unmap_operations", @@ -19873,41 +19875,41 @@ }, { "name": "timed_stats", - "type": "[418]" + "type": "[442]" }, { "name": "rd_latency_histogram", "default": null, - "type": "419" + "type": "443" }, { "name": "wr_latency_histogram", "default": null, - "type": "419" + "type": "443" }, { "name": "flush_latency_histogram", "default": null, - "type": "419" + "type": "443" } ], "meta-type": "object" }, { - "name": "255", + "name": "250", "tag": "driver", "variants": [ { "case": "file", - "type": "420" + "type": "444" }, { "case": "host_device", - "type": "420" + "type": "444" }, { "case": "nvme", - "type": "421" + "type": "445" }, { "case": "blkdebug", @@ -20065,13 +20067,13 @@ "members": [ { "name": "driver", - "type": "269" + "type": "265" } ], "meta-type": "object" }, { - "name": "256", + "name": "251", "meta-type": "enum", "values": [ "undefined", @@ -20088,7 +20090,7 @@ ] }, { - "name": "257", + "name": "252", "meta-type": "enum", "values": [ "existing", @@ -20096,7 +20098,7 @@ ] }, { - "name": "258", + "name": "253", "meta-type": "enum", "values": [ "report", @@ -20107,7 +20109,7 @@ ] }, { - "name": "259", + "name": "254", "meta-type": "enum", "values": [ "top", @@ -20118,7 +20120,7 @@ ] }, { - "name": "260", + "name": "255", "meta-type": "enum", "values": [ "on-success", @@ -20127,7 +20129,7 @@ ] }, { - "name": "261", + "name": "256", "members": [ { "name": "use-copy-range", @@ -20148,7 +20150,7 @@ "meta-type": "object" }, { - "name": "262", + "name": "257", "meta-type": "enum", "values": [ "off", @@ -20157,7 +20159,7 @@ ] }, { - "name": "263", + "name": "258", "members": [ { "name": "filename", @@ -20219,18 +20221,18 @@ { "name": "backing-image", "default": null, - "type": "263" + "type": "258" }, { "name": "format-specific", "default": null, - "type": "422" + "type": "446" } ], "meta-type": "object" }, { - "name": "264", + "name": "259", "members": [ { "name": "writeback", @@ -20248,12 +20250,53 @@ "meta-type": "object" }, { - "name": "[265]", - "element-type": "265", + "name": "[260]", + "element-type": "260", "meta-type": "array" }, { - "name": "265", + "name": "260", + "members": [ + { + "name": "name", + "default": null, + "type": "str" + }, + { + "name": "count", + "type": "int" + }, + { + "name": "granularity", + "type": "int" + }, + { + "name": "recording", + "type": "bool" + }, + { + "name": "busy", + "type": "bool" + }, + { + "name": "persistent", + "type": "bool" + }, + { + "name": "inconsistent", + "default": null, + "type": "bool" + } + ], + "meta-type": "object" + }, + { + "name": "[261]", + "element-type": "261", + "meta-type": "array" + }, + { + "name": "261", "members": [ { "name": "id", @@ -20261,7 +20304,7 @@ }, { "name": "type", - "type": "423" + "type": "447" }, { "name": "name", @@ -20271,12 +20314,12 @@ "meta-type": "object" }, { - "name": "[266]", - "element-type": "266", + "name": "[262]", + "element-type": "262", "meta-type": "array" }, { - "name": "266", + "name": "262", "members": [ { "name": "parent", @@ -20292,17 +20335,17 @@ }, { "name": "perm", - "type": "[424]" + "type": "[448]" }, { "name": "shared-perm", - "type": "[424]" + "type": "[448]" } ], "meta-type": "object" }, { - "name": "267", + "name": "263", "meta-type": "enum", "values": [ "background", @@ -20310,12 +20353,12 @@ ] }, { - "name": "[268]", - "element-type": "268", + "name": "[264]", + "element-type": "264", "meta-type": "array" }, { - "name": "268", + "name": "264", "members": [ { "type": "str" @@ -20327,7 +20370,7 @@ "meta-type": "alternate" }, { - "name": "269", + "name": "265", "meta-type": "enum", "values": [ "blkdebug", @@ -20374,7 +20417,7 @@ ] }, { - "name": "270", + "name": "266", "meta-type": "enum", "values": [ "ignore", @@ -20382,7 +20425,7 @@ ] }, { - "name": "271", + "name": "267", "members": [ { "name": "direct", @@ -20398,11 +20441,11 @@ "meta-type": "object" }, { - "name": "272", + "name": "268", "members": [ { "name": "image", - "type": "425" + "type": "449" }, { "name": "config", @@ -20442,36 +20485,36 @@ { "name": "inject-error", "default": null, - "type": "[426]" + "type": "[450]" }, { "name": "set-state", "default": null, - "type": "[427]" + "type": "[451]" }, { "name": "take-child-perms", "default": null, - "type": "[424]" + "type": "[448]" }, { "name": "unshare-child-perms", "default": null, - "type": "[424]" + "type": "[448]" } ], "meta-type": "object" }, { - "name": "273", + "name": "269", "members": [ { "name": "file", - "type": "425" + "type": "449" }, { "name": "log", - "type": "425" + "type": "449" }, { "name": "log-sector-size", @@ -20492,45 +20535,45 @@ "meta-type": "object" }, { - "name": "274", + "name": "270", "members": [ { "name": "test", - "type": "425" + "type": "449" }, { "name": "raw", - "type": "425" + "type": "449" } ], "meta-type": "object" }, { - "name": "275", + "name": "271", "members": [ { "name": "image", - "type": "425" + "type": "449" } ], "meta-type": "object" }, { - "name": "276", + "name": "272", "members": [ { "name": "file", - "type": "425" + "type": "449" } ], "meta-type": "object" }, { - "name": "277", + "name": "273", "members": [ { "name": "file", - "type": "425" + "type": "449" }, { "name": "bottom", @@ -20541,7 +20584,7 @@ "meta-type": "object" }, { - "name": "278", + "name": "274", "members": [ { "name": "filename", @@ -20555,12 +20598,12 @@ { "name": "locking", "default": null, - "type": "428" + "type": "452" }, { "name": "aio", "default": null, - "type": "429" + "type": "453" }, { "name": "drop-cache", @@ -20579,7 +20622,7 @@ ] }, { - "name": "279", + "name": "275", "members": [ { "name": "url", @@ -20619,7 +20662,7 @@ "meta-type": "object" }, { - "name": "280", + "name": "276", "members": [ { "name": "url", @@ -20664,7 +20707,7 @@ "meta-type": "object" }, { - "name": "281", + "name": "277", "members": [ { "name": "volume", @@ -20676,7 +20719,7 @@ }, { "name": "server", - "type": "[361]" + "type": "[358]" }, { "name": "debug", @@ -20692,7 +20735,7 @@ "meta-type": "object" }, { - "name": "282", + "name": "278", "members": [ { "name": "url", @@ -20742,7 +20785,7 @@ "meta-type": "object" }, { - "name": "283", + "name": "279", "members": [ { "name": "url", @@ -20797,11 +20840,11 @@ "meta-type": "object" }, { - "name": "284", + "name": "280", "members": [ { "name": "transport", - "type": "430" + "type": "454" }, { "name": "portal", @@ -20834,7 +20877,7 @@ { "name": "header-digest", "default": null, - "type": "431" + "type": "455" }, { "name": "timeout", @@ -20845,11 +20888,11 @@ "meta-type": "object" }, { - "name": "285", + "name": "281", "members": [ { "name": "file", - "type": "425" + "type": "449" }, { "name": "key-secret", @@ -20860,11 +20903,11 @@ "meta-type": "object" }, { - "name": "286", + "name": "282", "members": [ { "name": "server", - "type": "361" + "type": "358" }, { "name": "export", @@ -20890,11 +20933,11 @@ "meta-type": "object" }, { - "name": "287", + "name": "283", "members": [ { "name": "server", - "type": "432" + "type": "456" }, { "name": "path", @@ -20934,7 +20977,7 @@ "meta-type": "object" }, { - "name": "288", + "name": "284", "members": [ { "name": "size", @@ -20955,7 +20998,7 @@ "meta-type": "object" }, { - "name": "289", + "name": "285", "members": [ { "name": "device", @@ -20969,11 +21012,11 @@ "meta-type": "object" }, { - "name": "290", + "name": "286", "members": [ { "name": "file", - "type": "425" + "type": "449" }, { "name": "prealloc-align", @@ -20989,16 +21032,16 @@ "meta-type": "object" }, { - "name": "291", + "name": "287", "members": [ { "name": "file", - "type": "425" + "type": "449" }, { "name": "backing", "default": null, - "type": "433" + "type": "457" }, { "name": "lazy-refcounts", @@ -21023,7 +21066,7 @@ { "name": "overlap-check", "default": null, - "type": "434" + "type": "458" }, { "name": "cache-size", @@ -21053,53 +21096,53 @@ { "name": "encrypt", "default": null, - "type": "435" + "type": "459" }, { "name": "data-file", "default": null, - "type": "425" + "type": "449" } ], "meta-type": "object" }, { - "name": "292", + "name": "288", "members": [ { "name": "file", - "type": "425" + "type": "449" }, { "name": "backing", "default": null, - "type": "433" + "type": "457" }, { "name": "encrypt", "default": null, - "type": "436" + "type": "460" } ], "meta-type": "object" }, { - "name": "293", + "name": "289", "members": [ { "name": "file", - "type": "425" + "type": "449" }, { "name": "backing", "default": null, - "type": "433" + "type": "457" } ], "meta-type": "object" }, { - "name": "294", + "name": "290", "members": [ { "name": "blkverify", @@ -21108,7 +21151,7 @@ }, { "name": "children", - "type": "[425]" + "type": "[449]" }, { "name": "vote-threshold", @@ -21122,17 +21165,17 @@ { "name": "read-pattern", "default": null, - "type": "437" + "type": "461" } ], "meta-type": "object" }, { - "name": "295", + "name": "291", "members": [ { "name": "file", - "type": "425" + "type": "449" }, { "name": "offset", @@ -21148,7 +21191,7 @@ "meta-type": "object" }, { - "name": "296", + "name": "292", "members": [ { "name": "pool", @@ -21181,7 +21224,7 @@ { "name": "auth-client-required", "default": null, - "type": "[438]" + "type": "[462]" }, { "name": "key-secret", @@ -21191,21 +21234,21 @@ { "name": "server", "default": null, - "type": "[439]" + "type": "[463]" } ], "meta-type": "object" }, { - "name": "297", + "name": "293", "members": [ { "name": "file", - "type": "425" + "type": "449" }, { "name": "mode", - "type": "440" + "type": "464" }, { "name": "top-id", @@ -21216,11 +21259,11 @@ "meta-type": "object" }, { - "name": "298", + "name": "294", "members": [ { "name": "server", - "type": "361" + "type": "358" }, { "name": "vdi", @@ -21240,11 +21283,11 @@ "meta-type": "object" }, { - "name": "299", + "name": "295", "members": [ { "name": "server", - "type": "441" + "type": "465" }, { "name": "path", @@ -21258,13 +21301,13 @@ { "name": "host-key-check", "default": null, - "type": "442" + "type": "466" } ], "meta-type": "object" }, { - "name": "300", + "name": "296", "members": [ { "name": "throttle-group", @@ -21272,13 +21315,13 @@ }, { "name": "file", - "type": "425" + "type": "449" } ], "meta-type": "object" }, { - "name": "301", + "name": "297", "members": [ { "name": "dir", @@ -21308,68 +21351,68 @@ "meta-type": "object" }, { - "name": "302", + "name": "298", "tag": "driver", "variants": [ { "case": "file", - "type": "443" + "type": "467" }, { "case": "gluster", - "type": "444" + "type": "468" }, { "case": "luks", - "type": "445" + "type": "469" }, { "case": "nfs", - "type": "446" + "type": "470" }, { "case": "parallels", - "type": "447" + "type": "471" }, { "case": "qcow", - "type": "448" + "type": "472" }, { "case": "qcow2", - "type": "449" + "type": "473" }, { "case": "qed", - "type": "450" + "type": "474" }, { "case": "rbd", - "type": "451" + "type": "475" }, { "case": "sheepdog", - "type": "452" + "type": "476" }, { "case": "ssh", - "type": "453" + "type": "477" }, { "case": "vdi", - "type": "454" + "type": "478" }, { "case": "vhdx", - "type": "455" + "type": "479" }, { "case": "vmdk", - "type": "456" + "type": "480" }, { "case": "vpc", - "type": "457" + "type": "481" }, { "case": "blkdebug", @@ -21479,22 +21522,22 @@ "members": [ { "name": "driver", - "type": "269" + "type": "265" } ], "meta-type": "object" }, { - "name": "303", + "name": "299", "tag": "driver", "variants": [ { "case": "luks", - "type": "458" + "type": "482" }, { "case": "qcow2", - "type": "459" + "type": "483" }, { "case": "blkdebug", @@ -21656,13 +21699,13 @@ "members": [ { "name": "driver", - "type": "269" + "type": "265" } ], "meta-type": "object" }, { - "name": "304", + "name": "300", "meta-type": "enum", "values": [ "read", @@ -21670,7 +21713,7 @@ ] }, { - "name": "305", + "name": "301", "meta-type": "enum", "values": [ "ignore", @@ -21679,7 +21722,7 @@ ] }, { - "name": "306", + "name": "302", "meta-type": "enum", "values": [ "commit", @@ -21694,7 +21737,7 @@ ] }, { - "name": "307", + "name": "303", "members": [ { "type": "str" @@ -21706,7 +21749,7 @@ "meta-type": "alternate" }, { - "name": "308", + "name": "304", "meta-type": "enum", "values": [ "read", @@ -21715,36 +21758,36 @@ ] }, { - "name": "309", + "name": "305", "tag": "type", "variants": [ { "case": "inet", - "type": "461" + "type": "485" }, { "case": "unix", - "type": "462" + "type": "486" }, { "case": "vsock", - "type": "463" + "type": "487" }, { "case": "fd", - "type": "464" + "type": "488" } ], "members": [ { "name": "type", - "type": "460" + "type": "484" } ], "meta-type": "object" }, { - "name": "310", + "name": "306", "meta-type": "enum", "values": [ "safe", @@ -21752,7 +21795,7 @@ ] }, { - "name": "311", + "name": "307", "meta-type": "enum", "values": [ "nbd", @@ -21760,7 +21803,7 @@ ] }, { - "name": "312", + "name": "308", "members": [ { "name": "name", @@ -21786,11 +21829,11 @@ "meta-type": "object" }, { - "name": "313", + "name": "309", "members": [ { "name": "addr", - "type": "361" + "type": "358" }, { "name": "logical-block-size", @@ -21806,7 +21849,7 @@ "meta-type": "object" }, { - "name": "315", + "name": "311", "meta-type": "enum", "values": [ "utf8", @@ -21814,100 +21857,100 @@ ] }, { - "name": "316", + "name": "312", "tag": "type", "variants": [ { "case": "file", - "type": "466" + "type": "490" }, { "case": "serial", - "type": "467" + "type": "491" }, { "case": "parallel", - "type": "467" + "type": "491" }, { "case": "pipe", - "type": "467" + "type": "491" }, { "case": "socket", - "type": "468" + "type": "492" }, { "case": "udp", - "type": "469" + "type": "493" }, { "case": "pty", - "type": "470" + "type": "494" }, { "case": "null", - "type": "470" + "type": "494" }, { "case": "mux", - "type": "471" + "type": "495" }, { "case": "msmouse", - "type": "470" + "type": "494" }, { "case": "wctablet", - "type": "470" + "type": "494" }, { "case": "braille", - "type": "470" + "type": "494" }, { "case": "testdev", - "type": "470" + "type": "494" }, { "case": "stdio", - "type": "472" + "type": "496" }, { "case": "console", - "type": "470" + "type": "494" }, { "case": "spicevmc", - "type": "473" + "type": "497" }, { "case": "spiceport", - "type": "474" + "type": "498" }, { "case": "vc", - "type": "475" + "type": "499" }, { "case": "ringbuf", - "type": "476" + "type": "500" }, { "case": "memory", - "type": "476" + "type": "500" } ], "members": [ { "name": "type", - "type": "465" + "type": "489" } ], "meta-type": "object" }, { - "name": "317", + "name": "313", "meta-type": "enum", "values": [ "elf", @@ -21918,7 +21961,7 @@ ] }, { - "name": "318", + "name": "314", "meta-type": "enum", "values": [ "none", @@ -21928,12 +21971,12 @@ ] }, { - "name": "[317]", - "element-type": "317", + "name": "[313]", + "element-type": "313", "meta-type": "array" }, { - "name": "319", + "name": "315", "meta-type": "enum", "values": [ "none", @@ -21951,7 +21994,7 @@ ] }, { - "name": "320", + "name": "316", "members": [ { "name": "netdev", @@ -21982,7 +22025,7 @@ "meta-type": "object" }, { - "name": "321", + "name": "317", "members": [ { "name": "hostname", @@ -22042,7 +22085,7 @@ { "name": "dnssearch", "default": null, - "type": "[477]" + "type": "[501]" }, { "name": "domainname", @@ -22082,12 +22125,12 @@ { "name": "hostfwd", "default": null, - "type": "[477]" + "type": "[501]" }, { "name": "guestfwd", "default": null, - "type": "[477]" + "type": "[501]" }, { "name": "tftp-server-name", @@ -22098,7 +22141,7 @@ "meta-type": "object" }, { - "name": "322", + "name": "318", "members": [ { "name": "ifname", @@ -22179,7 +22222,7 @@ "meta-type": "object" }, { - "name": "323", + "name": "319", "members": [ { "name": "src", @@ -22252,7 +22295,7 @@ "meta-type": "object" }, { - "name": "324", + "name": "320", "members": [ { "name": "fd", @@ -22288,7 +22331,7 @@ "meta-type": "object" }, { - "name": "325", + "name": "321", "members": [ { "name": "sock", @@ -22314,7 +22357,7 @@ "meta-type": "object" }, { - "name": "326", + "name": "322", "members": [ { "name": "br", @@ -22330,7 +22373,7 @@ "meta-type": "object" }, { - "name": "327", + "name": "323", "members": [ { "name": "hubid", @@ -22345,7 +22388,7 @@ "meta-type": "object" }, { - "name": "328", + "name": "324", "members": [ { "name": "ifname", @@ -22360,7 +22403,7 @@ "meta-type": "object" }, { - "name": "329", + "name": "325", "members": [ { "name": "chardev", @@ -22380,7 +22423,7 @@ "meta-type": "object" }, { - "name": "330", + "name": "326", "members": [ { "name": "vhostdev", @@ -22396,7 +22439,7 @@ "meta-type": "object" }, { - "name": "331", + "name": "327", "meta-type": "enum", "values": [ "normal", @@ -22410,7 +22453,22 @@ "meta-type": "array" }, { - "name": "332", + "name": "328", + "meta-type": "enum", + "values": [ + "bridge", + "l2tpv3", + "netmap", + "socket", + "tap", + "user", + "vde", + "vhost-user", + "vhost-vdpa" + ] + }, + { + "name": "329", "meta-type": "enum", "values": [ "half", @@ -22418,7 +22476,7 @@ ] }, { - "name": "333", + "name": "330", "meta-type": "enum", "values": [ "off", @@ -22426,7 +22484,7 @@ ] }, { - "name": "334", + "name": "331", "members": [ { "name": "priority", @@ -22485,7 +22543,7 @@ "meta-type": "object" }, { - "name": "335", + "name": "332", "members": [ { "name": "in-pport", @@ -22526,7 +22584,7 @@ "meta-type": "object" }, { - "name": "336", + "name": "333", "members": [ { "name": "goto-tbl", @@ -22562,28 +22620,28 @@ "meta-type": "object" }, { - "name": "337", + "name": "334", "tag": "type", "variants": [ { "case": "passthrough", - "type": "479" + "type": "503" }, { "case": "emulator", - "type": "480" + "type": "504" } ], "members": [ { "name": "type", - "type": "478" + "type": "502" } ], "meta-type": "object" }, { - "name": "338", + "name": "335", "meta-type": "enum", "values": [ "client", @@ -22592,12 +22650,12 @@ ] }, { - "name": "[339]", - "element-type": "339", + "name": "[336]", + "element-type": "336", "meta-type": "array" }, { - "name": "339", + "name": "336", "members": [ { "name": "host", @@ -22609,7 +22667,7 @@ }, { "name": "family", - "type": "342" + "type": "339" }, { "name": "connection-id", @@ -22631,7 +22689,7 @@ "meta-type": "object" }, { - "name": "340", + "name": "337", "members": [ { "name": "host", @@ -22643,13 +22701,13 @@ }, { "name": "family", - "type": "342" + "type": "339" } ], "meta-type": "object" }, { - "name": "341", + "name": "338", "members": [ { "name": "host", @@ -22661,7 +22719,7 @@ }, { "name": "family", - "type": "342" + "type": "339" }, { "name": "auth", @@ -22672,7 +22730,7 @@ "meta-type": "object" }, { - "name": "342", + "name": "339", "meta-type": "enum", "values": [ "ipv4", @@ -22683,12 +22741,12 @@ ] }, { - "name": "[343]", - "element-type": "343", + "name": "[340]", + "element-type": "340", "meta-type": "array" }, { - "name": "343", + "name": "340", "members": [ { "name": "host", @@ -22700,7 +22758,7 @@ }, { "name": "family", - "type": "342" + "type": "339" }, { "name": "websocket", @@ -22720,12 +22778,12 @@ "meta-type": "object" }, { - "name": "[344]", - "element-type": "344", + "name": "[341]", + "element-type": "341", "meta-type": "array" }, { - "name": "344", + "name": "341", "members": [ { "name": "host", @@ -22737,7 +22795,7 @@ }, { "name": "family", - "type": "342" + "type": "339" }, { "name": "websocket", @@ -22745,18 +22803,18 @@ }, { "name": "auth", - "type": "345" + "type": "342" }, { "name": "vencrypt", "default": null, - "type": "346" + "type": "343" } ], "meta-type": "object" }, { - "name": "345", + "name": "342", "meta-type": "enum", "values": [ "none", @@ -22771,7 +22829,7 @@ ] }, { - "name": "346", + "name": "343", "meta-type": "enum", "values": [ "plain", @@ -22786,7 +22844,7 @@ ] }, { - "name": "347", + "name": "344", "members": [ { "name": "host", @@ -22798,7 +22856,7 @@ }, { "name": "family", - "type": "342" + "type": "339" }, { "name": "websocket", @@ -22813,7 +22871,7 @@ "meta-type": "object" }, { - "name": "348", + "name": "345", "members": [ { "name": "host", @@ -22825,7 +22883,7 @@ }, { "name": "family", - "type": "342" + "type": "339" }, { "name": "websocket", @@ -22835,67 +22893,67 @@ "meta-type": "object" }, { - "name": "[349]", - "element-type": "349", + "name": "[346]", + "element-type": "346", "meta-type": "array" }, { - "name": "349", + "name": "346", "tag": "type", "variants": [ { "case": "number", - "type": "482" + "type": "506" }, { "case": "qcode", - "type": "483" + "type": "507" } ], "members": [ { "name": "type", - "type": "481" + "type": "505" } ], "meta-type": "object" }, { - "name": "[350]", - "element-type": "350", + "name": "[347]", + "element-type": "347", "meta-type": "array" }, { - "name": "350", + "name": "347", "tag": "type", "variants": [ { "case": "key", - "type": "485" + "type": "509" }, { "case": "btn", - "type": "486" + "type": "510" }, { "case": "rel", - "type": "487" + "type": "511" }, { "case": "abs", - "type": "487" + "type": "511" } ], "members": [ { "name": "type", - "type": "484" + "type": "508" } ], "meta-type": "object" }, { - "name": "351", + "name": "348", "meta-type": "enum", "values": [ "default", @@ -22909,7 +22967,7 @@ ] }, { - "name": "352", + "name": "349", "meta-type": "enum", "values": [ "off", @@ -22919,7 +22977,7 @@ ] }, { - "name": "353", + "name": "350", "members": [ { "name": "grab-on-hover", @@ -22935,7 +22993,7 @@ "meta-type": "object" }, { - "name": "354", + "name": "351", "members": [ { "name": "charset", @@ -22946,7 +23004,7 @@ "meta-type": "object" }, { - "name": "355", + "name": "352", "members": [ { "name": "rendernode", @@ -22957,7 +23015,7 @@ "meta-type": "object" }, { - "name": "356", + "name": "353", "meta-type": "enum", "values": [ "none", @@ -22977,7 +23035,7 @@ ] }, { - "name": "357", + "name": "354", "members": [ { "name": "transferred", @@ -23039,7 +23097,7 @@ "meta-type": "object" }, { - "name": "358", + "name": "355", "members": [ { "name": "transferred", @@ -23049,7 +23107,7 @@ "meta-type": "object" }, { - "name": "359", + "name": "356", "members": [ { "name": "cache-size", @@ -23083,7 +23141,7 @@ "meta-type": "object" }, { - "name": "360", + "name": "357", "members": [ { "name": "pages", @@ -23109,41 +23167,41 @@ "meta-type": "object" }, { - "name": "[361]", - "element-type": "361", + "name": "[358]", + "element-type": "358", "meta-type": "array" }, { - "name": "361", + "name": "358", "tag": "type", "variants": [ { "case": "inet", - "type": "441" + "type": "465" }, { "case": "unix", - "type": "489" + "type": "513" }, { "case": "vsock", - "type": "490" + "type": "514" }, { "case": "fd", - "type": "477" + "type": "501" } ], "members": [ { "name": "type", - "type": "488" + "type": "512" } ], "meta-type": "object" }, { - "name": "362", + "name": "359", "meta-type": "enum", "values": [ "xbzrle", @@ -23168,7 +23226,7 @@ ] }, { - "name": "363", + "name": "360", "meta-type": "enum", "values": [ "none", @@ -23176,12 +23234,12 @@ ] }, { - "name": "[364]", - "element-type": "364", + "name": "[361]", + "element-type": "361", "meta-type": "array" }, { - "name": "364", + "name": "361", "members": [ { "name": "node-name", @@ -23193,13 +23251,13 @@ }, { "name": "bitmaps", - "type": "[491]" + "type": "[515]" } ], "meta-type": "object" }, { - "name": "365", + "name": "362", "meta-type": "enum", "values": [ "none", @@ -23208,7 +23266,7 @@ ] }, { - "name": "366", + "name": "363", "meta-type": "enum", "values": [ "none", @@ -23218,12 +23276,7 @@ ] }, { - "name": "number", - "json-type": "number", - "meta-type": "builtin" - }, - { - "name": "367", + "name": "364", "meta-type": "enum", "values": [ "unstarted", @@ -23232,84 +23285,84 @@ ] }, { - "name": "[368]", - "element-type": "368", + "name": "[365]", + "element-type": "365", "meta-type": "array" }, { - "name": "368", + "name": "365", "tag": "type", "variants": [ { "case": "abort", - "type": "493" + "type": "517" }, { "case": "block-dirty-bitmap-add", - "type": "494" + "type": "518" }, { "case": "block-dirty-bitmap-remove", - "type": "495" + "type": "519" }, { "case": "block-dirty-bitmap-clear", - "type": "495" + "type": "519" }, { "case": "block-dirty-bitmap-enable", - "type": "495" + "type": "519" }, { "case": "block-dirty-bitmap-disable", - "type": "495" + "type": "519" }, { "case": "block-dirty-bitmap-merge", - "type": "496" + "type": "520" }, { "case": "blockdev-backup", - "type": "497" + "type": "521" }, { "case": "blockdev-snapshot", - "type": "498" + "type": "522" }, { "case": "blockdev-snapshot-internal-sync", - "type": "499" + "type": "523" }, { "case": "blockdev-snapshot-sync", - "type": "500" + "type": "524" }, { "case": "drive-backup", - "type": "501" + "type": "525" } ], "members": [ { "name": "type", - "type": "492" + "type": "516" } ], "meta-type": "object" }, { - "name": "369", + "name": "366", "members": [ { "name": "completion-mode", "default": null, - "type": "502" + "type": "526" } ], "meta-type": "object" }, { - "name": "370", + "name": "367", "meta-type": "enum", "values": [ "unavailable", @@ -23318,19 +23371,19 @@ ] }, { - "name": "[371]", - "element-type": "371", + "name": "[368]", + "element-type": "368", "meta-type": "array" }, { - "name": "371", + "name": "368", "meta-type": "enum", "values": [ "oob" ] }, { - "name": "372", + "name": "369", "members": [ { "name": "major", @@ -23348,7 +23401,7 @@ "meta-type": "object" }, { - "name": "373", + "name": "370", "meta-type": "enum", "values": [ "builtin", @@ -23361,17 +23414,17 @@ ] }, { - "name": "374", + "name": "371", "members": [ { "name": "json-type", - "type": "503" + "type": "527" } ], "meta-type": "object" }, { - "name": "375", + "name": "372", "members": [ { "name": "values", @@ -23381,7 +23434,7 @@ "meta-type": "object" }, { - "name": "376", + "name": "373", "members": [ { "name": "element-type", @@ -23391,11 +23444,11 @@ "meta-type": "object" }, { - "name": "377", + "name": "374", "members": [ { "name": "members", - "type": "[504]" + "type": "[528]" }, { "name": "tag", @@ -23405,23 +23458,23 @@ { "name": "variants", "default": null, - "type": "[505]" + "type": "[529]" } ], "meta-type": "object" }, { - "name": "378", + "name": "375", "members": [ { "name": "members", - "type": "[506]" + "type": "[530]" } ], "meta-type": "object" }, { - "name": "379", + "name": "376", "members": [ { "name": "arg-type", @@ -23440,7 +23493,7 @@ "meta-type": "object" }, { - "name": "380", + "name": "377", "members": [ { "name": "arg-type", @@ -23450,56 +23503,107 @@ "meta-type": "object" }, { - "name": "381", + "name": "378", + "meta-type": "enum", + "values": [ + "authz-list", + "authz-listfile", + "authz-pam", + "authz-simple", + "can-bus", + "can-host-socketcan", + "colo-compare", + "cryptodev-backend", + "cryptodev-backend-builtin", + "dbus-vmstate", + "filter-buffer", + "filter-dump", + "filter-mirror", + "filter-redirector", + "filter-replay", + "filter-rewriter", + "input-barrier", + "input-linux", + "iothread", + "memory-backend-file", + "memory-backend-memfd", + "memory-backend-ram", + "pr-manager-helper", + "rng-builtin", + "rng-egd", + "rng-random", + "secret", + "secret_keyring", + "s390-pv-guest", + "throttle-group", + "tls-creds-anon", + "tls-creds-psk", + "tls-creds-x509", + "tls-cipher-suites", + "x-remote-object" + ] + }, + { + "name": "379", "members": [ { - "name": "node-id", + "name": "policy", "default": null, - "type": "int" + "type": "531" }, { - "name": "socket-id", + "name": "rules", "default": null, - "type": "int" - }, + "type": "[532]" + } + ], + "meta-type": "object" + }, + { + "name": "380", + "members": [ { - "name": "die-id", - "default": null, - "type": "int" + "name": "filename", + "type": "str" }, { - "name": "core-id", + "name": "refresh", "default": null, - "type": "int" - }, + "type": "bool" + } + ], + "meta-type": "object" + }, + { + "name": "381", + "members": [ { - "name": "thread-id", - "default": null, - "type": "int" + "name": "service", + "type": "str" } ], "meta-type": "object" }, { "name": "382", - "meta-type": "enum", - "values": [ - "x86", - "sparc", - "ppc", - "mips", - "tricore", - "s390", - "riscv", - "other" - ] + "members": [ + { + "name": "identity", + "type": "str" + } + ], + "meta-type": "object" }, { "name": "383", "members": [ { - "name": "pc", - "type": "int" + "name": "if", + "type": "str" + }, + { + "name": "canbus", + "type": "str" } ], "meta-type": "object" @@ -23508,12 +23612,45 @@ "name": "384", "members": [ { - "name": "pc", + "name": "primary_in", + "type": "str" + }, + { + "name": "secondary_in", + "type": "str" + }, + { + "name": "outdev", + "type": "str" + }, + { + "name": "iothread", + "type": "str" + }, + { + "name": "notify_dev", + "default": null, + "type": "str" + }, + { + "name": "compare_timeout", + "default": null, + "type": "int" + }, + { + "name": "expired_scan_cycle", + "default": null, "type": "int" }, { - "name": "npc", + "name": "max_queue_size", + "default": null, "type": "int" + }, + { + "name": "vnet_hdr_support", + "default": null, + "type": "bool" } ], "meta-type": "object" @@ -23522,7 +23659,8 @@ "name": "385", "members": [ { - "name": "nip", + "name": "queues", + "default": null, "type": "int" } ], @@ -23532,8 +23670,13 @@ "name": "386", "members": [ { - "name": "PC", + "name": "queues", + "default": null, "type": "int" + }, + { + "name": "chardev", + "type": "str" } ], "meta-type": "object" @@ -23542,8 +23685,13 @@ "name": "387", "members": [ { - "name": "PC", - "type": "int" + "name": "addr", + "type": "str" + }, + { + "name": "id-list", + "default": null, + "type": "str" } ], "meta-type": "object" @@ -23552,8 +23700,32 @@ "name": "388", "members": [ { - "name": "cpu-state", - "type": "507" + "name": "netdev", + "type": "str" + }, + { + "name": "queue", + "default": null, + "type": "533" + }, + { + "name": "status", + "default": null, + "type": "str" + }, + { + "name": "position", + "default": null, + "type": "str" + }, + { + "name": "insert", + "default": null, + "type": "534" + }, + { + "name": "interval", + "type": "int" } ], "meta-type": "object" @@ -23562,7 +23734,36 @@ "name": "389", "members": [ { - "name": "pc", + "name": "netdev", + "type": "str" + }, + { + "name": "queue", + "default": null, + "type": "533" + }, + { + "name": "status", + "default": null, + "type": "str" + }, + { + "name": "position", + "default": null, + "type": "str" + }, + { + "name": "insert", + "default": null, + "type": "534" + }, + { + "name": "file", + "type": "str" + }, + { + "name": "maxlen", + "default": null, "type": "int" } ], @@ -23570,30 +23771,881 @@ }, { "name": "390", - "meta-type": "enum", - "values": [ - "aarch64", - "alpha", - "arm", - "avr", - "cris", - "hppa", - "i386", - "lm32", - "m68k", - "microblaze", - "microblazeel", - "mips", - "mips64", - "mips64el", - "mipsel", - "moxie", - "nios2", - "or1k", - "ppc", - "ppc64", - "riscv32", - "riscv64", + "members": [ + { + "name": "netdev", + "type": "str" + }, + { + "name": "queue", + "default": null, + "type": "533" + }, + { + "name": "status", + "default": null, + "type": "str" + }, + { + "name": "position", + "default": null, + "type": "str" + }, + { + "name": "insert", + "default": null, + "type": "534" + }, + { + "name": "outdev", + "type": "str" + }, + { + "name": "vnet_hdr_support", + "default": null, + "type": "bool" + } + ], + "meta-type": "object" + }, + { + "name": "391", + "members": [ + { + "name": "netdev", + "type": "str" + }, + { + "name": "queue", + "default": null, + "type": "533" + }, + { + "name": "status", + "default": null, + "type": "str" + }, + { + "name": "position", + "default": null, + "type": "str" + }, + { + "name": "insert", + "default": null, + "type": "534" + }, + { + "name": "indev", + "default": null, + "type": "str" + }, + { + "name": "outdev", + "default": null, + "type": "str" + }, + { + "name": "vnet_hdr_support", + "default": null, + "type": "bool" + } + ], + "meta-type": "object" + }, + { + "name": "392", + "members": [ + { + "name": "netdev", + "type": "str" + }, + { + "name": "queue", + "default": null, + "type": "533" + }, + { + "name": "status", + "default": null, + "type": "str" + }, + { + "name": "position", + "default": null, + "type": "str" + }, + { + "name": "insert", + "default": null, + "type": "534" + } + ], + "meta-type": "object" + }, + { + "name": "393", + "members": [ + { + "name": "netdev", + "type": "str" + }, + { + "name": "queue", + "default": null, + "type": "533" + }, + { + "name": "status", + "default": null, + "type": "str" + }, + { + "name": "position", + "default": null, + "type": "str" + }, + { + "name": "insert", + "default": null, + "type": "534" + }, + { + "name": "vnet_hdr_support", + "default": null, + "type": "bool" + } + ], + "meta-type": "object" + }, + { + "name": "394", + "members": [ + { + "name": "name", + "type": "str" + }, + { + "name": "server", + "default": null, + "type": "str" + }, + { + "name": "port", + "default": null, + "type": "str" + }, + { + "name": "x-origin", + "default": null, + "type": "str" + }, + { + "name": "y-origin", + "default": null, + "type": "str" + }, + { + "name": "width", + "default": null, + "type": "str" + }, + { + "name": "height", + "default": null, + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "395", + "members": [ + { + "name": "evdev", + "type": "str" + }, + { + "name": "grab_all", + "default": null, + "type": "bool" + }, + { + "name": "repeat", + "default": null, + "type": "bool" + }, + { + "name": "grab-toggle", + "default": null, + "type": "535" + } + ], + "meta-type": "object" + }, + { + "name": "396", + "members": [ + { + "name": "poll-max-ns", + "default": null, + "type": "int" + }, + { + "name": "poll-grow", + "default": null, + "type": "int" + }, + { + "name": "poll-shrink", + "default": null, + "type": "int" + } + ], + "meta-type": "object" + }, + { + "name": "397", + "members": [ + { + "name": "dump", + "default": null, + "type": "bool" + }, + { + "name": "host-nodes", + "default": null, + "type": "[int]" + }, + { + "name": "merge", + "default": null, + "type": "bool" + }, + { + "name": "policy", + "default": null, + "type": "416" + }, + { + "name": "prealloc", + "default": null, + "type": "bool" + }, + { + "name": "prealloc-threads", + "default": null, + "type": "int" + }, + { + "name": "share", + "default": null, + "type": "bool" + }, + { + "name": "size", + "type": "int" + }, + { + "name": "x-use-canonical-path-for-ramblock-id", + "default": null, + "type": "bool" + }, + { + "name": "align", + "default": null, + "type": "int" + }, + { + "name": "discard-data", + "default": null, + "type": "bool" + }, + { + "name": "mem-path", + "type": "str" + }, + { + "name": "pmem", + "default": null, + "type": "bool" + }, + { + "name": "readonly", + "default": null, + "type": "bool" + } + ], + "meta-type": "object" + }, + { + "name": "398", + "members": [ + { + "name": "dump", + "default": null, + "type": "bool" + }, + { + "name": "host-nodes", + "default": null, + "type": "[int]" + }, + { + "name": "merge", + "default": null, + "type": "bool" + }, + { + "name": "policy", + "default": null, + "type": "416" + }, + { + "name": "prealloc", + "default": null, + "type": "bool" + }, + { + "name": "prealloc-threads", + "default": null, + "type": "int" + }, + { + "name": "share", + "default": null, + "type": "bool" + }, + { + "name": "size", + "type": "int" + }, + { + "name": "x-use-canonical-path-for-ramblock-id", + "default": null, + "type": "bool" + }, + { + "name": "hugetlb", + "default": null, + "type": "bool" + }, + { + "name": "hugetlbsize", + "default": null, + "type": "int" + }, + { + "name": "seal", + "default": null, + "type": "bool" + } + ], + "meta-type": "object" + }, + { + "name": "399", + "members": [ + { + "name": "dump", + "default": null, + "type": "bool" + }, + { + "name": "host-nodes", + "default": null, + "type": "[int]" + }, + { + "name": "merge", + "default": null, + "type": "bool" + }, + { + "name": "policy", + "default": null, + "type": "416" + }, + { + "name": "prealloc", + "default": null, + "type": "bool" + }, + { + "name": "prealloc-threads", + "default": null, + "type": "int" + }, + { + "name": "share", + "default": null, + "type": "bool" + }, + { + "name": "size", + "type": "int" + }, + { + "name": "x-use-canonical-path-for-ramblock-id", + "default": null, + "type": "bool" + } + ], + "meta-type": "object" + }, + { + "name": "400", + "members": [ + { + "name": "path", + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "401", + "members": [ + { + "name": "opened", + "default": null, + "type": "bool", + "features": [ + "deprecated" + ] + } + ], + "meta-type": "object" + }, + { + "name": "402", + "members": [ + { + "name": "opened", + "default": null, + "type": "bool", + "features": [ + "deprecated" + ] + }, + { + "name": "chardev", + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "403", + "members": [ + { + "name": "opened", + "default": null, + "type": "bool", + "features": [ + "deprecated" + ] + }, + { + "name": "filename", + "default": null, + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "404", + "members": [ + { + "name": "loaded", + "default": null, + "type": "bool", + "features": [ + "deprecated" + ] + }, + { + "name": "format", + "default": null, + "type": "536" + }, + { + "name": "keyid", + "default": null, + "type": "str" + }, + { + "name": "iv", + "default": null, + "type": "str" + }, + { + "name": "data", + "default": null, + "type": "str" + }, + { + "name": "file", + "default": null, + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "405", + "members": [ + { + "name": "loaded", + "default": null, + "type": "bool", + "features": [ + "deprecated" + ] + }, + { + "name": "format", + "default": null, + "type": "536" + }, + { + "name": "keyid", + "default": null, + "type": "str" + }, + { + "name": "iv", + "default": null, + "type": "str" + }, + { + "name": "serial", + "type": "int" + } + ], + "meta-type": "object" + }, + { + "name": "407", + "members": [ + { + "name": "limits", + "default": null, + "type": "537" + }, + { + "name": "x-iops-total", + "default": null, + "type": "int" + }, + { + "name": "x-iops-total-max", + "default": null, + "type": "int" + }, + { + "name": "x-iops-total-max-length", + "default": null, + "type": "int" + }, + { + "name": "x-iops-read", + "default": null, + "type": "int" + }, + { + "name": "x-iops-read-max", + "default": null, + "type": "int" + }, + { + "name": "x-iops-read-max-length", + "default": null, + "type": "int" + }, + { + "name": "x-iops-write", + "default": null, + "type": "int" + }, + { + "name": "x-iops-write-max", + "default": null, + "type": "int" + }, + { + "name": "x-iops-write-max-length", + "default": null, + "type": "int" + }, + { + "name": "x-bps-total", + "default": null, + "type": "int" + }, + { + "name": "x-bps-total-max", + "default": null, + "type": "int" + }, + { + "name": "x-bps-total-max-length", + "default": null, + "type": "int" + }, + { + "name": "x-bps-read", + "default": null, + "type": "int" + }, + { + "name": "x-bps-read-max", + "default": null, + "type": "int" + }, + { + "name": "x-bps-read-max-length", + "default": null, + "type": "int" + }, + { + "name": "x-bps-write", + "default": null, + "type": "int" + }, + { + "name": "x-bps-write-max", + "default": null, + "type": "int" + }, + { + "name": "x-bps-write-max-length", + "default": null, + "type": "int" + }, + { + "name": "x-iops-size", + "default": null, + "type": "int" + } + ], + "meta-type": "object" + }, + { + "name": "408", + "members": [ + { + "name": "verify-peer", + "default": null, + "type": "bool" + }, + { + "name": "dir", + "default": null, + "type": "str" + }, + { + "name": "endpoint", + "default": null, + "type": "538" + }, + { + "name": "priority", + "default": null, + "type": "str" + }, + { + "name": "loaded", + "default": null, + "type": "bool", + "features": [ + "deprecated" + ] + } + ], + "meta-type": "object" + }, + { + "name": "409", + "members": [ + { + "name": "verify-peer", + "default": null, + "type": "bool" + }, + { + "name": "dir", + "default": null, + "type": "str" + }, + { + "name": "endpoint", + "default": null, + "type": "538" + }, + { + "name": "priority", + "default": null, + "type": "str" + }, + { + "name": "loaded", + "default": null, + "type": "bool", + "features": [ + "deprecated" + ] + }, + { + "name": "username", + "default": null, + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "410", + "members": [ + { + "name": "verify-peer", + "default": null, + "type": "bool" + }, + { + "name": "dir", + "default": null, + "type": "str" + }, + { + "name": "endpoint", + "default": null, + "type": "538" + }, + { + "name": "priority", + "default": null, + "type": "str" + }, + { + "name": "loaded", + "default": null, + "type": "bool", + "features": [ + "deprecated" + ] + }, + { + "name": "sanity-check", + "default": null, + "type": "bool" + }, + { + "name": "passwordid", + "default": null, + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "411", + "members": [ + { + "name": "verify-peer", + "default": null, + "type": "bool" + }, + { + "name": "dir", + "default": null, + "type": "str" + }, + { + "name": "endpoint", + "default": null, + "type": "538" + }, + { + "name": "priority", + "default": null, + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "412", + "members": [ + { + "name": "fd", + "type": "str" + }, + { + "name": "devid", + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "413", + "members": [ + { + "name": "node-id", + "default": null, + "type": "int" + }, + { + "name": "socket-id", + "default": null, + "type": "int" + }, + { + "name": "die-id", + "default": null, + "type": "int" + }, + { + "name": "core-id", + "default": null, + "type": "int" + }, + { + "name": "thread-id", + "default": null, + "type": "int" + } + ], + "meta-type": "object" + }, + { + "name": "414", + "meta-type": "enum", + "values": [ + "aarch64", + "alpha", + "arm", + "avr", + "cris", + "hppa", + "i386", + "lm32", + "m68k", + "microblaze", + "microblazeel", + "mips", + "mips64", + "mips64el", + "mipsel", + "moxie", + "nios2", + "or1k", + "ppc", + "ppc64", + "riscv32", + "riscv64", "rx", "s390x", "sh4", @@ -23608,7 +24660,17 @@ ] }, { - "name": "391", + "name": "415", + "members": [ + { + "name": "cpu-state", + "type": "539" + } + ], + "meta-type": "object" + }, + { + "name": "416", "meta-type": "enum", "values": [ "default", @@ -23618,7 +24680,7 @@ ] }, { - "name": "392", + "name": "417", "meta-type": "enum", "values": [ "node", @@ -23629,7 +24691,7 @@ ] }, { - "name": "393", + "name": "418", "members": [ { "name": "nodeid", @@ -23660,7 +24722,7 @@ "meta-type": "object" }, { - "name": "394", + "name": "419", "members": [ { "name": "src", @@ -23678,7 +24740,7 @@ "meta-type": "object" }, { - "name": "395", + "name": "420", "members": [ { "name": "node-id", @@ -23709,7 +24771,7 @@ "meta-type": "object" }, { - "name": "396", + "name": "421", "members": [ { "name": "initiator", @@ -23721,11 +24783,11 @@ }, { "name": "hierarchy", - "type": "508" + "type": "540" }, { "name": "data-type", - "type": "509" + "type": "541" }, { "name": "latency", @@ -23741,7 +24803,7 @@ "meta-type": "object" }, { - "name": "397", + "name": "422", "members": [ { "name": "node-id", @@ -23757,11 +24819,11 @@ }, { "name": "associativity", - "type": "510" + "type": "542" }, { "name": "policy", - "type": "511" + "type": "543" }, { "name": "line", @@ -23771,7 +24833,7 @@ "meta-type": "object" }, { - "name": "398", + "name": "423", "meta-type": "enum", "values": [ "dimm", @@ -23781,37 +24843,37 @@ ] }, { - "name": "399", + "name": "424", "members": [ { "name": "data", - "type": "512" + "type": "544" } ], "meta-type": "object" }, { - "name": "400", + "name": "425", "members": [ { "name": "data", - "type": "513" + "type": "545" } ], "meta-type": "object" }, { - "name": "401", + "name": "426", "members": [ { "name": "data", - "type": "514" + "type": "546" } ], "meta-type": "object" }, { - "name": "402", + "name": "427", "members": [ { "name": "name", @@ -23826,7 +24888,7 @@ "meta-type": "object" }, { - "name": "403", + "name": "428", "meta-type": "enum", "values": [ "incompatible", @@ -23836,7 +24898,7 @@ ] }, { - "name": "404", + "name": "429", "meta-type": "enum", "values": [ "static", @@ -23844,7 +24906,7 @@ ] }, { - "name": "405", + "name": "430", "meta-type": "enum", "values": [ "none", @@ -23853,7 +24915,7 @@ ] }, { - "name": "406", + "name": "431", "meta-type": "enum", "values": [ "block-node", @@ -23862,7 +24924,7 @@ ] }, { - "name": "407", + "name": "432", "members": [ { "name": "node-name", @@ -23872,7 +24934,7 @@ "meta-type": "object" }, { - "name": "408", + "name": "433", "members": [ { "name": "id", @@ -23882,12 +24944,12 @@ "meta-type": "object" }, { - "name": "[409]", - "element-type": "409", + "name": "[434]", + "element-type": "434", "meta-type": "array" }, { - "name": "409", + "name": "434", "members": [ { "name": "fd", @@ -23902,12 +24964,12 @@ "meta-type": "object" }, { - "name": "[410]", - "element-type": "410", + "name": "[435]", + "element-type": "435", "meta-type": "array" }, { - "name": "410", + "name": "435", "members": [ { "name": "name", @@ -23915,7 +24977,7 @@ }, { "name": "type", - "type": "515" + "type": "547" }, { "name": "help", @@ -23931,7 +24993,7 @@ "meta-type": "object" }, { - "name": "411", + "name": "436", "meta-type": "enum", "values": [ "uninit", @@ -23943,7 +25005,7 @@ ] }, { - "name": "412", + "name": "437", "meta-type": "enum", "values": [ "DIMM", @@ -23951,12 +25013,12 @@ ] }, { - "name": "[413]", - "element-type": "413", + "name": "[438]", + "element-type": "438", "meta-type": "array" }, { - "name": "413", + "name": "438", "members": [ { "name": "bus", @@ -23972,11 +25034,11 @@ }, { "name": "class_info", - "type": "516" + "type": "548" }, { "name": "id", - "type": "517" + "type": "549" }, { "name": "irq", @@ -23994,17 +25056,17 @@ { "name": "pci_bridge", "default": null, - "type": "518" + "type": "550" }, { "name": "regions", - "type": "[519]" + "type": "[551]" } ], "meta-type": "object" }, { - "name": "414", + "name": "439", "meta-type": "enum", "values": [ "hyper-v", @@ -24012,7 +25074,7 @@ ] }, { - "name": "415", + "name": "440", "members": [ { "name": "arg1", @@ -24038,7 +25100,7 @@ "meta-type": "object" }, { - "name": "416", + "name": "441", "members": [ { "name": "core", @@ -24054,29 +25116,18 @@ }, { "name": "reason", - "type": "520" + "type": "552" } ], "meta-type": "object" }, { - "name": "417", - "meta-type": "enum", - "values": [ - "active", - "disabled", - "frozen", - "locked", - "inconsistent" - ] - }, - { - "name": "[418]", - "element-type": "418", + "name": "[442]", + "element-type": "442", "meta-type": "array" }, { - "name": "418", + "name": "442", "members": [ { "name": "interval_length", @@ -24130,7 +25181,7 @@ "meta-type": "object" }, { - "name": "419", + "name": "443", "members": [ { "name": "boundaries", @@ -24144,7 +25195,7 @@ "meta-type": "object" }, { - "name": "420", + "name": "444", "members": [ { "name": "discard-nb-ok", @@ -24162,7 +25213,7 @@ "meta-type": "object" }, { - "name": "421", + "name": "445", "members": [ { "name": "completion-errors", @@ -24185,32 +25236,32 @@ "meta-type": "array" }, { - "name": "422", + "name": "446", "tag": "type", "variants": [ { "case": "qcow2", - "type": "522" + "type": "554" }, { "case": "vmdk", - "type": "523" + "type": "555" }, { "case": "luks", - "type": "524" + "type": "556" } ], "members": [ { "name": "type", - "type": "521" + "type": "553" } ], "meta-type": "object" }, { - "name": "423", + "name": "447", "meta-type": "enum", "values": [ "block-backend", @@ -24219,12 +25270,12 @@ ] }, { - "name": "[424]", - "element-type": "424", + "name": "[448]", + "element-type": "448", "meta-type": "array" }, { - "name": "424", + "name": "448", "meta-type": "enum", "values": [ "consistent-read", @@ -24235,7 +25286,7 @@ ] }, { - "name": "425", + "name": "449", "members": [ { "type": "50" @@ -24247,16 +25298,16 @@ "meta-type": "alternate" }, { - "name": "[426]", - "element-type": "426", + "name": "[450]", + "element-type": "450", "meta-type": "array" }, { - "name": "426", + "name": "450", "members": [ { "name": "event", - "type": "525" + "type": "557" }, { "name": "state", @@ -24266,7 +25317,7 @@ { "name": "iotype", "default": null, - "type": "526" + "type": "558" }, { "name": "errno", @@ -24292,16 +25343,16 @@ "meta-type": "object" }, { - "name": "[427]", - "element-type": "427", + "name": "[451]", + "element-type": "451", "meta-type": "array" }, { - "name": "427", + "name": "451", "members": [ { "name": "event", - "type": "525" + "type": "557" }, { "name": "state", @@ -24316,7 +25367,7 @@ "meta-type": "object" }, { - "name": "428", + "name": "452", "meta-type": "enum", "values": [ "auto", @@ -24325,7 +25376,7 @@ ] }, { - "name": "429", + "name": "453", "meta-type": "enum", "values": [ "threads", @@ -24334,7 +25385,7 @@ ] }, { - "name": "430", + "name": "454", "meta-type": "enum", "values": [ "tcp", @@ -24342,7 +25393,7 @@ ] }, { - "name": "431", + "name": "455", "meta-type": "enum", "values": [ "crc32c", @@ -24352,11 +25403,11 @@ ] }, { - "name": "432", + "name": "456", "members": [ { "name": "type", - "type": "527" + "type": "559" }, { "name": "host", @@ -24366,7 +25417,7 @@ "meta-type": "object" }, { - "name": "433", + "name": "457", "members": [ { "type": "50" @@ -24381,62 +25432,62 @@ "meta-type": "alternate" }, { - "name": "434", + "name": "458", "members": [ { - "type": "528" + "type": "560" }, { - "type": "529" + "type": "561" } ], "meta-type": "alternate" }, { - "name": "435", + "name": "459", "tag": "format", "variants": [ { "case": "aes", - "type": "531" + "type": "563" }, { "case": "luks", - "type": "532" + "type": "564" } ], "members": [ { "name": "format", - "type": "530" + "type": "562" } ], "meta-type": "object" }, { - "name": "436", + "name": "460", "tag": "format", "variants": [ { "case": "aes", - "type": "531" + "type": "563" } ], "members": [ { "name": "format", - "type": "533" + "type": "565" } ], "meta-type": "object" }, { - "name": "[425]", - "element-type": "425", + "name": "[449]", + "element-type": "449", "meta-type": "array" }, { - "name": "437", + "name": "461", "meta-type": "enum", "values": [ "quorum", @@ -24444,12 +25495,12 @@ ] }, { - "name": "[438]", - "element-type": "438", + "name": "[462]", + "element-type": "462", "meta-type": "array" }, { - "name": "438", + "name": "462", "meta-type": "enum", "values": [ "cephx", @@ -24457,12 +25508,12 @@ ] }, { - "name": "[439]", - "element-type": "439", + "name": "[463]", + "element-type": "463", "meta-type": "array" }, { - "name": "439", + "name": "463", "members": [ { "name": "host", @@ -24476,7 +25527,7 @@ "meta-type": "object" }, { - "name": "440", + "name": "464", "meta-type": "enum", "values": [ "primary", @@ -24484,7 +25535,7 @@ ] }, { - "name": "441", + "name": "465", "members": [ { "name": "host", @@ -24523,12 +25574,12 @@ "meta-type": "object" }, { - "name": "442", + "name": "466", "tag": "mode", "variants": [ { "case": "hash", - "type": "535" + "type": "567" }, { "case": "none", @@ -24542,13 +25593,13 @@ "members": [ { "name": "mode", - "type": "534" + "type": "566" } ], "meta-type": "object" }, { - "name": "443", + "name": "467", "members": [ { "name": "filename", @@ -24561,7 +25612,7 @@ { "name": "preallocation", "default": null, - "type": "536" + "type": "568" }, { "name": "nocow", @@ -24577,11 +25628,11 @@ "meta-type": "object" }, { - "name": "444", + "name": "468", "members": [ { "name": "location", - "type": "281" + "type": "277" }, { "name": "size", @@ -24590,13 +25641,13 @@ { "name": "preallocation", "default": null, - "type": "536" + "type": "568" } ], "meta-type": "object" }, { - "name": "445", + "name": "469", "members": [ { "name": "key-secret", @@ -24606,27 +25657,27 @@ { "name": "cipher-alg", "default": null, - "type": "537" + "type": "569" }, { "name": "cipher-mode", "default": null, - "type": "538" + "type": "570" }, { "name": "ivgen-alg", "default": null, - "type": "539" + "type": "571" }, { "name": "ivgen-hash-alg", "default": null, - "type": "540" + "type": "572" }, { "name": "hash-alg", "default": null, - "type": "540" + "type": "572" }, { "name": "iter-time", @@ -24635,7 +25686,7 @@ }, { "name": "file", - "type": "425" + "type": "449" }, { "name": "size", @@ -24644,17 +25695,17 @@ { "name": "preallocation", "default": null, - "type": "536" + "type": "568" } ], "meta-type": "object" }, { - "name": "446", + "name": "470", "members": [ { "name": "location", - "type": "287" + "type": "283" }, { "name": "size", @@ -24664,11 +25715,11 @@ "meta-type": "object" }, { - "name": "447", + "name": "471", "members": [ { "name": "file", - "type": "425" + "type": "449" }, { "name": "size", @@ -24683,11 +25734,11 @@ "meta-type": "object" }, { - "name": "448", + "name": "472", "members": [ { "name": "file", - "type": "425" + "type": "449" }, { "name": "size", @@ -24701,22 +25752,22 @@ { "name": "encrypt", "default": null, - "type": "541" + "type": "573" } ], "meta-type": "object" }, { - "name": "449", + "name": "473", "members": [ { "name": "file", - "type": "425" + "type": "449" }, { "name": "data-file", "default": null, - "type": "425" + "type": "449" }, { "name": "data-file-raw", @@ -24735,7 +25786,7 @@ { "name": "version", "default": null, - "type": "542" + "type": "574" }, { "name": "backing-file", @@ -24745,12 +25796,12 @@ { "name": "backing-fmt", "default": null, - "type": "269" + "type": "265" }, { "name": "encrypt", "default": null, - "type": "541" + "type": "573" }, { "name": "cluster-size", @@ -24760,7 +25811,7 @@ { "name": "preallocation", "default": null, - "type": "536" + "type": "568" }, { "name": "lazy-refcounts", @@ -24775,17 +25826,17 @@ { "name": "compression-type", "default": null, - "type": "543" + "type": "575" } ], "meta-type": "object" }, { - "name": "450", + "name": "474", "members": [ { "name": "file", - "type": "425" + "type": "449" }, { "name": "size", @@ -24799,7 +25850,7 @@ { "name": "backing-fmt", "default": null, - "type": "269" + "type": "265" }, { "name": "cluster-size", @@ -24815,11 +25866,11 @@ "meta-type": "object" }, { - "name": "451", + "name": "475", "members": [ { "name": "location", - "type": "296" + "type": "292" }, { "name": "size", @@ -24834,11 +25885,11 @@ "meta-type": "object" }, { - "name": "452", + "name": "476", "members": [ { "name": "location", - "type": "298" + "type": "294" }, { "name": "size", @@ -24852,12 +25903,12 @@ { "name": "preallocation", "default": null, - "type": "536" + "type": "568" }, { "name": "redundancy", "default": null, - "type": "544" + "type": "576" }, { "name": "object-size", @@ -24868,11 +25919,11 @@ "meta-type": "object" }, { - "name": "453", + "name": "477", "members": [ { "name": "location", - "type": "299" + "type": "295" }, { "name": "size", @@ -24882,11 +25933,11 @@ "meta-type": "object" }, { - "name": "454", + "name": "478", "members": [ { "name": "file", - "type": "425" + "type": "449" }, { "name": "size", @@ -24895,17 +25946,17 @@ { "name": "preallocation", "default": null, - "type": "536" + "type": "568" } ], "meta-type": "object" }, { - "name": "455", + "name": "479", "members": [ { "name": "file", - "type": "425" + "type": "449" }, { "name": "size", @@ -24924,7 +25975,7 @@ { "name": "subformat", "default": null, - "type": "545" + "type": "577" }, { "name": "block-state-zero", @@ -24935,11 +25986,11 @@ "meta-type": "object" }, { - "name": "456", + "name": "480", "members": [ { "name": "file", - "type": "425" + "type": "449" }, { "name": "size", @@ -24948,12 +25999,12 @@ { "name": "extents", "default": null, - "type": "[425]" + "type": "[449]" }, { "name": "subformat", "default": null, - "type": "546" + "type": "578" }, { "name": "backing-file", @@ -24963,7 +26014,7 @@ { "name": "adapter-type", "default": null, - "type": "547" + "type": "579" }, { "name": "hwversion", @@ -24979,11 +26030,11 @@ "meta-type": "object" }, { - "name": "457", + "name": "481", "members": [ { "name": "file", - "type": "425" + "type": "449" }, { "name": "size", @@ -24992,7 +26043,7 @@ { "name": "subformat", "default": null, - "type": "548" + "type": "580" }, { "name": "force-size", @@ -25003,11 +26054,11 @@ "meta-type": "object" }, { - "name": "458", + "name": "482", "members": [ { "name": "state", - "type": "549" + "type": "581" }, { "name": "new-secret", @@ -25038,12 +26089,12 @@ "meta-type": "object" }, { - "name": "459", + "name": "483", "members": [ { "name": "encrypt", "default": null, - "type": "550" + "type": "582" } ], "meta-type": "object" @@ -25054,7 +26105,7 @@ "meta-type": "builtin" }, { - "name": "460", + "name": "484", "meta-type": "enum", "values": [ "inet", @@ -25064,47 +26115,47 @@ ] }, { - "name": "461", + "name": "485", "members": [ { "name": "data", - "type": "441" + "type": "465" } ], "meta-type": "object" }, { - "name": "462", + "name": "486", "members": [ { "name": "data", - "type": "489" + "type": "513" } ], "meta-type": "object" }, { - "name": "463", + "name": "487", "members": [ { "name": "data", - "type": "490" + "type": "514" } ], "meta-type": "object" }, { - "name": "464", + "name": "488", "members": [ { "name": "data", - "type": "477" + "type": "501" } ], "meta-type": "object" }, { - "name": "465", + "name": "489", "meta-type": "enum", "values": [ "file", @@ -25130,122 +26181,122 @@ ] }, { - "name": "466", + "name": "490", "members": [ { "name": "data", - "type": "551" + "type": "583" } ], "meta-type": "object" }, { - "name": "467", + "name": "491", "members": [ { "name": "data", - "type": "552" + "type": "584" } ], "meta-type": "object" }, { - "name": "468", + "name": "492", "members": [ { "name": "data", - "type": "553" + "type": "585" } ], "meta-type": "object" }, { - "name": "469", + "name": "493", "members": [ { "name": "data", - "type": "554" + "type": "586" } ], "meta-type": "object" }, { - "name": "470", + "name": "494", "members": [ { "name": "data", - "type": "555" + "type": "587" } ], "meta-type": "object" }, { - "name": "471", + "name": "495", "members": [ { "name": "data", - "type": "556" + "type": "588" } ], "meta-type": "object" }, { - "name": "472", + "name": "496", "members": [ { "name": "data", - "type": "557" + "type": "589" } ], "meta-type": "object" }, { - "name": "473", + "name": "497", "members": [ { "name": "data", - "type": "558" + "type": "590" } ], "meta-type": "object" }, { - "name": "474", + "name": "498", "members": [ { "name": "data", - "type": "559" + "type": "591" } ], "meta-type": "object" }, { - "name": "475", + "name": "499", "members": [ { "name": "data", - "type": "560" + "type": "592" } ], "meta-type": "object" }, { - "name": "476", + "name": "500", "members": [ { "name": "data", - "type": "561" + "type": "593" } ], "meta-type": "object" }, { - "name": "[477]", - "element-type": "477", + "name": "[501]", + "element-type": "501", "meta-type": "array" }, { - "name": "477", + "name": "501", "members": [ { "name": "str", @@ -25255,7 +26306,7 @@ "meta-type": "object" }, { - "name": "478", + "name": "502", "meta-type": "enum", "values": [ "passthrough", @@ -25263,27 +26314,27 @@ ] }, { - "name": "479", + "name": "503", "members": [ { "name": "data", - "type": "562" + "type": "594" } ], "meta-type": "object" }, { - "name": "480", + "name": "504", "members": [ { "name": "data", - "type": "563" + "type": "595" } ], "meta-type": "object" }, { - "name": "481", + "name": "505", "meta-type": "enum", "values": [ "number", @@ -25291,7 +26342,7 @@ ] }, { - "name": "482", + "name": "506", "members": [ { "name": "data", @@ -25301,17 +26352,17 @@ "meta-type": "object" }, { - "name": "483", + "name": "507", "members": [ { "name": "data", - "type": "564" + "type": "596" } ], "meta-type": "object" }, { - "name": "484", + "name": "508", "meta-type": "enum", "values": [ "key", @@ -25321,37 +26372,42 @@ ] }, { - "name": "485", + "name": "509", "members": [ { "name": "data", - "type": "565" + "type": "597" } ], "meta-type": "object" }, { - "name": "486", + "name": "510", "members": [ { "name": "data", - "type": "566" + "type": "598" } ], "meta-type": "object" }, { - "name": "487", + "name": "511", "members": [ { "name": "data", - "type": "567" + "type": "599" } ], "meta-type": "object" }, { - "name": "488", + "name": "number", + "json-type": "number", + "meta-type": "builtin" + }, + { + "name": "512", "meta-type": "enum", "values": [ "inet", @@ -25361,7 +26417,7 @@ ] }, { - "name": "489", + "name": "513", "members": [ { "name": "path", @@ -25381,7 +26437,7 @@ "meta-type": "object" }, { - "name": "490", + "name": "514", "members": [ { "name": "cid", @@ -25395,12 +26451,12 @@ "meta-type": "object" }, { - "name": "[491]", - "element-type": "491", + "name": "[515]", + "element-type": "515", "meta-type": "array" }, { - "name": "491", + "name": "515", "members": [ { "name": "name", @@ -25413,13 +26469,13 @@ { "name": "transform", "default": null, - "type": "568" + "type": "600" } ], "meta-type": "object" }, { - "name": "492", + "name": "516", "meta-type": "enum", "values": [ "abort", @@ -25437,17 +26493,17 @@ ] }, { - "name": "493", + "name": "517", "members": [ { "name": "data", - "type": "569" + "type": "601" } ], "meta-type": "object" }, { - "name": "494", + "name": "518", "members": [ { "name": "data", @@ -25457,7 +26513,7 @@ "meta-type": "object" }, { - "name": "495", + "name": "519", "members": [ { "name": "data", @@ -25467,7 +26523,7 @@ "meta-type": "object" }, { - "name": "496", + "name": "520", "members": [ { "name": "data", @@ -25477,7 +26533,7 @@ "meta-type": "object" }, { - "name": "497", + "name": "521", "members": [ { "name": "data", @@ -25487,7 +26543,7 @@ "meta-type": "object" }, { - "name": "498", + "name": "522", "members": [ { "name": "data", @@ -25497,7 +26553,7 @@ "meta-type": "object" }, { - "name": "499", + "name": "523", "members": [ { "name": "data", @@ -25507,7 +26563,7 @@ "meta-type": "object" }, { - "name": "500", + "name": "524", "members": [ { "name": "data", @@ -25517,7 +26573,7 @@ "meta-type": "object" }, { - "name": "501", + "name": "525", "members": [ { "name": "data", @@ -25527,7 +26583,7 @@ "meta-type": "object" }, { - "name": "502", + "name": "526", "meta-type": "enum", "values": [ "individual", @@ -25535,7 +26591,7 @@ ] }, { - "name": "503", + "name": "527", "meta-type": "enum", "values": [ "string", @@ -25549,12 +26605,12 @@ ] }, { - "name": "[504]", - "element-type": "504", + "name": "[528]", + "element-type": "528", "meta-type": "array" }, { - "name": "504", + "name": "528", "members": [ { "name": "name", @@ -25578,12 +26634,12 @@ "meta-type": "object" }, { - "name": "[505]", - "element-type": "505", + "name": "[529]", + "element-type": "529", "meta-type": "array" }, { - "name": "505", + "name": "529", "members": [ { "name": "case", @@ -25597,12 +26653,12 @@ "meta-type": "object" }, { - "name": "[506]", - "element-type": "506", + "name": "[530]", + "element-type": "530", "meta-type": "array" }, { - "name": "506", + "name": "530", "members": [ { "name": "type", @@ -25612,7 +26668,185 @@ "meta-type": "object" }, { - "name": "507", + "name": "531", + "meta-type": "enum", + "values": [ + "deny", + "allow" + ] + }, + { + "name": "[532]", + "element-type": "532", + "meta-type": "array" + }, + { + "name": "532", + "members": [ + { + "name": "match", + "type": "str" + }, + { + "name": "policy", + "type": "531" + }, + { + "name": "format", + "default": null, + "type": "602" + } + ], + "meta-type": "object" + }, + { + "name": "533", + "meta-type": "enum", + "values": [ + "all", + "rx", + "tx" + ] + }, + { + "name": "534", + "meta-type": "enum", + "values": [ + "before", + "behind" + ] + }, + { + "name": "535", + "meta-type": "enum", + "values": [ + "ctrl-ctrl", + "alt-alt", + "shift-shift", + "meta-meta", + "scrolllock", + "ctrl-scrolllock" + ] + }, + { + "name": "536", + "meta-type": "enum", + "values": [ + "raw", + "base64" + ] + }, + { + "name": "537", + "members": [ + { + "name": "iops-total", + "default": null, + "type": "int" + }, + { + "name": "iops-total-max", + "default": null, + "type": "int" + }, + { + "name": "iops-total-max-length", + "default": null, + "type": "int" + }, + { + "name": "iops-read", + "default": null, + "type": "int" + }, + { + "name": "iops-read-max", + "default": null, + "type": "int" + }, + { + "name": "iops-read-max-length", + "default": null, + "type": "int" + }, + { + "name": "iops-write", + "default": null, + "type": "int" + }, + { + "name": "iops-write-max", + "default": null, + "type": "int" + }, + { + "name": "iops-write-max-length", + "default": null, + "type": "int" + }, + { + "name": "bps-total", + "default": null, + "type": "int" + }, + { + "name": "bps-total-max", + "default": null, + "type": "int" + }, + { + "name": "bps-total-max-length", + "default": null, + "type": "int" + }, + { + "name": "bps-read", + "default": null, + "type": "int" + }, + { + "name": "bps-read-max", + "default": null, + "type": "int" + }, + { + "name": "bps-read-max-length", + "default": null, + "type": "int" + }, + { + "name": "bps-write", + "default": null, + "type": "int" + }, + { + "name": "bps-write-max", + "default": null, + "type": "int" + }, + { + "name": "bps-write-max-length", + "default": null, + "type": "int" + }, + { + "name": "iops-size", + "default": null, + "type": "int" + } + ], + "meta-type": "object" + }, + { + "name": "538", + "meta-type": "enum", + "values": [ + "client", + "server" + ] + }, + { + "name": "539", "meta-type": "enum", "values": [ "uninitialized", @@ -25623,7 +26857,7 @@ ] }, { - "name": "508", + "name": "540", "meta-type": "enum", "values": [ "memory", @@ -25633,7 +26867,7 @@ ] }, { - "name": "509", + "name": "541", "meta-type": "enum", "values": [ "access-latency", @@ -25645,7 +26879,7 @@ ] }, { - "name": "510", + "name": "542", "meta-type": "enum", "values": [ "none", @@ -25654,7 +26888,7 @@ ] }, { - "name": "511", + "name": "543", "meta-type": "enum", "values": [ "none", @@ -25663,7 +26897,7 @@ ] }, { - "name": "512", + "name": "544", "members": [ { "name": "id", @@ -25702,7 +26936,7 @@ "meta-type": "object" }, { - "name": "513", + "name": "545", "members": [ { "name": "id", @@ -25725,7 +26959,7 @@ "meta-type": "object" }, { - "name": "514", + "name": "546", "members": [ { "name": "id", @@ -25764,7 +26998,7 @@ "meta-type": "object" }, { - "name": "515", + "name": "547", "meta-type": "enum", "values": [ "string", @@ -25774,7 +27008,7 @@ ] }, { - "name": "516", + "name": "548", "members": [ { "name": "desc", @@ -25789,7 +27023,7 @@ "meta-type": "object" }, { - "name": "517", + "name": "549", "members": [ { "name": "device", @@ -25813,27 +27047,27 @@ "meta-type": "object" }, { - "name": "518", + "name": "550", "members": [ { "name": "bus", - "type": "570" + "type": "603" }, { "name": "devices", "default": null, - "type": "[413]" + "type": "[438]" } ], "meta-type": "object" }, { - "name": "[519]", - "element-type": "519", + "name": "[551]", + "element-type": "551", "meta-type": "array" }, { - "name": "519", + "name": "551", "members": [ { "name": "bar", @@ -25865,7 +27099,7 @@ "meta-type": "object" }, { - "name": "520", + "name": "552", "meta-type": "enum", "values": [ "unknown", @@ -25876,7 +27110,7 @@ ] }, { - "name": "521", + "name": "553", "meta-type": "enum", "values": [ "qcow2", @@ -25885,37 +27119,37 @@ ] }, { - "name": "522", + "name": "554", "members": [ { "name": "data", - "type": "571" + "type": "604" } ], "meta-type": "object" }, { - "name": "523", + "name": "555", "members": [ { "name": "data", - "type": "572" + "type": "605" } ], "meta-type": "object" }, { - "name": "524", + "name": "556", "members": [ { "name": "data", - "type": "573" + "type": "606" } ], "meta-type": "object" }, { - "name": "525", + "name": "557", "meta-type": "enum", "values": [ "l1_update", @@ -25969,7 +27203,7 @@ ] }, { - "name": "526", + "name": "558", "meta-type": "enum", "values": [ "read", @@ -25981,19 +27215,19 @@ ] }, { - "name": "527", + "name": "559", "meta-type": "enum", "values": [ "inet" ] }, { - "name": "528", + "name": "560", "members": [ { "name": "template", "default": null, - "type": "529" + "type": "561" }, { "name": "main-header", @@ -26044,7 +27278,7 @@ "meta-type": "object" }, { - "name": "529", + "name": "561", "meta-type": "enum", "values": [ "none", @@ -26054,7 +27288,7 @@ ] }, { - "name": "530", + "name": "562", "meta-type": "enum", "values": [ "aes", @@ -26062,7 +27296,7 @@ ] }, { - "name": "531", + "name": "563", "members": [ { "name": "key-secret", @@ -26073,7 +27307,7 @@ "meta-type": "object" }, { - "name": "532", + "name": "564", "members": [ { "name": "key-secret", @@ -26084,14 +27318,14 @@ "meta-type": "object" }, { - "name": "533", + "name": "565", "meta-type": "enum", "values": [ "aes" ] }, { - "name": "534", + "name": "566", "meta-type": "enum", "values": [ "none", @@ -26100,11 +27334,11 @@ ] }, { - "name": "535", + "name": "567", "members": [ { "name": "type", - "type": "574" + "type": "607" }, { "name": "hash", @@ -26114,7 +27348,7 @@ "meta-type": "object" }, { - "name": "536", + "name": "568", "meta-type": "enum", "values": [ "off", @@ -26124,7 +27358,7 @@ ] }, { - "name": "537", + "name": "569", "meta-type": "enum", "values": [ "aes-128", @@ -26142,7 +27376,7 @@ ] }, { - "name": "538", + "name": "570", "meta-type": "enum", "values": [ "ecb", @@ -26152,7 +27386,7 @@ ] }, { - "name": "539", + "name": "571", "meta-type": "enum", "values": [ "plain", @@ -26161,7 +27395,7 @@ ] }, { - "name": "540", + "name": "572", "meta-type": "enum", "values": [ "md5", @@ -26174,28 +27408,28 @@ ] }, { - "name": "541", + "name": "573", "tag": "format", "variants": [ { "case": "qcow", - "type": "531" + "type": "563" }, { "case": "luks", - "type": "576" + "type": "609" } ], "members": [ { "name": "format", - "type": "575" + "type": "608" } ], "meta-type": "object" }, { - "name": "542", + "name": "574", "meta-type": "enum", "values": [ "v2", @@ -26203,35 +27437,35 @@ ] }, { - "name": "543", + "name": "575", "meta-type": "enum", "values": [ "zlib" ] }, { - "name": "544", + "name": "576", "tag": "type", "variants": [ { "case": "full", - "type": "578" + "type": "611" }, { "case": "erasure-coded", - "type": "579" + "type": "612" } ], "members": [ { "name": "type", - "type": "577" + "type": "610" } ], "meta-type": "object" }, { - "name": "545", + "name": "577", "meta-type": "enum", "values": [ "dynamic", @@ -26239,7 +27473,7 @@ ] }, { - "name": "546", + "name": "578", "meta-type": "enum", "values": [ "monolithicSparse", @@ -26250,7 +27484,7 @@ ] }, { - "name": "547", + "name": "579", "meta-type": "enum", "values": [ "ide", @@ -26260,7 +27494,7 @@ ] }, { - "name": "548", + "name": "580", "meta-type": "enum", "values": [ "dynamic", @@ -26268,7 +27502,7 @@ ] }, { - "name": "549", + "name": "581", "meta-type": "enum", "values": [ "active", @@ -26276,12 +27510,12 @@ ] }, { - "name": "550", + "name": "582", "tag": "format", "variants": [ { "case": "luks", - "type": "580" + "type": "613" }, { "case": "qcow", @@ -26291,13 +27525,13 @@ "members": [ { "name": "format", - "type": "575" + "type": "608" } ], "meta-type": "object" }, { - "name": "551", + "name": "583", "members": [ { "name": "logfile", @@ -26327,7 +27561,7 @@ "meta-type": "object" }, { - "name": "552", + "name": "584", "members": [ { "name": "logfile", @@ -26347,7 +27581,7 @@ "meta-type": "object" }, { - "name": "553", + "name": "585", "members": [ { "name": "logfile", @@ -26361,7 +27595,7 @@ }, { "name": "addr", - "type": "309" + "type": "305" }, { "name": "tls-creds", @@ -26412,7 +27646,7 @@ "meta-type": "object" }, { - "name": "554", + "name": "586", "members": [ { "name": "logfile", @@ -26426,18 +27660,18 @@ }, { "name": "remote", - "type": "309" + "type": "305" }, { "name": "local", "default": null, - "type": "309" + "type": "305" } ], "meta-type": "object" }, { - "name": "555", + "name": "587", "members": [ { "name": "logfile", @@ -26453,7 +27687,7 @@ "meta-type": "object" }, { - "name": "556", + "name": "588", "members": [ { "name": "logfile", @@ -26473,7 +27707,7 @@ "meta-type": "object" }, { - "name": "557", + "name": "589", "members": [ { "name": "logfile", @@ -26494,7 +27728,7 @@ "meta-type": "object" }, { - "name": "558", + "name": "590", "members": [ { "name": "logfile", @@ -26514,7 +27748,7 @@ "meta-type": "object" }, { - "name": "559", + "name": "591", "members": [ { "name": "logfile", @@ -26534,7 +27768,7 @@ "meta-type": "object" }, { - "name": "560", + "name": "592", "members": [ { "name": "logfile", @@ -26570,7 +27804,7 @@ "meta-type": "object" }, { - "name": "561", + "name": "593", "members": [ { "name": "logfile", @@ -26591,7 +27825,7 @@ "meta-type": "object" }, { - "name": "562", + "name": "594", "members": [ { "name": "path", @@ -26607,7 +27841,7 @@ "meta-type": "object" }, { - "name": "563", + "name": "595", "members": [ { "name": "chardev", @@ -26617,7 +27851,7 @@ "meta-type": "object" }, { - "name": "564", + "name": "596", "meta-type": "enum", "values": [ "unmapped", @@ -26771,11 +28005,11 @@ ] }, { - "name": "565", + "name": "597", "members": [ { "name": "key", - "type": "349" + "type": "346" }, { "name": "down", @@ -26785,11 +28019,11 @@ "meta-type": "object" }, { - "name": "566", + "name": "598", "members": [ { "name": "button", - "type": "581" + "type": "614" }, { "name": "down", @@ -26799,11 +28033,11 @@ "meta-type": "object" }, { - "name": "567", + "name": "599", "members": [ { "name": "axis", - "type": "582" + "type": "615" }, { "name": "value", @@ -26813,7 +28047,7 @@ "meta-type": "object" }, { - "name": "568", + "name": "600", "members": [ { "name": "persistent", @@ -26824,13 +28058,21 @@ "meta-type": "object" }, { - "name": "569", + "name": "601", "members": [ ], "meta-type": "object" }, { - "name": "570", + "name": "602", + "meta-type": "enum", + "values": [ + "exact", + "glob" + ] + }, + { + "name": "603", "members": [ { "name": "number", @@ -26846,21 +28088,21 @@ }, { "name": "io_range", - "type": "583" + "type": "616" }, { "name": "memory_range", - "type": "583" + "type": "616" }, { "name": "prefetchable_range", - "type": "583" + "type": "616" } ], "meta-type": "object" }, { - "name": "571", + "name": "604", "members": [ { "name": "compat", @@ -26898,22 +28140,22 @@ { "name": "encrypt", "default": null, - "type": "584" + "type": "617" }, { "name": "bitmaps", "default": null, - "type": "[585]" + "type": "[618]" }, { "name": "compression-type", - "type": "543" + "type": "575" } ], "meta-type": "object" }, { - "name": "572", + "name": "605", "members": [ { "name": "create-type", @@ -26929,34 +28171,34 @@ }, { "name": "extents", - "type": "[263]" + "type": "[258]" } ], "meta-type": "object" }, { - "name": "573", + "name": "606", "members": [ { "name": "cipher-alg", - "type": "537" + "type": "569" }, { "name": "cipher-mode", - "type": "538" + "type": "570" }, { "name": "ivgen-alg", - "type": "539" + "type": "571" }, { "name": "ivgen-hash-alg", "default": null, - "type": "540" + "type": "572" }, { "name": "hash-alg", - "type": "540" + "type": "572" }, { "name": "payload-offset", @@ -26972,13 +28214,13 @@ }, { "name": "slots", - "type": "[586]" + "type": "[619]" } ], "meta-type": "object" }, { - "name": "574", + "name": "607", "meta-type": "enum", "values": [ "md5", @@ -26986,7 +28228,7 @@ ] }, { - "name": "575", + "name": "608", "meta-type": "enum", "values": [ "qcow", @@ -26994,7 +28236,7 @@ ] }, { - "name": "576", + "name": "609", "members": [ { "name": "key-secret", @@ -27004,27 +28246,27 @@ { "name": "cipher-alg", "default": null, - "type": "537" + "type": "569" }, { "name": "cipher-mode", "default": null, - "type": "538" + "type": "570" }, { "name": "ivgen-alg", "default": null, - "type": "539" + "type": "571" }, { "name": "ivgen-hash-alg", "default": null, - "type": "540" + "type": "572" }, { "name": "hash-alg", "default": null, - "type": "540" + "type": "572" }, { "name": "iter-time", @@ -27035,7 +28277,7 @@ "meta-type": "object" }, { - "name": "577", + "name": "610", "meta-type": "enum", "values": [ "full", @@ -27043,7 +28285,7 @@ ] }, { - "name": "578", + "name": "611", "members": [ { "name": "copies", @@ -27053,7 +28295,7 @@ "meta-type": "object" }, { - "name": "579", + "name": "612", "members": [ { "name": "data-strips", @@ -27067,11 +28309,11 @@ "meta-type": "object" }, { - "name": "580", + "name": "613", "members": [ { "name": "state", - "type": "549" + "type": "581" }, { "name": "new-secret", @@ -27102,7 +28344,7 @@ "meta-type": "object" }, { - "name": "581", + "name": "614", "meta-type": "enum", "values": [ "left", @@ -27115,7 +28357,7 @@ ] }, { - "name": "582", + "name": "615", "meta-type": "enum", "values": [ "x", @@ -27123,7 +28365,7 @@ ] }, { - "name": "583", + "name": "616", "members": [ { "name": "base", @@ -27137,12 +28379,12 @@ "meta-type": "object" }, { - "name": "584", + "name": "617", "tag": "format", "variants": [ { "case": "luks", - "type": "573" + "type": "606" }, { "case": "aes", @@ -27152,18 +28394,18 @@ "members": [ { "name": "format", - "type": "530" + "type": "562" } ], "meta-type": "object" }, { - "name": "[585]", - "element-type": "585", + "name": "[618]", + "element-type": "618", "meta-type": "array" }, { - "name": "585", + "name": "618", "members": [ { "name": "name", @@ -27175,23 +28417,23 @@ }, { "name": "flags", - "type": "[587]" + "type": "[620]" } ], "meta-type": "object" }, { - "name": "[263]", - "element-type": "263", + "name": "[258]", + "element-type": "258", "meta-type": "array" }, { - "name": "[586]", - "element-type": "586", + "name": "[619]", + "element-type": "619", "meta-type": "array" }, { - "name": "586", + "name": "619", "members": [ { "name": "active", @@ -27215,12 +28457,12 @@ "meta-type": "object" }, { - "name": "[587]", - "element-type": "587", + "name": "[620]", + "element-type": "620", "meta-type": "array" }, { - "name": "587", + "name": "620", "meta-type": "enum", "values": [ "in-use", @@ -27276,6 +28518,7 @@ "ibrs-all": false, "vmx-desc-exit": false, "pause-filter": false, + "bus-lock-detect": false, "xsavec": true, "intel-pt": false, "vmx-cr8-store-exit": false, @@ -27468,6 +28711,7 @@ "amd-ssbd": true, "xop": false, "ibpb": true, + "ibrs": false, "avx": true, "core-capability": false, "vmx-invept-single-context": false, @@ -27609,6 +28853,7 @@ "ibrs-all": false, "vmx-desc-exit": false, "pause-filter": false, + "bus-lock-detect": false, "xsavec": true, "intel-pt": false, "vmx-cr8-store-exit": false, @@ -27801,6 +29046,7 @@ "amd-ssbd": true, "xop": false, "ibpb": true, + "ibrs": false, "avx": true, "core-capability": false, "vmx-invept-single-context": false, @@ -29635,6 +30881,81 @@ "migration-safe": true, "deprecated": false }, + { + "name": "EPYC-Milan-v1", + "typename": "EPYC-Milan-v1-x86_64-cpu", + "unavailable-features": [ + "fma", + "pcid", + "avx", + "f16c", + "avx2", + "invpcid", + "rdseed", + "sha-ni", + "umip", + "rdpid", + "fsrm", + "fxsr-opt", + "misalignsse", + "3dnowprefetch", + "osvw", + "topoext", + "perfctr-core", + "clzero", + "xsaveerptr", + "wbnoinvd", + "ibpb", + "ibrs", + "amd-stibp", + "amd-ssbd", + "nrip-save", + "svme-addr-chk", + "xsavec", + "xsaves" + ], + "static": false, + "migration-safe": true, + "deprecated": false + }, + { + "name": "EPYC-Milan", + "typename": "EPYC-Milan-x86_64-cpu", + "unavailable-features": [ + "fma", + "pcid", + "avx", + "f16c", + "avx2", + "invpcid", + "rdseed", + "sha-ni", + "umip", + "rdpid", + "fsrm", + "fxsr-opt", + "misalignsse", + "3dnowprefetch", + "osvw", + "topoext", + "perfctr-core", + "clzero", + "xsaveerptr", + "wbnoinvd", + "ibpb", + "ibrs", + "amd-stibp", + "amd-ssbd", + "nrip-save", + "svme-addr-chk", + "xsavec", + "xsaves" + ], + "alias-of": "EPYC-Milan-v1", + "static": false, + "migration-safe": true, + "deprecated": false + }, { "name": "EPYC-IBPB", "typename": "EPYC-IBPB-x86_64-cpu", @@ -30305,6 +31626,7 @@ "ibrs-all": false, "vmx-desc-exit": false, "pause-filter": false, + "bus-lock-detect": false, "xsavec": false, "intel-pt": false, "vmx-cr8-store-exit": false, @@ -30497,6 +31819,7 @@ "amd-ssbd": false, "xop": false, "ibpb": false, + "ibrs": false, "avx": false, "core-capability": false, "vmx-invept-single-context": false, @@ -30638,6 +31961,7 @@ "ibrs-all": false, "vmx-desc-exit": false, "pause-filter": false, + "bus-lock-detect": false, "xsavec": false, "intel-pt": false, "vmx-cr8-store-exit": false, @@ -30830,6 +32154,7 @@ "amd-ssbd": false, "xop": false, "ibpb": false, + "ibrs": false, "avx": false, "core-capability": false, "vmx-invept-single-context": false, diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index 6d546268e4..3eee94c56c 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -18,7 +18,6 @@ - @@ -262,7 +261,7 @@ 5002050 0 43100242 - v5.2.0-2208-gc79f01c945 + v5.2.0-3205-g92566947b3 x86_64 @@ -281,6 +280,7 @@ + @@ -473,6 +473,7 @@ + @@ -1198,6 +1199,24 @@ + + + + + + + + + + + + + + + + + + @@ -1497,6 +1516,7 @@ + @@ -1689,6 +1709,7 @@ + @@ -2751,6 +2772,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --=20 2.29.2 From nobody Tue Apr 30 19:20:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1616164567; cv=none; d=zohomail.com; s=zohoarc; b=Wa4ckzaz7JM1L7Yx77gTgtmLHcNy8ZioFH1XYGc6b3707QxtNcYYVMulI0rdrvKaLw5JPh5acp0HaE4AXjLHKoRgu42vSYP/rh1/OE6rFFCBJuscQX2RpAsfMjXb/yiYLjXl7vK1QQ1N+7vLiH94q3+MwVQt/uun6V8qnjoCnlA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616164567; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1+5599bDR9d0kOuzqacjwLpQ0cibo/aoWLt3xRyfS5A=; b=Q5zINWpr697Ki0P+L61nh1Ep5Wj2rtkLULaqrfym17QzyrvBBfO3EVunQvAMqZrYB67un8Wt3Bys2QvVmCxPP9+iBfj3aSazY0bjqpO2u/4LcQ3y9t4wuyzYyFJopr4N3s4JOPi/v1YXtB+34HWXDHuOYk68Bsua2c5coGHFvVE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1616164567512291.38115502593905; Fri, 19 Mar 2021 07:36:07 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-302-oa42UlFJOYutBlMPVCjGcg-1; Fri, 19 Mar 2021 10:34:22 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C676D801817; Fri, 19 Mar 2021 14:34:16 +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 9AAAB5D740; Fri, 19 Mar 2021 14:34:16 +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 555381802137; Fri, 19 Mar 2021 14:34:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JEYAhH027634 for ; Fri, 19 Mar 2021 10:34:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7BA025D74A; Fri, 19 Mar 2021 14:34:10 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id DC0915D740 for ; Fri, 19 Mar 2021 14:34:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616164566; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=1+5599bDR9d0kOuzqacjwLpQ0cibo/aoWLt3xRyfS5A=; b=NYPDBaCSEm3M/T6FokOkJhLI1/7/60vhxxJ06agVlLkStd1kCVbCEXv8nH+3WOFVoCV6FM ip0UeIE4TjDW4gcx6sD6p9uL3Yq7lH3jIEZqc0isNCCEKEsBQ48qW8gzN4awemiPqY/f2W Vwc9sdGZVUsB+Vy5+KSN9ZyKSIWS+6E= X-MC-Unique: oa42UlFJOYutBlMPVCjGcg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v4 11/13] qemuxml2argvtest: Add DO_CAPS_LATEST variant of 'numatune-memnode' Date: Fri, 19 Mar 2021 15:33:42 +0100 Message-Id: <6ef5894f1dc05dd50c542eaeae5e5d65aa03cc18.1616164286.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The test has interesting config of the memory backend object. Preserve the 5.2 output too since it's prior to JSONification. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- .../numatune-memnode.x86_64-5.2.0.args | 43 +++++++++++++++++++ .../numatune-memnode.x86_64-latest.args | 43 +++++++++++++++++++ tests/qemuxml2argvtest.c | 2 + 3 files changed, 88 insertions(+) create mode 100644 tests/qemuxml2argvdata/numatune-memnode.x86_64-5.2.0.ar= gs create mode 100644 tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.a= rgs diff --git a/tests/qemuxml2argvdata/numatune-memnode.x86_64-5.2.0.args b/te= sts/qemuxml2argvdata/numatune-memnode.x86_64-5.2.0.args new file mode 100644 index 0000000000..c1c21db41c --- /dev/null +++ b/tests/qemuxml2argvdata/numatune-memnode.x86_64-5.2.0.args @@ -0,0 +1,43 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest/master-key.aes \ +-machine pc-i440fx-5.2,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-cpu qemu64 \ +-m 24105 \ +-overcommit mem-lock=3Doff \ +-smp 32,sockets=3D32,cores=3D1,threads=3D1 \ +-object memory-backend-ram,id=3Dram-node0,size=3D20971520,host-nodes=3D3,\ +policy=3Dpreferred \ +-numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ +-object memory-backend-ram,id=3Dram-node1,size=3D676331520,host-nodes=3D0-= 7,\ +policy=3Dbind \ +-numa node,nodeid=3D1,cpus=3D1-27,cpus=3D29,memdev=3Dram-node1 \ +-object memory-backend-ram,id=3Dram-node2,size=3D24578621440,host-nodes=3D= 1-2,\ +host-nodes=3D5,host-nodes=3D7,policy=3Dbind \ +-numa node,nodeid=3D2,cpus=3D28,cpus=3D30-31,memdev=3Dram-node2 \ +-uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args b/t= ests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args new file mode 100644 index 0000000000..94b173f117 --- /dev/null +++ b/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args @@ -0,0 +1,43 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest/master-key.aes \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-cpu qemu64 \ +-m 24105 \ +-overcommit mem-lock=3Doff \ +-smp 32,sockets=3D32,cores=3D1,threads=3D1 \ +-object memory-backend-ram,id=3Dram-node0,size=3D20971520,host-nodes=3D3,\ +policy=3Dpreferred \ +-numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ +-object memory-backend-ram,id=3Dram-node1,size=3D676331520,host-nodes=3D0-= 7,\ +policy=3Dbind \ +-numa node,nodeid=3D1,cpus=3D1-27,cpus=3D29,memdev=3Dram-node1 \ +-object memory-backend-ram,id=3Dram-node2,size=3D24578621440,host-nodes=3D= 1-2,\ +host-nodes=3D5,host-nodes=3D7,policy=3Dbind \ +-numa node,nodeid=3D2,cpus=3D28,cpus=3D30-31,memdev=3Dram-node2 \ +-uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1f53d95f13..26d098d32f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2133,6 +2133,8 @@ mymain(void) QEMU_CAPS_NUMA, QEMU_CAPS_OBJECT_MEMORY_RAM); DO_TEST_PARSE_ERROR("numatune-memnode", NONE); + DO_TEST_CAPS_VER("numatune-memnode", "5.2.0"); + DO_TEST_CAPS_LATEST("numatune-memnode"); DO_TEST("numatune-memnode-no-memory", QEMU_CAPS_NUMA, --=20 2.29.2 From nobody Tue Apr 30 19:20:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1616164510; cv=none; d=zohomail.com; s=zohoarc; b=iRMlaNuXgIx2NO0MZX3dYZVLLBlrmNGGxtrrOr+SOJqxfGTK7sjTvsaZ02fMIXAsr6Gtl0/l76+9lGtXgE2M7RHTLUu6kDaMBgumAE211GEbJhZdsOMJAZ0GHGnZO5M0FyDdQYse4F2HRV8d8Z8rbCTppW7q4J3EScxk4Q3cchQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616164510; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pyRKT72ZPPhtkJIc52hBaiEZ/zuBZ4Rwel9WE1uY4NI=; b=RmLsQZHdymebJdh1RQwtdqzuaJFAsRsSxcTA6XQc4qJ9S8huIZGCY+NtdYge0njV7avPXbW3RgPPkducDV+B8X+FT9Mw51xG8hQyQouhoodN03G3x8Eonq4olJUEW1inpGKWcE+eYH7x2gnOVIVDKLf+ZgOBv8xh2ZqFOnyti6I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1616164510789109.85548177550902; Fri, 19 Mar 2021 07:35:10 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-563-jlaQaK3PNpCOTIgmID6z5A-1; Fri, 19 Mar 2021 10:34:22 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 326BC83DD20; Fri, 19 Mar 2021 14:34:15 +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 0A7FB6091B; Fri, 19 Mar 2021 14:34:15 +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 B95A34A704; Fri, 19 Mar 2021 14:34:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JEYENF027691 for ; Fri, 19 Mar 2021 10:34:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2ED785D72F; Fri, 19 Mar 2021 14:34:14 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7400E5D740 for ; Fri, 19 Mar 2021 14:34:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616164509; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=pyRKT72ZPPhtkJIc52hBaiEZ/zuBZ4Rwel9WE1uY4NI=; b=SHmp3rNn4qMbg8ik3qnPF9XSPgteEymbuXpiR8gKv5CN0RLNKG3iGiH84YwBYqTB2lIfZ9 fnKiXm+ugP5nrCqkwsjMsx63RUt+oSvTZaq+CH77jZa57efbkmbq/+SrgT9OhvfvciIMAs hnZdOHhg+F1XuLIUQAfndnKECzcUI8k= X-MC-Unique: jlaQaK3PNpCOTIgmID6z5A-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v4 12/13] qemuxml2argvtest: Pin examples of -object usage to qemu-5.2 caps Date: Fri, 19 Mar 2021 15:33:43 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Add a selection of tests making exapmple use of -object prior to change to the JSON format for -object. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- ...disk-network-tlsx509-nbd.x86_64-5.2.0.args | 50 ++++++++ ...virtio-scsi-reservations.x86_64-5.2.0.args | 55 +++++++++ .../graphics-vnc-tls-secret.x86_64-5.2.0.args | 42 +++++++ ...othreads-virtio-scsi-pci.x86_64-5.2.0.args | 57 +++++++++ .../luks-disks-source-qcow2.x86_64-5.2.0.args | 112 ++++++++++++++++++ ...ory-hotplug-nvdimm-align.x86_64-5.2.0.args | 44 +++++++ ...ory-hotplug-nvdimm-label.x86_64-5.2.0.args | 44 +++++++ ...mory-hotplug-nvdimm-pmem.x86_64-5.2.0.args | 44 +++++++ ...-hotplug-nvdimm-readonly.x86_64-5.2.0.args | 44 +++++++ ...mory-hotplug-virtio-pmem.x86_64-5.2.0.args | 45 +++++++ .../virtio-rng-builtin.x86_64-5.2.0.args | 38 ++++++ .../virtio-rng-egd-unix.x86_64-5.2.0.args | 39 ++++++ tests/qemuxml2argvtest.c | 12 ++ 13 files changed, 626 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-= 5.2.0.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x8= 6_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5= .2.0.args create mode 100644 tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64= -5.2.0.args create mode 100644 tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-5= .2.0.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_= 64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_= 64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_6= 4-5.2.0.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x= 86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_6= 4-5.2.0.args create mode 100644 tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-5.2.0.= args create mode 100644 tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-5.2.0= .args diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-5.2.0.a= rgs b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-5.2.0.args new file mode 100644 index 0000000000..308d9a9fcf --- /dev/null +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-5.2.0.args @@ -0,0 +1,50 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.2,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ +memory-backend=3Dpc.ram \ +-cpu qemu64 \ +-m 214 \ +-object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-object secret,id=3Dobjlibvirt-1-storage_tls0-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object tls-creds-x509,id=3Dobjlibvirt-1-storage_tls0,\ +dir=3D/etc/pki/libvirt-nbd/dummy,,path,endpoint=3Dclient,verify-peer=3Don,\ +passwordid=3Dobjlibvirt-1-storage_tls0-secret0 \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.com",\ +"port":"1234"},"tls-creds":"objlibvirt-1-storage_tls0",\ +"node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},\ +"auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,\ +"cache":{"direct":true,"no-flush":false},"driver":"raw",\ +"file":"libvirt-1-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1-format,\ +id=3Dvirtio-disk3,bootindex=3D1,write-cache=3Don \ +-audiodev id=3Daudio1,driver=3Dnone \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-5.= 2.0.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-5.2.= 0.args new file mode 100644 index 0000000000..e21be7eb54 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-5.2.0.args @@ -0,0 +1,55 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object pr-manager-helper,id=3Dpr-helper0,\ +path=3D/tmp/lib/domain--1-QEMUGuest1/pr-helper0.sock \ +-machine pc-i440fx-5.2,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ +memory-backend=3Dpc.ram \ +-cpu qemu64 \ +-m 214 \ +-object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-overcommit mem-lock=3Doff \ +-smp 8,sockets=3D8,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,id=3Dscsi0,num_queues=3D8,bus=3Dpci.0,addr=3D0x3 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ +"pr-manager":"pr-helper0","node-name":"libvirt-2-storage",\ +"auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ",\ +"file":"libvirt-2-storage"}' \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,\ +drive=3Dlibvirt-2-format,id=3Dscsi0-0-0-0,bootindex=3D1 \ +-object pr-manager-helper,id=3Dpr-helper-libvirt-1-storage,\ +path=3D/path/to/qemu-pr-helper.sock \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2",\ +"pr-manager":"pr-helper-libvirt-1-storage","node-name":"libvirt-1-storage"= ,\ +"auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ",\ +"file":"libvirt-1-storage"}' \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D1,\ +drive=3Dlibvirt-1-format,id=3Dscsi0-0-0-1 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.ar= gs b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args new file mode 100644 index 0000000000..c6da850424 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args @@ -0,0 +1,42 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +SASL_CONF_PATH=3D/root/.sasl2 \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.2,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ +memory-backend=3Dpc.ram \ +-cpu qemu64 \ +-m 214 \ +-object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-object secret,id=3Dvnc-tls-creds0-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object tls-creds-x509,id=3Dvnc-tls-creds0,dir=3D/etc/pki/libvirt-vnc,\ +endpoint=3Dserver,verify-peer=3Don,passwordid=3Dvnc-tls-creds0-secret0 \ +-vnc 127.0.0.1:3,tls-creds=3Dvnc-tls-creds0,sasl=3Don,audiodev=3Daudio1 \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.= args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.args new file mode 100644 index 0000000000..416bb8c30f --- /dev/null +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.args @@ -0,0 +1,57 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.2,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ +memory-backend=3Dpc.ram \ +-cpu qemu64 \ +-m 214 \ +-object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-overcommit mem-lock=3Doff \ +-smp 2,sockets=3D2,cores=3D1,threads=3D1 \ +-object iothread,id=3Diothread1 \ +-object iothread,id=3Diothread2 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,iothread=3Diothread2,id=3Dscsi0,bus=3Dpci.0,addr= =3D0xb \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ +"node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ",\ +"file":"libvirt-3-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/iothrtest1.img",\ +"node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ",\ +"file":"libvirt-2-storage"}' \ +-device virtio-blk-pci,iothread=3Diothread1,bus=3Dpci.0,addr=3D0x4,\ +drive=3Dlibvirt-2-format,id=3Dvirtio-disk1 \ +-blockdev '{"driver":"file",\ +"filename":"/var/lib/libvirt/images/iothrtest2.img",\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ",\ +"file":"libvirt-1-storage"}' \ +-device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D3,\ +device_id=3Ddrive-scsi0-0-0-3,drive=3Dlibvirt-1-format,id=3Dscsi0-0-0-3 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-5.2.0.ar= gs b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-5.2.0.args new file mode 100644 index 0000000000..7144eb0cbd --- /dev/null +++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-5.2.0.args @@ -0,0 +1,112 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-encryptdisk \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-encryptdisk/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-encryptdisk/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-encryptdisk/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3Dencryptdisk,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-encryptdisk/master-key.aes \ +-machine pc-i440fx-5.2,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ +memory-backend=3Dpc.ram \ +-cpu qemu64 \ +-m 1024 \ +-object memory-backend-ram,id=3Dpc.ram,size=3D1073741824 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-object secret,id=3Dlibvirt-7-format-encryption-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk",\ +"node-name":"libvirt-7-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"qco= w2",\ +"encrypt":{"format":"luks","key-secret":"libvirt-7-format-encryption-secre= t0"},\ +"file":"libvirt-7-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-7-format,\ +id=3Dvirtio-disk0,bootindex=3D1 \ +-object secret,id=3Dlibvirt-6-format-encryption-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk2"= ,\ +"node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"qco= w2",\ +"encrypt":{"format":"luks","key-secret":"libvirt-6-format-encryption-secre= t0"},\ +"file":"libvirt-6-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-6-format,\ +id=3Dvirtio-disk1 \ +-object secret,id=3Dlibvirt-5-storage-auth-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object secret,id=3Dlibvirt-5-format-encryption-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-blockdev '{"driver":"iscsi","portal":"example.org:6000",\ +"target":"iqn.1992-01.com.example:storage","lun":1,"transport":"tcp",\ +"user":"myname","password-secret":"libvirt-5-storage-auth-secret0",\ +"node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"qco= w2",\ +"encrypt":{"format":"luks","key-secret":"libvirt-5-format-encryption-secre= t0"},\ +"file":"libvirt-5-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-5-format,\ +id=3Dvirtio-disk2 \ +-object secret,id=3Dlibvirt-4-format-encryption-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-blockdev '{"driver":"iscsi","portal":"iscsi.example.com:3260",\ +"target":"demo-target","lun":3,"transport":"tcp",\ +"node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"qco= w2",\ +"encrypt":{"format":"luks","key-secret":"libvirt-4-format-encryption-secre= t0"},\ +"file":"libvirt-4-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-4-format,\ +id=3Dvirtio-disk3 \ +-object secret,id=3Dlibvirt-3-format-encryption-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-blockdev '{"driver":"rbd","pool":"pool","image":"image",\ +"server":[{"host":"mon1.example.org","port":"6321"},{"host":"mon2.example.= org",\ +"port":"6322"},{"host":"mon3.example.org","port":"6322"}],\ +"node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"qco= w2",\ +"encrypt":{"format":"luks","key-secret":"libvirt-3-format-encryption-secre= t0"},\ +"file":"libvirt-3-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-3-format,\ +id=3Dvirtio-disk4 \ +-object secret,id=3Dlibvirt-2-format-encryption-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-blockdev '{"driver":"file","filename":"/storage/guest_disks/base.qcow2",\ +"node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"qcow= 2",\ +"encrypt":{"format":"luks","key-secret":"libvirt-2-format-encryption-secre= t0"},\ +"file":"libvirt-2-storage","backing":null}' \ +-object secret,id=3Dlibvirt-1-format-encryption-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk5"= ,\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ +"encrypt":{"format":"luks","key-secret":"libvirt-1-format-encryption-secre= t0"},\ +"file":"libvirt-1-storage","backing":"libvirt-2-format"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x8,drive=3Dlibvirt-1-format,\ +id=3Dvirtio-disk5 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.= 0.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.ar= gs new file mode 100644 index 0000000000..e2fc600ae9 --- /dev/null +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.args @@ -0,0 +1,44 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.2,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm= =3Don \ +-cpu qemu64 \ +-m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ +-overcommit mem-lock=3Doff \ +-smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-object memory-backend-ram,id=3Dram-node0,size=3D224395264 \ +-numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ +-object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,share= =3Doff,\ +prealloc=3Don,size=3D536870912,align=3D2097152 \ +-device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ",\ +"file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.= 0.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.ar= gs new file mode 100644 index 0000000000..90abea1294 --- /dev/null +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.args @@ -0,0 +1,44 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.2,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm= =3Don \ +-cpu qemu64 \ +-m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ +-overcommit mem-lock=3Doff \ +-smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-object memory-backend-ram,id=3Dram-node0,size=3D224395264 \ +-numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ +-object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,share= =3Doff,\ +prealloc=3Don,size=3D536870912 \ +-device nvdimm,node=3D0,label-size=3D131072,memdev=3Dmemnvdimm0,id=3Dnvdim= m0,slot=3D0 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ",\ +"file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0= .args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args new file mode 100644 index 0000000000..34fd39aa44 --- /dev/null +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args @@ -0,0 +1,44 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.2,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm= =3Don \ +-cpu qemu64 \ +-m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ +-overcommit mem-lock=3Doff \ +-smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-object memory-backend-ram,id=3Dram-node0,size=3D224395264 \ +-numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ +-object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,share= =3Doff,\ +size=3D536870912,pmem=3Don \ +-device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ",\ +"file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5= .2.0.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5.= 2.0.args new file mode 100644 index 0000000000..d14eeb30a6 --- /dev/null +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.ar= gs @@ -0,0 +1,44 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.2,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm= =3Don \ +-cpu qemu64 \ +-m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ +-overcommit mem-lock=3Doff \ +-smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-object memory-backend-ram,id=3Dram-node0,size=3D224395264 \ +-numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ +-object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,share= =3Doff,\ +prealloc=3Don,size=3D536870912 \ +-device nvdimm,node=3D0,unarmed=3Don,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot= =3D0 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ",\ +"file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don 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 new file mode 100644 index 0000000000..14a87c468a --- /dev/null +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args @@ -0,0 +1,45 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-cpu qemu64 \ +-m size=3D2095104k,slots=3D16,maxmem=3D1099511627776k \ +-overcommit mem-lock=3Doff \ +-smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-object memory-backend-ram,id=3Dram-node0,size=3D2145386496 \ +-numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ +-object memory-backend-file,id=3Dmemvirtiopmem0,mem-path=3D/tmp/virtio_pme= m,\ +share=3Don,size=3D536870912 \ +-device virtio-pmem-pci,memdev=3Dmemvirtiopmem0,id=3Dvirtiopmem0,bus=3Dpci= .0,\ +addr=3D0x5 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ",\ +"file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don 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 new file mode 100644 index 0000000000..edd3c188eb --- /dev/null +++ b/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-5.2.0.args @@ -0,0 +1,38 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,\ +memory-backend=3Dpc.ram \ +-cpu qemu64 \ +-m 214 \ +-object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-object rng-builtin,id=3Dobjrng0 \ +-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x3 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don 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 new file mode 100644 index 0000000000..2035d2e9c5 --- /dev/null +++ b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-5.2.0.args @@ -0,0 +1,39 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,\ +memory-backend=3Dpc.ram \ +-cpu qemu64 \ +-m 214 \ +-object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-chardev socket,id=3Dcharrng0,fd=3D1729,server=3Don,wait=3Doff \ +-object rng-egd,id=3Dobjrng0,chardev=3Dcharrng0 \ +-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x3 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 26d098d32f..12c2b68fd7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1380,6 +1380,7 @@ mymain(void) driver.config->nbdTLSx509secretUUID =3D g_strdup("6fd3f62d-9fe7-4a4e-a= 869-7acd6376d8ea"); driver.config->vxhsTLSx509secretUUID =3D g_strdup("6fd3f62d-9fe7-4a4e-= a869-7acd6376d8ea"); DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "5.2.0"); DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "2.12.0"); DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd"); DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "5.0.0"); @@ -1511,6 +1512,7 @@ mymain(void) DO_TEST_CAPS_VER("graphics-vnc-tls", "2.4.0"); DO_TEST_CAPS_LATEST("graphics-vnc-tls"); driver.config->vncTLSx509secretUUID =3D g_strdup("6fd3f62d-9fe7-4a4e-a= 869-7acd6376d8ea"); + DO_TEST_CAPS_VER("graphics-vnc-tls-secret", "5.2.0"); DO_TEST_CAPS_LATEST("graphics-vnc-tls-secret"); VIR_FREE(driver.config->vncTLSx509secretUUID); driver.config->vncSASL =3D driver.config->vncTLSx509verify =3D driver.= config->vncTLS =3D 0; @@ -2044,6 +2046,7 @@ mymain(void) DO_TEST("iothreads-disk", QEMU_CAPS_OBJECT_IOTHREAD); DO_TEST("iothreads-disk-virtio-ccw", QEMU_CAPS_OBJECT_IOTHREAD, QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + DO_TEST_CAPS_VER("iothreads-virtio-scsi-pci", "5.2.0"); DO_TEST_CAPS_LATEST("iothreads-virtio-scsi-pci"); DO_TEST_CAPS_ARCH_LATEST("iothreads-virtio-scsi-ccw", "s390x"); @@ -2105,6 +2108,7 @@ mymain(void) DO_TEST("luks-disks-source", QEMU_CAPS_OBJECT_SECRET); DO_TEST_PARSE_ERROR("luks-disks-source-qcow2", QEMU_CAPS_OBJECT_SECRET= ); DO_TEST("luks-disks-source-qcow2", QEMU_CAPS_OBJECT_SECRET, QEMU_CAPS_= QCOW2_LUKS); + DO_TEST_CAPS_VER("luks-disks-source-qcow2", "5.2.0"); DO_TEST_CAPS_LATEST("luks-disks-source-qcow2"); DO_TEST_PARSE_ERROR("luks-disk-invalid", NONE); DO_TEST_PARSE_ERROR("luks-disks-source-both", QEMU_CAPS_OBJECT_SECRET); @@ -2539,8 +2543,10 @@ mymain(void) DO_TEST("virtio-rng-egd", QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_EGD); + DO_TEST_CAPS_VER("virtio-rng-builtin", "5.2.0"); DO_TEST_CAPS_LATEST("virtio-rng-builtin"); DO_TEST_CAPS_VER("virtio-rng-egd-unix", "2.5.0"); + DO_TEST_CAPS_VER("virtio-rng-egd-unix", "5.2.0"); DO_TEST_CAPS_LATEST("virtio-rng-egd-unix"); DO_TEST("virtio-rng-multiple", QEMU_CAPS_DEVICE_VIRTIO_RNG, @@ -3168,9 +3174,13 @@ mymain(void) QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm"); DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-access"); + DO_TEST_CAPS_VER("memory-hotplug-nvdimm-label", "5.2.0"); DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-label"); + DO_TEST_CAPS_VER("memory-hotplug-nvdimm-align", "5.2.0"); DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-align"); + DO_TEST_CAPS_VER("memory-hotplug-nvdimm-pmem", "5.2.0"); DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-pmem"); + DO_TEST_CAPS_VER("memory-hotplug-nvdimm-readonly", "5.2.0"); DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-readonly"); DO_TEST("memory-hotplug-nvdimm-ppc64", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST= _BRIDGE, QEMU_CAPS_OBJECT_MEMORY_FILE, @@ -3182,6 +3192,7 @@ mymain(void) QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_DEVICE_NVDIMM, QEMU_CAPS_LAST); + DO_TEST_CAPS_VER("memory-hotplug-virtio-pmem", "5.2.0"); DO_TEST_CAPS_LATEST("memory-hotplug-virtio-pmem"); DO_TEST("machine-aeskeywrap-on-caps", @@ -3503,6 +3514,7 @@ mymain(void) QEMU_CAPS_ICH9_USB_EHCI1); DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "2.12.0"); + DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "5.2.0"); DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations"); DO_TEST_CAPS_LATEST("tseg-explicit-size"); --=20 2.29.2 From nobody Tue Apr 30 19:20:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1616164475; cv=none; d=zohomail.com; s=zohoarc; b=kuLDFR0CBlNzpMHb7pb17i4lVDNSQwlP0p+OsIxNLw0EWd8Vp0QEBx1FiLVannmv3xEUUYf9GFV1+4ZSbHN23E8onjpZQr4X/6ol5NlrR5lOguqL/QUlW4ybf+nH4g/rja2vk0ykofAxUO9p9CrMInOUT9Zgt64RwV3NbRnqGxY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616164475; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4kIV1ki02zg56yVPvYwNt/V5mWLDy0wpacIIs75sfGw=; b=JOEroKQiiGTodP8YXyerUeCamu8E05QzB7ZQEK1a6sM5NMu/5c5/N0Fk0OQFlXgxCMWGnPAR0tu0/xZGk1e+xxMvyY31rg0ilSpPjW85/qv2PMjOAEeIhxnj5qivCYXkd6ZS6xKfD6ZVfGPdfzJI3EiyXBo7uKrwVDeKoh1tmNQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1616164475644216.66627247903057; Fri, 19 Mar 2021 07:34:35 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-311-giSUm-1AOK6PEdl_140hdA-1; Fri, 19 Mar 2021 10:34:27 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6C00B1009467; Fri, 19 Mar 2021 14:34:20 +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 33E941037E80; Fri, 19 Mar 2021 14:34:20 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id DA60F180213E; Fri, 19 Mar 2021 14:34:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JEYJnc027743 for ; Fri, 19 Mar 2021 10:34:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 127DE5D743; Fri, 19 Mar 2021 14:34:19 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id ECEDB5D740 for ; Fri, 19 Mar 2021 14:34:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616164474; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=4kIV1ki02zg56yVPvYwNt/V5mWLDy0wpacIIs75sfGw=; b=HkkM6pUbXJ6xb918nOvSelcviyh6YcxaVjVrrIhjwWhOgldP2fd3x7X25xLVqGuwbm/UFK GubJbJiPoI8o5nOCmbM7COnsysfvo07a31GKaEOelHuYYvLMiBz0FGncSGUKodYJK+vSz8 U9c/LfojePcrdI8hn7zi1MqHv9GnSs8= X-MC-Unique: giSUm-1AOK6PEdl_140hdA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v4 13/13] qemu: capabilities: Enable detection of QEMU_CAPS_OBJECT_QAPIFIED Date: Fri, 19 Mar 2021 15:33:44 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Base the detection on the presence of the 'secret' qom-type entry, which isn't conditionally compiled in qemu. All caps-based test now switch to using JSON for -object. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_capabilities.c | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../audio-alsa-best.x86_64-latest.args | 6 +-- .../audio-alsa-full.x86_64-latest.args | 6 +-- .../audio-alsa-minimal.x86_64-latest.args | 6 +-- .../audio-coreaudio-best.x86_64-latest.args | 6 +-- .../audio-coreaudio-full.x86_64-latest.args | 6 +-- ...audio-coreaudio-minimal.x86_64-latest.args | 6 +-- ...udio-default-nographics.x86_64-latest.args | 6 +-- .../audio-default-sdl.x86_64-latest.args | 6 +-- .../audio-default-spice.x86_64-latest.args | 6 +-- .../audio-default-vnc.x86_64-latest.args | 6 +-- .../audio-file-best.x86_64-latest.args | 6 +-- .../audio-file-full.x86_64-latest.args | 6 +-- .../audio-file-minimal.x86_64-latest.args | 6 +-- .../audio-jack-full.x86_64-latest.args | 6 +-- .../audio-jack-minimal.x86_64-latest.args | 6 +-- .../audio-many-backends.x86_64-latest.args | 6 +-- .../audio-none-best.x86_64-latest.args | 6 +-- .../audio-none-full.x86_64-latest.args | 6 +-- .../audio-none-minimal.x86_64-latest.args | 6 +-- .../audio-oss-best.x86_64-latest.args | 6 +-- .../audio-oss-full.x86_64-latest.args | 6 +-- .../audio-oss-minimal.x86_64-latest.args | 6 +-- .../audio-pulseaudio-best.x86_64-latest.args | 6 +-- .../audio-pulseaudio-full.x86_64-latest.args | 6 +-- ...udio-pulseaudio-minimal.x86_64-latest.args | 6 +-- .../audio-sdl-best.x86_64-latest.args | 6 +-- .../audio-sdl-full.x86_64-latest.args | 6 +-- .../audio-sdl-minimal.x86_64-latest.args | 6 +-- .../audio-spice-best.x86_64-latest.args | 6 +-- .../audio-spice-full.x86_64-latest.args | 6 +-- .../audio-spice-minimal.x86_64-latest.args | 6 +-- .../blkdeviotune-group-num.x86_64-latest.args | 6 +-- ...blkdeviotune-max-length.x86_64-latest.args | 6 +-- .../blkdeviotune-max.x86_64-latest.args | 6 +-- .../channel-unix-guestfwd.x86_64-latest.args | 6 +-- .../console-virtio-unix.x86_64-latest.args | 6 +-- .../controller-virtio-scsi.x86_64-latest.args | 6 +-- ...-Icelake-Server-pconfig.x86_64-latest.args | 6 +-- .../cpu-translation.x86_64-latest.args | 6 +-- .../cpu-tsc-high-frequency.x86_64-latest.args | 6 +-- .../cputune-cpuset-big-id.x86_64-latest.args | 6 +-- .../disk-aio-io_uring.x86_64-latest.args | 6 +-- .../disk-aio.x86_64-latest.args | 6 +-- ...-backing-chains-noindex.x86_64-latest.args | 12 ++--- .../disk-cache.x86_64-latest.args | 6 +-- .../disk-cdrom-bus-other.x86_64-latest.args | 6 +-- ...m-empty-network-invalid.x86_64-latest.args | 6 +-- .../disk-cdrom-network.x86_64-latest.args | 6 +-- .../disk-cdrom-tray.x86_64-latest.args | 6 +-- .../disk-cdrom.x86_64-latest.args | 6 +-- .../disk-copy_on_read.x86_64-latest.args | 6 +-- .../disk-detect-zeroes.x86_64-latest.args | 6 +-- .../disk-discard.x86_64-latest.args | 6 +-- .../disk-error-policy.x86_64-latest.args | 6 +-- .../disk-floppy-q35-2_11.x86_64-latest.args | 6 +-- .../disk-floppy-q35-2_9.x86_64-latest.args | 6 +-- .../disk-floppy.x86_64-latest.args | 6 +-- .../disk-metadata-cache.x86_64-latest.args | 6 +-- .../disk-network-gluster.x86_64-latest.args | 6 +-- .../disk-network-http.x86_64-latest.args | 18 +++---- .../disk-network-iscsi.x86_64-latest.args | 18 +++---- .../disk-network-nbd.x86_64-latest.args | 6 +-- .../disk-network-nfs.x86_64-latest.args | 6 +-- .../disk-network-rbd.x86_64-latest.args | 12 ++--- .../disk-network-sheepdog.x86_64-latest.args | 6 +-- ...isk-network-source-auth.x86_64-latest.args | 24 ++++----- ...isk-network-tlsx509-nbd.x86_64-latest.args | 18 +++---- .../disk-nvme.x86_64-latest.args | 12 ++--- .../disk-readonly-disk.x86_64-latest.args | 6 +-- .../disk-scsi-device-auto.x86_64-latest.args | 6 +-- .../disk-scsi.x86_64-latest.args | 6 +-- .../disk-shared.x86_64-latest.args | 6 +-- .../disk-slices.x86_64-latest.args | 18 +++---- .../disk-transient.x86_64-latest.args | 6 +-- .../disk-vhostuser.x86_64-latest.args | 8 +-- ...irtio-scsi-reservations.x86_64-latest.args | 14 ++--- .../eoi-disabled.x86_64-latest.args | 6 +-- .../eoi-enabled.x86_64-latest.args | 6 +-- .../fips-enabled.x86_64-latest.args | 6 +-- .../floppy-drive-fat.x86_64-latest.args | 6 +-- .../qemuxml2argvdata/fs9p.x86_64-latest.args | 6 +-- .../genid-auto.x86_64-latest.args | 6 +-- .../qemuxml2argvdata/genid.x86_64-latest.args | 6 +-- ...egl-headless-rendernode.x86_64-latest.args | 6 +-- .../graphics-egl-headless.x86_64-latest.args | 6 +-- ...pice-gl-auto-rendernode.x86_64-latest.args | 6 +-- .../graphics-vnc-power.x86_64-latest.args | 6 +-- ...graphics-vnc-tls-secret.x86_64-latest.args | 17 +++--- .../graphics-vnc-tls.x86_64-latest.args | 10 ++-- ...tdev-mdev-display-ramfb.x86_64-latest.args | 6 +-- ...play-spice-egl-headless.x86_64-latest.args | 6 +-- ...ev-display-spice-opengl.x86_64-latest.args | 6 +-- ...isplay-vnc-egl-headless.x86_64-latest.args | 6 +-- ...ostdev-mdev-display-vnc.x86_64-latest.args | 6 +-- .../hostdev-scsi-lsi.x86_64-latest.args | 18 +++---- ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 18 +++---- .../hugepages-memaccess3.x86_64-latest.args | 11 ++-- .../hugepages-nvdimm.x86_64-latest.args | 14 ++--- .../hyperv-off.x86_64-latest.args | 6 +-- .../hyperv-panic.x86_64-latest.args | 6 +-- .../hyperv-stimer-direct.x86_64-latest.args | 6 +-- .../hyperv.x86_64-latest.args | 6 +-- .../intel-iommu-aw-bits.x86_64-latest.args | 6 +-- ...ntel-iommu-caching-mode.x86_64-latest.args | 6 +-- ...ntel-iommu-device-iotlb.x86_64-latest.args | 6 +-- .../intel-iommu-eim.x86_64-latest.args | 6 +-- .../intel-iommu.x86_64-latest.args | 6 +-- ...threads-virtio-scsi-pci.x86_64-latest.args | 10 ++-- .../kvmclock+eoi-disabled.x86_64-latest.args | 6 +-- ...luks-disks-source-qcow2.x86_64-latest.args | 54 +++++++++---------- ...memory-default-hugepage.x86_64-latest.args | 9 ++-- .../memfd-memory-numa.x86_64-latest.args | 9 ++-- ...y-hotplug-nvdimm-access.x86_64-latest.args | 10 ++-- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 11 ++-- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 10 ++-- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 10 ++-- ...hotplug-nvdimm-readonly.x86_64-latest.args | 10 ++-- .../memory-hotplug-nvdimm.x86_64-latest.args | 10 ++-- ...ory-hotplug-virtio-pmem.x86_64-latest.args | 10 ++-- .../mlock-off.x86_64-latest.args | 6 +-- .../mlock-on.x86_64-latest.args | 6 +-- .../net-vdpa.x86_64-latest.args | 6 +-- .../net-vhostuser.x86_64-latest.args | 6 +-- .../numatune-hmat.x86_64-latest.args | 16 +++--- .../numatune-memnode.x86_64-latest.args | 16 +++--- .../os-firmware-bios.x86_64-latest.args | 6 +-- ...re-efi-no-enrolled-keys.x86_64-latest.args | 6 +-- ...os-firmware-efi-secboot.x86_64-latest.args | 6 +-- .../os-firmware-efi.x86_64-latest.args | 6 +-- .../parallel-unix-chardev.x86_64-latest.args | 6 +-- ...cie-root-port-nohotplug.x86_64-latest.args | 6 +-- .../pv-spinlock-disabled.x86_64-latest.args | 6 +-- .../pv-spinlock-enabled.x86_64-latest.args | 6 +-- .../qemu-ns.x86_64-latest.args | 6 +-- .../serial-unix-chardev.x86_64-latest.args | 6 +-- ...rtcard-passthrough-unix.x86_64-latest.args | 6 +-- .../tpm-emulator-tpm2-enc.x86_64-latest.args | 6 +-- ...pm-emulator-tpm2-pstate.x86_64-latest.args | 6 +-- .../tpm-emulator-tpm2.x86_64-latest.args | 6 +-- .../tpm-emulator.x86_64-latest.args | 6 +-- .../tpm-passthrough-crb.x86_64-latest.args | 6 +-- .../tpm-passthrough.x86_64-latest.args | 6 +-- .../tseg-explicit-size.x86_64-latest.args | 6 +-- .../usb-redir-unix.x86_64-latest.args | 6 +-- ...vhost-user-fs-fd-memory.x86_64-latest.args | 10 ++-- ...vhost-user-fs-hugepages.x86_64-latest.args | 10 ++-- ...host-user-gpu-secondary.x86_64-latest.args | 7 +-- .../vhost-user-vga.x86_64-latest.args | 7 +-- .../vhost-vsock-auto.x86_64-latest.args | 6 +-- .../vhost-vsock.x86_64-latest.args | 6 +-- ...eo-bochs-display-device.x86_64-latest.args | 6 +-- ...video-qxl-device-vram64.x86_64-latest.args | 6 +-- ...o-qxl-sec-device-vram64.x86_64-latest.args | 6 +-- ...eo-ramfb-display-device.x86_64-latest.args | 6 +-- .../virtio-9p-createmode.x86_64-latest.args | 6 +-- .../virtio-9p-multidevs.x86_64-latest.args | 6 +-- ...virtio-non-transitional.x86_64-latest.args | 8 +-- ...-options-controller-ats.x86_64-latest.args | 6 +-- ...ptions-controller-iommu.x86_64-latest.args | 6 +-- ...tions-controller-packed.x86_64-latest.args | 6 +-- ...virtio-options-disk-ats.x86_64-latest.args | 6 +-- ...rtio-options-disk-iommu.x86_64-latest.args | 6 +-- ...tio-options-disk-packed.x86_64-latest.args | 6 +-- .../virtio-options-fs-ats.x86_64-latest.args | 6 +-- ...virtio-options-fs-iommu.x86_64-latest.args | 6 +-- ...irtio-options-fs-packed.x86_64-latest.args | 6 +-- ...irtio-options-input-ats.x86_64-latest.args | 6 +-- ...tio-options-input-iommu.x86_64-latest.args | 6 +-- ...io-options-input-packed.x86_64-latest.args | 6 +-- ...-options-memballoon-ats.x86_64-latest.args | 6 +-- ...loon-freepage-reporting.x86_64-latest.args | 6 +-- ...ptions-memballoon-iommu.x86_64-latest.args | 6 +-- ...tions-memballoon-packed.x86_64-latest.args | 6 +-- .../virtio-options-net-ats.x86_64-latest.args | 6 +-- ...irtio-options-net-iommu.x86_64-latest.args | 6 +-- ...rtio-options-net-packed.x86_64-latest.args | 6 +-- .../virtio-options-rng-ats.x86_64-latest.args | 10 ++-- ...irtio-options-rng-iommu.x86_64-latest.args | 10 ++-- ...rtio-options-rng-packed.x86_64-latest.args | 10 ++-- ...irtio-options-video-ats.x86_64-latest.args | 6 +-- ...tio-options-video-iommu.x86_64-latest.args | 6 +-- ...io-options-video-packed.x86_64-latest.args | 6 +-- .../virtio-options.x86_64-latest.args | 8 +-- .../virtio-rng-builtin.x86_64-latest.args | 8 +-- .../virtio-rng-egd-unix.x86_64-latest.args | 8 +-- .../virtio-transitional.x86_64-latest.args | 8 +-- ...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 6 +-- ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 6 +-- ...-default-cpu-tcg-pc-4.2.x86_64-latest.args | 6 +-- ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 6 +-- .../x86_64-pc-graphics.x86_64-latest.args | 8 +-- .../x86_64-pc-headless.x86_64-latest.args | 8 +-- .../x86_64-q35-graphics.x86_64-latest.args | 8 +-- .../x86_64-q35-headless.x86_64-latest.args | 8 +-- 196 files changed, 734 insertions(+), 725 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 1ae7b2b704..cd51912d78 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1558,6 +1558,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSc= hemaQueries[] =3D { { "netdev_add/arg-type/+vhost-vdpa", QEMU_CAPS_NETDEV_VHOST_VDPA }, { "migrate-set-parameters/arg-type/block-bitmap-mapping/bitmaps/transf= orm", QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING }, + { "object-add/arg-type/qom-type/^secret", QEMU_CAPS_OBJECT_QAPIFIED }, }; typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps; diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index 3eee94c56c..9c55e9b46d 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -258,6 +258,7 @@ + 5002050 0 43100242 diff --git a/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args index e9898c29de..b020a02758 100644 --- a/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args index 3c1b5ba6a5..0162fdbd16 100644 --- a/tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args b= /tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args index d2146a1f77..cdd1b19929 100644 --- a/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args= b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args index 273655840a..d42dd7b045 100644 --- a/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args= b/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args index 2e8f7b6231..e729ede902 100644 --- a/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args index 7654b330b0..2b6552d4fc 100644 --- a/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.= args b/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args index d2146a1f77..cdd1b19929 100644 --- a/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args b/= tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args index 1016430f96..b30c622ee4 100644 --- a/tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args @@ -10,12 +10,12 @@ SDL_AUDIODRIVER=3Desd \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args = b/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args index f3aa6ab04d..ea65fead2c 100644 --- a/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args b/= tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args index 9eae9d2cb2..920a8d6a37 100644 --- a/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-file-best.x86_64-latest.args index ff9248f002..df9ec184cf 100644 --- a/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-file-full.x86_64-latest.args index e24d072298..cbe804e669 100644 --- a/tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args b= /tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args index 87f930b0be..58f50cbd2c 100644 --- a/tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-jack-full.x86_64-latest.args index cb17a25c7e..74aa9c25ef 100644 --- a/tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args b= /tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args index e45dc5e241..867d4afda2 100644 --- a/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args = b/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args index 231e379488..244ea25d79 100644 --- a/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-none-best.x86_64-latest.args index 005f26dded..72e7720e5e 100644 --- a/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-none-full.x86_64-latest.args index d303a161f8..2d0648329b 100644 --- a/tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args b= /tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args index 64b85da14a..8b2e501fcf 100644 --- a/tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args b/tes= ts/qemuxml2argvdata/audio-oss-best.x86_64-latest.args index 41fda4fb73..bda364f662 100644 --- a/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args b/tes= ts/qemuxml2argvdata/audio-oss-full.x86_64-latest.args index fd899cad3e..bd6069af6f 100644 --- a/tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args b/= tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args index 1f9d52672e..6eab726e7a 100644 --- a/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.arg= s b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args index fb58ed3e14..23cea389c1 100644 --- a/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.arg= s b/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args index 02d0a3a9c8..6562d653cd 100644 --- a/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.= args b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args index 5eda5edcfb..c572b24b02 100644 --- a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args b/tes= ts/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args index 770426419a..2884cf4d92 100644 --- a/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args @@ -10,12 +10,12 @@ SDL_AUDIODRIVER=3Dpulseaudio \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args b/tes= ts/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args index a642926a22..0c96761e8c 100644 --- a/tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args @@ -10,12 +10,12 @@ SDL_AUDIODRIVER=3Dpulseaudio \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args b/= tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args index 1b36024843..29fa9f1dc4 100644 --- a/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args b/t= ests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args index b23ff38f23..fabe922770 100644 --- a/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args b/t= ests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args index 4419ad2cdb..04967fb8df 100644 --- a/tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args = b/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args index 2d9050b8e0..f88255efba 100644 --- a/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args index a3289bbf6b..6629dbf9af 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args index a3289bbf6b..6629dbf9af 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args b/t= ests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args index a3289bbf6b..6629dbf9af 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.arg= s b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args index 6f1191984a..4ca1476d09 100644 --- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args = b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args index 2d68464dda..d66560d4b9 100644 --- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args index 2e49ce1476..f89b262670 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 8,sockets=3D8,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ 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 c3672983d8..356b3a7e04 100644 --- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dtest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-test/master-key.aes"}' \ -machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu Icelake-Server,intel-pt=3Doff \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args b/te= sts/qemuxml2argvdata/cpu-translation.x86_64-latest.args index 661acad35a..69a2011abe 100644 --- a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args @@ -9,14 +9,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu Haswell,pclmulqdq=3Don,ds-cpl=3Don,tsc-adjust=3Don,fxsr-opt=3Don,lahf= -lm=3Don,\ cmp-legacy=3Don,nodeid-msr=3Don,perfctr-core=3Don,perfctr-nb=3Don,kvm-pv-e= oi=3Don,\ kvm-pv-unhalt=3Don \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-fade-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args index 40a413d97a..69e88d0b33 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args @@ -9,15 +9,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -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,invt= sc=3Don,\ tsc-frequency=3D4567890000 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.arg= s b/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args index ef00c6e162..baeac13a7a 100644 --- a/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args index fb9ee0eda4..145b6a8f2c 100644 --- a/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args b/tests/qem= uxml2argvdata/disk-aio.x86_64-latest.args index 581ff06314..7d4e05add6 100644 --- a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-late= st.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.= args index e1f59c3ff0..8e15b51250 100644 --- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -81,9 +81,9 @@ id=3Dvirtio-disk2 \ "node-name":"libvirt-15-storage","auto-read-only":true,"discard":"unmap"}'= \ -blockdev '{"node-name":"libvirt-15-format","read-only":true,"driver":"qco= w2",\ "file":"libvirt-15-storage","backing":null}' \ --object secret,id=3Dlibvirt-14-storage-auth-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-14-storage-auth-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image",\ "server":[{"host":"mon1.example.org","port":"6321"},{"host":"mon2.example.= org",\ "port":"6322"},{"host":"mon3.example.org","port":"6322"}],"user":"myname",\ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args b/tests/q= emuxml2argvdata/disk-cache.x86_64-latest.args index 6ca255ad27..d0dab91cbb 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args index be7dd2c2af..132427c91a 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64= -latest.args b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_= 64-latest.args index 7bc1ae250c..9a50131d66 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest= .args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args index 9f2260ed44..7fef6d066d 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 1024 \ --object memory-backend-ram,id=3Dpc.ram,size=3D1073741824 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args b/te= sts/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args index 23758c1271..9cfd47dd0e 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dtest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-test/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 1024 \ --object memory-backend-ram,id=3Dpc.ram,size=3D1073741824 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 3fa02811-7832-34bd-004d-1ff56a9286ff \ diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args b/tests/q= emuxml2argvdata/disk-cdrom.x86_64-latest.args index 147c5af826..fdf8fceca2 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args index 6b6ada6530..b983542f7b 100644 --- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dtest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-test/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 1024 \ --object memory-backend-ram,id=3Dpc.ram,size=3D1073741824 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 468404ad-d49c-40f2-9e14-02294f9c1be3 \ diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args index 56084f6991..349aaeeb09 100644 --- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dtest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-test/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 1024 \ --object memory-backend-ram,id=3Dpc.ram,size=3D1073741824 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 92d7a226-cfae-425b-a6d3-00bbf9ec5c9e \ diff --git a/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args b/tests= /qemuxml2argvdata/disk-discard.x86_64-latest.args index 12c5d5db7d..04beccb424 100644 --- a/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dtest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-test/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 1024 \ --object memory-backend-ram,id=3Dpc.ram,size=3D1073741824 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 92d7a226-cfae-425b-a6d3-00bbf9ec5c9e \ diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args index 0957d16482..a8d76f8fae 100644 --- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args index 2a00c84492..4374a44990 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args @@ -9,13 +9,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc-q35-2.11,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ memory-backend=3Dpc.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args = b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args index d1e65335b2..7b2a8dae2f 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args @@ -9,13 +9,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc-q35-2.9,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ memory-backend=3Dpc.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-floppy.x86_64-latest.args index 6730a493e7..563c71b044 100644 --- a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args = b/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args index be009c376f..7b4e916ca1 100644 --- a/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args index 7665be3ac9..c5f9a23f34 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args index b5b9493693..d752fcc786 100644 --- a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -42,9 +42,9 @@ id=3Dvirtio-disk0,bootindex=3D1 \ "file":"libvirt-3-storage"}' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-3-format,\ id=3Dvirtio-disk1 \ --object secret,id=3Dlibvirt-2-storage-httpcookie-secret0,\ -data=3DDrPR9NA6GKJb7qi1KbjHaealKEMVtOWUl2h3yvO5lgIh6cyLHemmlg+h9fcgwREA,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-2-storage-httpcookie-secret0",\ +"data":"DrPR9NA6GKJb7qi1KbjHaealKEMVtOWUl2h3yvO5lgIh6cyLHemmlg+h9fcgwREA",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"http","url":"http://example.org:1234/test3.img",\ "cookie-secret":"libvirt-2-storage-httpcookie-secret0",\ "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ @@ -52,9 +52,9 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,form= at=3Dbase64 \ "file":"libvirt-2-storage"}' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-2-format,\ id=3Dvirtio-disk2 \ --object secret,id=3Dlibvirt-1-storage-httpcookie-secret0,\ -data=3DDrPR9NA6GKJb7qi1KbjHaealKEMVtOWUl2h3yvO5lgIh6cyLHemmlg+h9fcgwREA,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-1-storage-httpcookie-secret0",\ +"data":"DrPR9NA6GKJb7qi1KbjHaealKEMVtOWUl2h3yvO5lgIh6cyLHemmlg+h9fcgwREA",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"https",\ "url":"https://example.org:1234/test4.img?par=3Dval&other=3Dble","sslverif= y":false,\ "cookie-secret":"libvirt-1-storage-httpcookie-secret0",\ diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args index 4eea428a2b..8ef0ff088d 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -43,9 +43,9 @@ id=3Dvirtio-disk0,bootindex=3D1 \ "file":"libvirt-4-storage"}' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-4-format,\ id=3Dvirtio-disk1 \ --object secret,id=3Dlibvirt-3-storage-auth-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-3-storage-auth-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"iscsi","portal":"example.org:6000",\ "target":"iqn.1992-01.com.example:storage","lun":1,"transport":"tcp",\ "user":"myname","password-secret":"libvirt-3-storage-auth-secret0",\ @@ -54,9 +54,9 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,form= at=3Dbase64 \ "file":"libvirt-3-storage"}' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-3-format,\ id=3Dvirtio-disk2 \ --object secret,id=3Dlibvirt-2-storage-auth-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-2-storage-auth-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"iscsi","portal":"example.org:6000",\ "target":"iqn.1992-01.com.example:storage","lun":2,"transport":"tcp",\ "user":"myname","password-secret":"libvirt-2-storage-auth-secret0",\ diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args index 6c9e4a4e3a..03949e0126 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args index 394bb2b22d..f5d8f5e519 100644 --- a/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args index 1a1fa2f38e..d047df9d83 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -57,9 +57,9 @@ id=3Dvirtio-disk2 \ "file":"libvirt-3-storage"}' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-3-format,\ id=3Dvirtio-disk3 \ --object secret,id=3Dlibvirt-2-storage-auth-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-2-storage-auth-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image",\ "server":[{"host":"mon1.example.org","port":"6321"},{"host":"mon2.example.= org",\ "port":"6322"},{"host":"mon3.example.org","port":"6322"}],"user":"myname",\ diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.arg= s b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args index b92fbed884..76a92bef0d 100644 --- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.= args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args index 18196dc496..697105e83b 100644 --- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -28,9 +28,9 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -no-acpi \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --object secret,id=3Dlibvirt-3-storage-auth-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-3-storage-auth-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"iscsi","portal":"example.org:6000",\ "target":"iqn.1992-01.com.example:storage","lun":1,"transport":"tcp",\ "user":"myname","password-secret":"libvirt-3-storage-auth-secret0",\ @@ -39,9 +39,9 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,form= at=3Dbase64 \ "file":"libvirt-3-storage"}' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-3-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ --object secret,id=3Dlibvirt-2-storage-auth-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-2-storage-auth-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image",\ "server":[{"host":"mon1.example.org","port":"6321"},{"host":"mon2.example.= org",\ "port":"6322"},{"host":"mon3.example.org","port":"6322"}],"user":"myname",\ @@ -52,9 +52,9 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,form= at=3Dbase64 \ "file":"libvirt-2-storage"}' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-2-format,\ id=3Dvirtio-disk1 \ --object secret,id=3Dlibvirt-1-storage-auth-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-1-storage-auth-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image2",\ "server":[{"host":"mon1.example.org","port":"6321"},{"host":"mon2.example.= org",\ "port":"6322"},{"host":"mon3.example.org","port":"6322"}],"user":"myname",\ diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.= args b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args index db44726b67..30beb6d6c3 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -28,12 +28,12 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -no-acpi \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --object secret,id=3Dobjlibvirt-1-storage_tls0-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ --object tls-creds-x509,id=3Dobjlibvirt-1-storage_tls0,\ -dir=3D/etc/pki/libvirt-nbd/dummy,,path,endpoint=3Dclient,verify-peer=3Don,\ -passwordid=3Dobjlibvirt-1-storage_tls0-secret0 \ +-object '{"qom-type":"secret","id":"objlibvirt-1-storage_tls0-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ +-object '{"qom-type":"tls-creds-x509","id":"objlibvirt-1-storage_tls0",\ +"dir":"/etc/pki/libvirt-nbd/dummy,path","endpoint":"client","verify-peer":= true,\ +"passwordid":"objlibvirt-1-storage_tls0-secret0"}' \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.com",\ "port":"1234"},"tls-creds":"objlibvirt-1-storage_tls0",\ "node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},\ diff --git a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args b/tests/qe= muxml2argvdata/disk-nvme.x86_64-latest.args index 891d4cb972..8e34fa61e6 100644 --- a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -47,9 +47,9 @@ id=3Dvirtio-disk1 \ "file":"libvirt-2-storage"}' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-2-format,\ id=3Dvirtio-disk2 \ --object secret,id=3Dlibvirt-1-format-encryption-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"nvme","device":"0001:02:00.0","namespace":2,\ "node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},\ "auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args index 0e70692e45..6a0767a9d5 100644 --- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.arg= s b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args index 95c0ff7bda..6e8de0af7a 100644 --- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args b/tests/qe= muxml2argvdata/disk-scsi.x86_64-latest.args index c562fb7ca1..9d932c0ce8 100644 --- a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-shared.x86_64-latest.args index 20f6e6f4da..f11cc75b8a 100644 --- a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-slices.x86_64-latest.args index 24e10cea68..1fc7c2f014 100644 --- a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -47,9 +47,9 @@ id=3Dvirtio-disk0,bootindex=3D1 \ "file":"libvirt-4-storage","backing":"libvirt-5-format"}' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-4-format,\ id=3Dvirtio-disk1 \ --object secret,id=3Dlibvirt-3-format-encryption-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-3-format-encryption-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/luks.img",\ "node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"driver":"raw","node-name":"libvirt-3-slice-sto","offset":1234= ,\ @@ -66,9 +66,9 @@ id=3Dvirtio-disk2 \ "offset":1234,"size":321,"file":"libvirt-2-storage"}' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-2-format,\ id=3Dvirtio-disk3 \ --object secret,id=3Dlibvirt-1-format-encryption-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"nvme","device":"0001:02:00.0","namespace":2,\ "node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},\ "auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-transient.x86_64-latest.args index 3f9a281312..be1c9c119e 100644 --- a/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args index b485272152..286b4861e6 100644 --- a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args @@ -9,13 +9,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-memfd,id=3Dpc.ram,share=3Don,\ -x-use-canonical-path-for-ramblock-id=3Doff,size=3D224395264 \ +-object '{"qom-type":"memory-backend-memfd","id":"pc.ram","share":true,\ +"x-use-canonical-path-for-ramblock-id":false,"size":224395264}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-la= test.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-lat= est.args index 41dfb1a7cb..6b6c4d5a50 100644 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.ar= gs @@ -9,14 +9,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --object pr-manager-helper,id=3Dpr-helper0,\ -path=3D/tmp/lib/domain--1-QEMUGuest1/pr-helper0.sock \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-object '{"qom-type":"pr-manager-helper","id":"pr-helper0",\ +"path":"/tmp/lib/domain--1-QEMUGuest1/pr-helper0.sock"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 8,sockets=3D8,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -38,8 +38,8 @@ path=3D/tmp/lib/domain--1-QEMUGuest1/pr-helper0.sock \ "file":"libvirt-2-storage"}' \ -device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,\ drive=3Dlibvirt-2-format,id=3Dscsi0-0-0-0,bootindex=3D1 \ --object pr-manager-helper,id=3Dpr-helper-libvirt-1-storage,\ -path=3D/path/to/qemu-pr-helper.sock \ +-object '{"qom-type":"pr-manager-helper","id":"pr-helper-libvirt-1-storage= ",\ +"path":"/path/to/qemu-pr-helper.sock"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2",\ "pr-manager":"pr-helper-libvirt-1-storage","node-name":"libvirt-1-storage"= ,\ "auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args b/tests= /qemuxml2argvdata/eoi-disabled.x86_64-latest.args index 7232b31b61..8afab1ce68 100644 --- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64,kvm-pv-eoi=3Doff \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args b/tests/= qemuxml2argvdata/eoi-enabled.x86_64-latest.args index 97972d0bdd..663cc27a45 100644 --- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64,kvm-pv-eoi=3Don \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args b/tests= /qemuxml2argvdata/fips-enabled.x86_64-latest.args index cb39f8d902..57d6649884 100644 --- a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args b/t= ests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args index c5eac2ebf6..22881894be 100644 --- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args b/tests/qemuxml= 2argvdata/fs9p.x86_64-latest.args index 1bb17a15fd..6463bbefdf 100644 --- a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fs9p.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args b/tests/q= emuxml2argvdata/genid-auto.x86_64-latest.args index e7885327e7..1b857cfb56 100644 --- a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/genid.x86_64-latest.args b/tests/qemuxm= l2argvdata/genid.x86_64-latest.args index 1ac9236595..87a9ff3b23 100644 --- a/tests/qemuxml2argvdata/genid.x86_64-latest.args +++ b/tests/qemuxml2argvdata/genid.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64= -latest.args b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_= 64-latest.args index 32b869d15b..644e6a92df 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest= .args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.arg= s b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args index 32b869d15b..644e6a92df 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_6= 4-latest.args b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x8= 6_64-latest.args index 47a9986a79..ddec2054af 100644 --- a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-lates= t.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args b= /tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args index 012bd3dd2a..1a851fe265 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args index 878108232b..de3e2df220 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args @@ -10,12 +10,12 @@ SASL_CONF_PATH=3D/root/.sasl2 \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -29,11 +29,12 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev id=3Daudio1,driver=3Dnone \ --object secret,id=3Dvnc-tls-creds0-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ --object tls-creds-x509,id=3Dvnc-tls-creds0,dir=3D/etc/pki/libvirt-vnc,\ -endpoint=3Dserver,verify-peer=3Don,passwordid=3Dvnc-tls-creds0-secret0 \ +-object '{"qom-type":"secret","id":"vnc-tls-creds0-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ +-object '{"qom-type":"tls-creds-x509","id":"vnc-tls-creds0",\ +"dir":"/etc/pki/libvirt-vnc","endpoint":"server","verify-peer":true,\ +"passwordid":"vnc-tls-creds0-secret0"}' \ -vnc 127.0.0.1:3,tls-creds=3Dvnc-tls-creds0,sasl=3Don,audiodev=3Daudio1 \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args b/t= ests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args index 501935163a..c573334909 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args @@ -10,12 +10,12 @@ SASL_CONF_PATH=3D/root/.sasl2 \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -29,8 +29,8 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev id=3Daudio1,driver=3Dnone \ --object tls-creds-x509,id=3Dvnc-tls-creds0,dir=3D/etc/pki/libvirt-vnc,\ -endpoint=3Dserver,verify-peer=3Don \ +-object '{"qom-type":"tls-creds-x509","id":"vnc-tls-creds0",\ +"dir":"/etc/pki/libvirt-vnc","endpoint":"server","verify-peer":true}' \ -vnc 127.0.0.1:3,tls-creds=3Dvnc-tls-creds0,sasl=3Don,audiodev=3Daudio1 \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-lates= t.args b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.ar= gs index 70126d2540..f2cd0f0bda 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest2,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest2/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless= .x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl= -headless.x86_64-latest.args index 26125666da..587b14372d 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64= -latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64= -latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest2,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest2/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_6= 4-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x8= 6_64-latest.args index 12f5c69213..600cde6d51 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-lates= t.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest2,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest2/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x= 86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-hea= dless.x86_64-latest.args index 2fa9d4c667..d86e634c3f 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-l= atest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-l= atest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest2,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest2/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.= args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args index e707bc934e..d07216c94f 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest2,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest2/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args b/t= ests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args index 6f431a33da..3e7e14ce04 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest2,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest2/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ @@ -49,17 +49,17 @@ file=3D/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ "target":"iqn.1992-01.com.example","lun":1,"transport":"tcp",\ "node-name":"libvirt-5-backend","read-only":false}' \ -device scsi-generic,bus=3Dscsi0.0,scsi-id=3D5,drive=3Dlibvirt-5-backend,i= d=3Dhostdev3 \ --object secret,id=3Dlibvirt-6-backend-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-6-backend-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260",\ "target":"iqn.1992-01.com.example:storage","lun":1,"transport":"tcp",\ "user":"myname","password-secret":"libvirt-6-backend-secret0",\ "node-name":"libvirt-6-backend","read-only":false}' \ -device scsi-generic,bus=3Dscsi0.0,scsi-id=3D3,drive=3Dlibvirt-6-backend,i= d=3Dhostdev4 \ --object secret,id=3Dlibvirt-7-backend-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-7-backend-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260",\ "target":"iqn.1992-01.com.example:storage","lun":2,"transport":"tcp",\ "user":"myname","password-secret":"libvirt-7-backend-secret0",\ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.= args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args index b119837c36..69e72324f2 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest2,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest2/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ @@ -57,18 +57,18 @@ drive=3Dlibvirt-5-backend,id=3Dhostdev2 \ "node-name":"libvirt-6-backend","read-only":true}' \ -device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D5,\ drive=3Dlibvirt-6-backend,id=3Dhostdev3 \ --object secret,id=3Dlibvirt-7-backend-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-7-backend-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260",\ "target":"iqn.1992-01.com.example:storage","lun":1,"transport":"tcp",\ "user":"myname","password-secret":"libvirt-7-backend-secret0",\ "node-name":"libvirt-7-backend","read-only":false}' \ -device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D3,lun=3D4,\ drive=3Dlibvirt-7-backend,id=3Dhostdev4 \ --object secret,id=3Dlibvirt-8-backend-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-8-backend-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260",\ "target":"iqn.1992-01.com.example:storage","lun":2,"transport":"tcp",\ "user":"myname","password-secret":"libvirt-8-backend-secret0",\ diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args= b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args index d06d6e2351..b7e32306e8 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args @@ -9,17 +9,18 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dfedora,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-fedora/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \ -machine pc-i440fx-2.9,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,\ memory-backend=3Dpc.ram \ -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 4096 \ --object memory-backend-file,id=3Dpc.ram,\ -mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-fedora,share=3Don,\ -x-use-canonical-path-for-ramblock-id=3Doff,prealloc=3Don,size=3D4294967296= \ +-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}' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/t= ests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args index b56a731676..1f15fb49db 100644 --- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args @@ -9,19 +9,19 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don \ -cpu qemu64 \ -m size=3D1048576k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ --object memory-backend-file,id=3Dram-node0,\ -mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=3Don,prealloc= =3Don,\ -size=3D1073741824 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node0",\ +"mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,\ +"prealloc":true,"size":1073741824}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ --object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,share= =3Don,\ -prealloc=3Don,size=3D536870912 \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0",\ +"mem-path":"/tmp/nvdimm","share":true,"prealloc":true,"size":536870912}' \ -device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args b/tests/q= emuxml2argvdata/hyperv-off.x86_64-latest.args index dddd7f694d..de007d065e 100644 --- a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args b/tests= /qemuxml2argvdata/hyperv-panic.x86_64-latest.args index 336810e8dc..b545f79923 100644 --- a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64,hv-crash \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args= b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args index 338479521e..4b25e45b5b 100644 --- a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64,hv-vpindex,hv-synic,hv-stimer,hv-stimer-direct \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args b/tests/qemux= ml2argvdata/hyperv.x86_64-latest.args index d6259b4bc7..73cc192d1b 100644 --- a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv.x86_64-latest.args @@ -9,14 +9,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu 'qemu64,hv-relaxed,hv-vapic,hv-spinlocks=3D0x2fff,hv-vpindex,hv-runti= me,\ hv-synic,hv-stimer,hv-reset,hv-vendor-id=3DKVM Hv,hv-frequencies,\ hv-reenlightenment,hv-tlbflush,hv-ipi,hv-evmcs' \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ 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 a413e3e755..7d98a913ae 100644 --- a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args @@ -9,13 +9,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/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 \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ 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 d5754e3fbd..413257fe03 100644 --- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args @@ -9,13 +9,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/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 \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ 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 41d52f43af..564ed15999 100644 --- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args @@ -9,13 +9,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/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 \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args b/te= sts/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args index 42533d1fb9..b901f0f453 100644 --- a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args @@ -9,13 +9,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/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 \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 288,sockets=3D288,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args b/tests/= qemuxml2argvdata/intel-iommu.x86_64-latest.args index d24f48893d..3cd1f44556 100644 --- a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine q35,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= pc.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest= .args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args index 59e8504980..8eeb5edb48 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args @@ -9,16 +9,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ --object iothread,id=3Diothread1 \ --object iothread,id=3Diothread2 \ +-object '{"qom-type":"iothread","id":"iothread1"}' \ +-object '{"qom-type":"iothread","id":"iothread2"}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.arg= s b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args index d7bd8203a4..6553d4a306 100644 --- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64,kvmclock=3Doff,kvm-pv-eoi=3Doff \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args index 7503283495..6b0ec49395 100644 --- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-encryptdisk/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dencryptdisk,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-encryptdisk/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-encryptdisk/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 1024 \ --object memory-backend-ram,id=3Dpc.ram,size=3D1073741824 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \ @@ -28,9 +28,9 @@ file=3D/tmp/lib/domain--1-encryptdisk/master-key.aes \ -no-acpi \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --object secret,id=3Dlibvirt-7-format-encryption-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-7-format-encryption-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk",\ "node-name":"libvirt-7-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"qco= w2",\ @@ -38,9 +38,9 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,form= at=3Dbase64 \ "file":"libvirt-7-storage"}' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-7-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ --object secret,id=3Dlibvirt-6-format-encryption-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-6-format-encryption-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk2"= ,\ "node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"qco= w2",\ @@ -48,12 +48,12 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,fo= rmat=3Dbase64 \ "file":"libvirt-6-storage"}' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-6-format,\ id=3Dvirtio-disk1 \ --object secret,id=3Dlibvirt-5-storage-auth-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ --object secret,id=3Dlibvirt-5-format-encryption-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-5-storage-auth-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ +-object '{"qom-type":"secret","id":"libvirt-5-format-encryption-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"iscsi","portal":"example.org:6000",\ "target":"iqn.1992-01.com.example:storage","lun":1,"transport":"tcp",\ "user":"myname","password-secret":"libvirt-5-storage-auth-secret0",\ @@ -63,9 +63,9 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,form= at=3Dbase64 \ "file":"libvirt-5-storage"}' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-5-format,\ id=3Dvirtio-disk2 \ --object secret,id=3Dlibvirt-4-format-encryption-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-4-format-encryption-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"iscsi","portal":"iscsi.example.com:3260",\ "target":"demo-target","lun":3,"transport":"tcp",\ "node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ @@ -74,9 +74,9 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,form= at=3Dbase64 \ "file":"libvirt-4-storage"}' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-4-format,\ id=3Dvirtio-disk3 \ --object secret,id=3Dlibvirt-3-format-encryption-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-3-format-encryption-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image",\ "server":[{"host":"mon1.example.org","port":"6321"},{"host":"mon2.example.= org",\ "port":"6322"},{"host":"mon3.example.org","port":"6322"}],\ @@ -86,17 +86,17 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,fo= rmat=3Dbase64 \ "file":"libvirt-3-storage"}' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-3-format,\ id=3Dvirtio-disk4 \ --object secret,id=3Dlibvirt-2-format-encryption-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-2-format-encryption-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/base.qcow2",\ "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"qcow= 2",\ "encrypt":{"format":"luks","key-secret":"libvirt-2-format-encryption-secre= t0"},\ "file":"libvirt-2-storage","backing":null}' \ --object secret,id=3Dlibvirt-1-format-encryption-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-object '{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0",\ +"data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1",\ +"keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"= }' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk5"= ,\ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ 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 a33432368c..7be2ec6eb4 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 @@ -9,15 +9,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-instance-00000092/.c= onfig \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dinstance-00000092,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-instance-00000092/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-instance-00000092/master-key.aes"}' \ -machine pc-i440fx-2.3,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ -cpu qemu64 \ -m 14336 \ -overcommit mem-lock=3Doff \ -smp 8,sockets=3D1,dies=3D1,cores=3D8,threads=3D1 \ --object memory-backend-memfd,id=3Dram-node0,hugetlb=3Don,hugetlbsize=3D209= 7152,\ -share=3Don,prealloc=3Don,size=3D15032385536,host-nodes=3D3,policy=3Dprefer= red \ +-object '{"qom-type":"memory-backend-memfd","id":"ram-node0","hugetlb":tru= e,\ +"hugetlbsize":2097152,"share":true,"prealloc":true,"size":15032385536,\ +"host-nodes":[3],"policy":"preferred"}' \ -numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ -display none \ diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/= tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args index a33432368c..7be2ec6eb4 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args @@ -9,15 +9,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-instance-00000092/.c= onfig \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dinstance-00000092,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-instance-00000092/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-instance-00000092/master-key.aes"}' \ -machine pc-i440fx-2.3,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ -cpu qemu64 \ -m 14336 \ -overcommit mem-lock=3Doff \ -smp 8,sockets=3D1,dies=3D1,cores=3D8,threads=3D1 \ --object memory-backend-memfd,id=3Dram-node0,hugetlb=3Don,hugetlbsize=3D209= 7152,\ -share=3Don,prealloc=3Don,size=3D15032385536,host-nodes=3D3,policy=3Dprefer= red \ +-object '{"qom-type":"memory-backend-memfd","id":"ram-node0","hugetlb":tru= e,\ +"hugetlbsize":2097152,"share":true,"prealloc":true,"size":15032385536,\ +"host-nodes":[3],"policy":"preferred"}' \ -numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ -display none \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-lat= est.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-lates= t.args index 42df363455..8887af0c16 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args @@ -9,17 +9,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don \ -cpu qemu64 \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ --object memory-backend-ram,id=3Dram-node0,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ --object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,share= =3Doff,\ -prealloc=3Don,size=3D536870912 \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0",\ +"mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ -device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-late= st.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.= args index 1e9197a5e6..94be18ce8c 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args @@ -9,17 +9,18 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don \ -cpu qemu64 \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ --object memory-backend-ram,id=3Dram-node0,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ --object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,share= =3Doff,\ -prealloc=3Don,size=3D536870912,align=3D2097152 \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0",\ +"mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912,\ +"align":2097152}' \ -device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-late= st.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.= args index 8fb4790ffd..cacfad42e6 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args @@ -9,17 +9,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don \ -cpu qemu64 \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ --object memory-backend-ram,id=3Dram-node0,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ --object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,share= =3Doff,\ -prealloc=3Don,size=3D536870912 \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0",\ +"mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ -device nvdimm,node=3D0,label-size=3D131072,memdev=3Dmemnvdimm0,id=3Dnvdim= m0,slot=3D0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-lates= t.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.ar= gs index fd5843f28b..2f9f936e9c 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args @@ -9,17 +9,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don \ -cpu qemu64 \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ --object memory-backend-ram,id=3Dram-node0,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ --object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,share= =3Doff,\ -size=3D536870912,pmem=3Don \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0",\ +"mem-path":"/tmp/nvdimm","share":false,"size":536870912,"pmem":true}' \ -device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-l= atest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-l= atest.args index 2c4fc38d59..4c78286df4 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.a= rgs @@ -9,17 +9,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don \ -cpu qemu64 \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ --object memory-backend-ram,id=3Dram-node0,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ --object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,share= =3Doff,\ -prealloc=3Don,size=3D536870912 \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0",\ +"mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ -device nvdimm,node=3D0,unarmed=3Don,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot= =3D0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.arg= s b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args index 2c9f9e3464..e8f858e39f 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args @@ -9,17 +9,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don \ -cpu qemu64 \ -m size=3D1048576k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ --object memory-backend-ram,id=3Dram-node0,size=3D1073741824 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":10737418= 24}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ --object memory-backend-file,id=3Dmemnvdimm0,mem-path=3D/tmp/nvdimm,preallo= c=3Don,\ -size=3D536870912 \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0",\ +"mem-path":"/tmp/nvdimm","prealloc":true,"size":536870912}' \ -device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-lates= t.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.ar= gs index 7ebcb00764..ffe8a4504f 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args @@ -9,17 +9,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ -cpu qemu64 \ -m size=3D2095104k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ --object memory-backend-ram,id=3Dram-node0,size=3D2145386496 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":21453864= 96}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ --object memory-backend-file,id=3Dmemvirtiopmem0,mem-path=3D/tmp/virtio_pme= m,\ -share=3Don,size=3D536870912 \ +-object '{"qom-type":"memory-backend-file","id":"memvirtiopmem0",\ +"mem-path":"/tmp/virtio_pmem","share":true,"size":536870912}' \ -device virtio-pmem-pci,memdev=3Dmemvirtiopmem0,id=3Dvirtiopmem0,bus=3Dpci= .0,\ addr=3D0x5 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args b/tests/qe= muxml2argvdata/mlock-off.x86_64-latest.args index fec4f780fa..938423e6d9 100644 --- a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args b/tests/qem= uxml2argvdata/mlock-on.x86_64-latest.args index 209bfda226..c38e21c91a 100644 --- a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args +++ b/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Don \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args b/tests/qem= uxml2argvdata/net-vdpa.x86_64-latest.args index 47e2ce008b..e93351bbbd 100644 --- a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args b/test= s/qemuxml2argvdata/net-vhostuser.x86_64-latest.args index 8796a47b40..e94e1e73ab 100644 --- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args b/test= s/qemuxml2argvdata/numatune-hmat.x86_64-latest.args index 702b122f34..920866ea10 100644 --- a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args @@ -9,24 +9,24 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,hmat=3Don \ -cpu qemu64 \ -m 12288 \ -overcommit mem-lock=3Doff \ -smp 12,sockets=3D12,cores=3D1,threads=3D1 \ --object memory-backend-ram,id=3Dram-node0,size=3D2147483648 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":21474836= 48}' \ -numa node,nodeid=3D0,cpus=3D0-3,initiator=3D0,memdev=3Dram-node0 \ --object memory-backend-ram,id=3Dram-node1,size=3D2147483648 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":21474836= 48}' \ -numa node,nodeid=3D1,cpus=3D4-7,initiator=3D1,memdev=3Dram-node1 \ --object memory-backend-ram,id=3Dram-node2,size=3D2147483648 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":21474836= 48}' \ -numa node,nodeid=3D2,cpus=3D8-11,initiator=3D2,memdev=3Dram-node2 \ --object memory-backend-ram,id=3Dram-node3,size=3D2147483648 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node3","size":21474836= 48}' \ -numa node,nodeid=3D3,initiator=3D0,memdev=3Dram-node3 \ --object memory-backend-ram,id=3Dram-node4,size=3D2147483648 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node4","size":21474836= 48}' \ -numa node,nodeid=3D4,initiator=3D0,memdev=3Dram-node4 \ --object memory-backend-ram,id=3Dram-node5,size=3D2147483648 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node5","size":21474836= 48}' \ -numa node,nodeid=3D5,initiator=3D0,memdev=3Dram-node5 \ -numa hmat-lb,initiator=3D0,target=3D0,hierarchy=3Dmemory,data-type=3Dacce= ss-latency,\ latency=3D5 \ diff --git a/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args b/t= ests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args index 94b173f117..e64d760153 100644 --- a/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args @@ -9,21 +9,21 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -cpu qemu64 \ -m 24105 \ -overcommit mem-lock=3Doff \ -smp 32,sockets=3D32,cores=3D1,threads=3D1 \ --object memory-backend-ram,id=3Dram-node0,size=3D20971520,host-nodes=3D3,\ -policy=3Dpreferred \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":20971520= ,\ +"host-nodes":[3],"policy":"preferred"}' \ -numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ --object memory-backend-ram,id=3Dram-node1,size=3D676331520,host-nodes=3D0-= 7,\ -policy=3Dbind \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":67633152= 0,\ +"host-nodes":[0,1,2,3,4,5,6,7],"policy":"bind"}' \ -numa node,nodeid=3D1,cpus=3D1-27,cpus=3D29,memdev=3Dram-node1 \ --object memory-backend-ram,id=3Dram-node2,size=3D24578621440,host-nodes=3D= 1-2,\ -host-nodes=3D5,host-nodes=3D7,policy=3Dbind \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":24578621= 440,\ +"host-nodes":[1,2,5,7],"policy":"bind"}' \ -numa node,nodeid=3D2,cpus=3D28,cpus=3D30-31,memdev=3Dram-node2 \ -uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ -display none \ diff --git a/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args b/t= ests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args index 82bdb00818..db72939a0c 100644 --- a/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args @@ -9,14 +9,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dfedora,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-fedora/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \ -machine pc-q35-4.0,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,\ memory-backend=3Dpc.ram \ -cpu qemu64 \ -bios /usr/share/seabios/bios-256k.bin \ -m 8 \ --object memory-backend-ram,id=3Dpc.ram,size=3D8388608 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ 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 561a905e78..c33fb050df 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 @@ -9,8 +9,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dfedora,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-fedora/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd",\ "node-name":"libvirt-pflash0-storage","auto-read-only":true,\ "discard":"unmap"}' \ @@ -27,7 +27,7 @@ pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash= 1-format,\ memory-backend=3Dpc.ram \ -cpu qemu64 \ -m 8 \ --object memory-backend-ram,id=3Dpc.ram,size=3D8388608 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ 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 29661bedd1..7924334ca9 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args @@ -9,8 +9,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dfedora,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-fedora/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.= fd",\ "node-name":"libvirt-pflash0-storage","auto-read-only":true,\ "discard":"unmap"}' \ @@ -28,7 +28,7 @@ memory-backend=3Dpc.ram \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ -m 8 \ --object memory-backend-ram,id=3Dpc.ram,size=3D8388608 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ diff --git a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args b/te= sts/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args index 8605f73b58..45ce78101b 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args @@ -9,8 +9,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dfedora,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-fedora/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.= fd",\ "node-name":"libvirt-pflash0-storage","auto-read-only":true,\ "discard":"unmap"}' \ @@ -27,7 +27,7 @@ pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash= 1-format,\ memory-backend=3Dpc.ram \ -cpu qemu64 \ -m 8 \ --object memory-backend-ram,id=3Dpc.ram,size=3D8388608 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.arg= s b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args index 3a13f212b7..0ec9f811c0 100644 --- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.= args b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args index 2520181baa..1c88ab1c2d 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-guest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-guest/master-key.aes"}' \ -machine q35,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= pc.ram \ -cpu qemu64 \ -m 2048 \ --object memory-backend-ram,id=3Dpc.ram,size=3D2147483648 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args= b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args index 69872a2de3..e49b3205e3 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64,kvm-pv-unhalt=3Doff \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args = b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args index 3b27d13a57..344257fb73 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64,kvm-pv-unhalt=3Don \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args b/tests/qemu= xml2argvdata/qemu-ns.x86_64-latest.args index 52e3d50be7..5a8136a8b7 100644 --- a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args +++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args @@ -11,12 +11,12 @@ BAR=3D'' \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args = b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args index d765c6a87f..370de50cfe 100644 --- a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ 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 9dae0d7245..40976c7879 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.arg= s b/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args index a189c2cf9d..a3294c9136 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args @@ -9,13 +9,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DTPM-VM,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-TPM-VM/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-TPM-VM/master-key.aes"}' \ -machine pc-i440fx-2.12,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ memory-backend=3Dpc.ram \ -cpu qemu64 \ -m 2048 \ --object memory-backend-ram,id=3Dpc.ram,size=3D2147483648 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 11d7cd22-da89-3094-6212-079a48a309a1 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.= args b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args index a189c2cf9d..a3294c9136 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args @@ -9,13 +9,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DTPM-VM,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-TPM-VM/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-TPM-VM/master-key.aes"}' \ -machine pc-i440fx-2.12,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ memory-backend=3Dpc.ram \ -cpu qemu64 \ -m 2048 \ --object memory-backend-ram,id=3Dpc.ram,size=3D2147483648 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 11d7cd22-da89-3094-6212-079a48a309a1 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args b/= tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args index a189c2cf9d..a3294c9136 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args @@ -9,13 +9,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DTPM-VM,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-TPM-VM/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-TPM-VM/master-key.aes"}' \ -machine pc-i440fx-2.12,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ memory-backend=3Dpc.ram \ -cpu qemu64 \ -m 2048 \ --object memory-backend-ram,id=3Dpc.ram,size=3D2147483648 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 11d7cd22-da89-3094-6212-079a48a309a1 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args b/tests= /qemuxml2argvdata/tpm-emulator.x86_64-latest.args index a189c2cf9d..a3294c9136 100644 --- a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args @@ -9,13 +9,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DTPM-VM,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-TPM-VM/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-TPM-VM/master-key.aes"}' \ -machine pc-i440fx-2.12,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ memory-backend=3Dpc.ram \ -cpu qemu64 \ -m 2048 \ --object memory-backend-ram,id=3Dpc.ram,size=3D2147483648 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 11d7cd22-da89-3094-6212-079a48a309a1 \ diff --git a/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args = b/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args index 05951fa926..cc0e40e412 100644 --- a/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args @@ -9,13 +9,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DTPM-VM,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-TPM-VM/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-TPM-VM/master-key.aes"}' \ -machine pc-i440fx-2.12,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ memory-backend=3Dpc.ram \ -cpu qemu64 \ -m 2048 \ --object memory-backend-ram,id=3Dpc.ram,size=3D2147483648 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 11d7cd22-da89-3094-6212-079a48a309a1 \ diff --git a/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args b/te= sts/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args index 067a30533c..9d1546a2c1 100644 --- a/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args @@ -9,13 +9,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DTPM-VM,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-TPM-VM/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-TPM-VM/master-key.aes"}' \ -machine pc-i440fx-2.12,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ memory-backend=3Dpc.ram \ -cpu qemu64 \ -m 2048 \ --object memory-backend-ram,id=3Dpc.ram,size=3D2147483648 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 11d7cd22-da89-3094-6212-079a48a309a1 \ diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args b= /tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args index f89a6a3842..52abfa6872 100644 --- a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args @@ -9,14 +9,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc-q35-2.10,accel=3Dtcg,usb=3Doff,smm=3Don,dump-guest-core=3Doff,\ memory-backend=3Dpc.ram \ -global mch.extended-tseg-mbytes=3D48 \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args b/tes= ts/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args index 0bcba66dce..93ed0cc9fa 100644 --- a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ 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 f3f9430ccc..d936c1f888 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 @@ -9,16 +9,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-guest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-guest/master-key.aes"}' \ -machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ -cpu qemu64 \ -m 14336 \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ --object memory-backend-file,id=3Dram-node0,\ -mem-path=3D/var/lib/libvirt/qemu/ram/-1-guest/ram-node0,share=3Don,\ -size=3D15032385536 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node0",\ +"mem-path":"/var/lib/libvirt/qemu/ram/-1-guest/ram-node0","share":true,\ +"size":15032385536}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ -display none \ diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args index bbeede7179..c744bf8a5a 100644 --- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args @@ -9,16 +9,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-guest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-guest/master-key.aes"}' \ -machine q35,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -cpu qemu64 \ -m 2048 \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ --object memory-backend-file,id=3Dram-node0,\ -mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-guest,share=3Don,prealloc=3Don= ,\ -size=3D2147483648 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node0",\ +"mem-path":"/dev/hugepages2M/libvirt/qemu/-1-guest","share":true,\ +"prealloc":true,"size":2147483648}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ -display none \ diff --git a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.= args b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args index 4373fc5b8c..b1dd7220e5 100644 --- a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args @@ -9,14 +9,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --object memory-backend-memfd,id=3Dram-node0,share=3Don,size=3D224395264 \ +-object '{"qom-type":"memory-backend-memfd","id":"ram-node0","share":true,\ +"size":224395264}' \ -numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args b/tes= ts/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args index a41aa3c8a6..38a637ad7b 100644 --- a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args @@ -9,14 +9,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --object memory-backend-memfd,id=3Dram-node0,share=3Don,size=3D224395264 \ +-object '{"qom-type":"memory-backend-memfd","id":"ram-node0","share":true,\ +"size":224395264}' \ -numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args b/t= ests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args index 8b33ac6f1c..969791bab8 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args @@ -9,13 +9,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dtest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-test/master-key.aes"}' \ -machine pc-i440fx-2.9,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ memory-backend=3Dpc.ram \ -cpu qemu64 \ -m 1024 \ --object memory-backend-ram,id=3Dpc.ram,size=3D1073741824 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid bba65c0e-c049-934f-b6aa-4e2c0582acdf \ diff --git a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args b/tests/= qemuxml2argvdata/vhost-vsock.x86_64-latest.args index 7eec5434e3..e51cf5f0fc 100644 --- a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dtest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-test/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-test/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 1024 \ --object memory-backend-ram,id=3Dpc.ram,size=3D1073741824 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid bba65c0e-c049-934f-b6aa-4e2c0582acdf \ diff --git a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-lates= t.args b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.ar= gs index e105519d9a..9fa4ac33f6 100644 --- a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 1024 \ --object memory-backend-ram,id=3Dpc.ram,size=3D1073741824 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args index ae079ed165..49843564a4 100644 --- a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 1024 \ --object memory-backend-ram,id=3Dpc.ram,size=3D1073741824 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-late= st.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.= args index 9b5c8b5006..438a287aec 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 1024 \ --object memory-backend-ram,id=3Dpc.ram,size=3D1073741824 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-lates= t.args b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.ar= gs index 1c823f00c0..057144663f 100644 --- a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 1024 \ --object memory-backend-ram,id=3Dpc.ram,size=3D1073741824 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args= b/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args index f03cffabb1..4fe8641248 100644 --- a/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args index abf641c5e8..6914dbb8c3 100644 --- a/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args index 777510ecab..4d2d50807b 100644 --- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine q35,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= pc.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -61,7 +61,7 @@ evdev=3D/dev/input/event1234,bus=3Dpci.9,addr=3D0x0 \ -device vhost-scsi-pci-non-transitional,wwpn=3Dnaa.5123456789abcde0,vhostf= d=3D3,\ id=3Dhostdev0,bus=3Dpci.6,addr=3D0x0 \ -device virtio-balloon-pci-non-transitional,id=3Dballoon0,bus=3Dpci.7,addr= =3D0x0 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ -device virtio-rng-pci-non-transitional,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.= 8,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-la= test.args b/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-lat= est.args index 1dbf702002..dff6262aeb 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.ar= gs @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-= latest.args b/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64= -latest.args index 5fba8a78b0..0d28765296 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.= args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64= -latest.args b/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_= 64-latest.args index 15ec94eff3..161582aa31 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest= .args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args index 0c371f7b0c..7b6d907b38 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest= .args b/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args index 32bac8770f..13cb4e8a01 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-lates= t.args b/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.ar= gs index a3cfd97fee..a1d7acaf8a 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.arg= s b/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args index 9ccb5e884c..00af08e22d 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args index ccd9489472..80a41ed159 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.= args b/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args index 7c61a305f3..8b43d39813 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.= args b/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args index 783aa50214..ce4e2b64bc 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-lates= t.args b/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.ar= gs index ff54f2da46..87d78881b4 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-late= st.args b/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.= args index 2e5e5cbd3e..8b782bb048 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-la= test.args b/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-lat= est.args index 2ffc5107cf..762c97ff0f 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.ar= gs @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-repo= rting.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon= -freepage-reporting.x86_64-latest.args index 4450253e6a..9a5500a8c1 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x= 86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x= 86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-= latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64= -latest.args index d55434acaf..af7452b9da 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.= args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64= -latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_= 64-latest.args index 48b106c37f..76479c3a74 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest= .args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args index 43dce55da7..a5b6fd37a9 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.= args b/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args index bdb6c49ef4..c58b73ef89 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest= .args b/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args index 23f9163e32..9add38fb44 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args index 18efdb250e..556e1aa81b 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -30,9 +30,9 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev id=3Daudio1,driver=3Dnone \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/random \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,ats=3Don,bus=3Dpci.0,addr= =3D0x2 \ --object rng-random,id=3Dobjrng1,filename=3D/dev/random \ +-object '{"qom-type":"rng-random","id":"objrng1","filename":"/dev/random"}= ' \ -device virtio-rng-pci,rng=3Dobjrng1,id=3Drng1,ats=3Doff,bus=3Dpci.0,addr= =3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.= args b/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args index d8b966af5a..d9936ca2ff 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -30,10 +30,10 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev id=3Daudio1,driver=3Dnone \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/random \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,iommu_platform=3Don,bus=3Dp= ci.0,\ addr=3D0x2 \ --object rng-random,id=3Dobjrng1,filename=3D/dev/random \ +-object '{"qom-type":"rng-random","id":"objrng1","filename":"/dev/random"}= ' \ -device virtio-rng-pci,rng=3Dobjrng1,id=3Drng1,iommu_platform=3Doff,bus=3D= pci.0,\ addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ diff --git a/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest= .args b/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args index 7bcb719cb3..451e11725c 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -30,9 +30,9 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev id=3Daudio1,driver=3Dnone \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/random \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,packed=3Don,bus=3Dpci.0,add= r=3D0x2 \ --object rng-random,id=3Dobjrng1,filename=3D/dev/random \ +-object '{"qom-type":"rng-random","id":"objrng1","filename":"/dev/random"}= ' \ -device virtio-rng-pci,rng=3Dobjrng1,id=3Drng1,packed=3Doff,bus=3Dpci.0,ad= dr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.= args b/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args index b9cd581ac0..3a0138e13c 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-lates= t.args b/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.ar= gs index 699d1354a0..20a5875ea6 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-late= st.args b/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.= args index ec71765298..1ef146d642 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args b/tes= ts/qemuxml2argvdata/virtio-options.x86_64-latest.args index d9fa992461..ff09a1a872 100644 --- a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -62,7 +62,7 @@ addr=3D0x12,iommu_platform=3Don,ats=3Don,packed=3Don \ addr=3D0x2,iommu_platform=3Don,ats=3Don,packed=3Don \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0xc,iommu_plat= form=3Don,\ ats=3Don,packed=3Don \ --object rng-random,id=3Dobjrng0,filename=3D/dev/random \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,iommu_platform=3Don,ats=3Do= n,packed=3Don,\ bus=3Dpci.0,addr=3D0xd \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ diff --git a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args b= /tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args index 66298ca0b2..1b1d93d7b2 100644 --- a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -30,7 +30,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev id=3Daudio1,driver=3Dnone \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --object rng-builtin,id=3Dobjrng0 \ +-object '{"qom-type":"rng-builtin","id":"objrng0"}' \ -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ 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 88d1e123bc..66d7a002f7 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -31,7 +31,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -audiodev id=3Daudio1,driver=3Dnone \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -chardev socket,id=3Dcharrng0,fd=3D1729,server=3Don,wait=3Doff \ --object rng-egd,id=3Dobjrng0,chardev=3Dcharrng0 \ +-object '{"qom-type":"rng-egd","id":"objrng0","chardev":"charrng0"}' \ -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args index 6a7d9a8ef5..2d7c5f224e 100644 --- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine q35,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= pc.ram \ -cpu qemu64 \ -m 214 \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -51,7 +51,7 @@ evdev=3D/dev/input/event1234,bus=3Dpci.2,addr=3D0x9 \ -device vhost-scsi-pci-transitional,wwpn=3Dnaa.5123456789abcde0,vhostfd=3D= 3,\ id=3Dhostdev0,bus=3Dpci.2,addr=3D0x6 \ -device virtio-balloon-pci-transitional,id=3Dballoon0,bus=3Dpci.2,addr=3D0= x7 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ -device virtio-rng-pci-transitional,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.2,ad= dr=3D0x8 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ 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 ae0f89d6ed..82dae3ff69 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 @@ -9,13 +9,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-guest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-guest/master-key.aes"}' \ -machine pc-i440fx-4.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,\ memory-backend=3Dpc.ram \ -cpu qemu64 \ -m 4096 \ --object memory-backend-ram,id=3Dpc.ram,size=3D4294967296 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ 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 3b6a8a5df5..6b119905c5 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 @@ -9,13 +9,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-guest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-guest/master-key.aes"}' \ -machine pc-q35-4.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,\ memory-backend=3Dpc.ram \ -cpu qemu64 \ -m 4096 \ --object memory-backend-ram,id=3Dpc.ram,size=3D4294967296 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-la= test.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-lat= est.args index 0be576a712..444e16be6a 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.ar= gs @@ -9,13 +9,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-guest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-guest/master-key.aes"}' \ -machine pc-i440fx-4.2,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ memory-backend=3Dpc.ram \ -cpu qemu64 \ -m 4096 \ --object memory-backend-ram,id=3Dpc.ram,size=3D4294967296 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-l= atest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-l= atest.args index 0d050a480c..55a8c60b53 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.a= rgs @@ -9,13 +9,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-guest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-guest/master-key.aes"}' \ -machine pc-q35-4.2,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ memory-backend=3Dpc.ram \ -cpu qemu64 \ -m 4096 \ --object memory-backend-ram,id=3Dpc.ram,size=3D4294967296 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ diff --git a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args b= /tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args index 17b778118e..bce3674fa4 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-guest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-guest/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 4096 \ --object memory-backend-ram,id=3Dpc.ram,size=3D4294967296 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid 2c0abd3d-8f18-42c0-a132-9708213aaac9 \ @@ -51,7 +51,7 @@ id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ -device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,\ vram64_size_mb=3D0,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x7 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x8 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args b= /tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args index 74376d5a78..b102b51324 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-guest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-guest/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ -cpu qemu64 \ -m 4096 \ --object memory-backend-ram,id=3Dpc.ram,size=3D4294967296 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ @@ -48,7 +48,7 @@ addr=3D0x2 \ id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ -audiodev id=3Daudio1,driver=3Dnone \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x7 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args = b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args index c4b24899a1..e059699d06 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-guest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-guest/master-key.aes"}' \ -machine q35,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= pc.ram \ -cpu qemu64 \ -m 4096 \ --object memory-backend-ram,id=3Dpc.ram,size=3D4294967296 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid 61288c03-0b0d-4f1e-9496-0f0256f2e013 \ @@ -59,7 +59,7 @@ id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ -device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,\ vram64_size_mb=3D0,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.5,addr=3D0x0 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.6,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args = b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args index c3d379c984..70ef840e11 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args @@ -9,12 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-guest/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ +"file":"/tmp/lib/domain--1-guest/master-key.aes"}' \ -machine q35,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= pc.ram \ -cpu qemu64 \ -m 4096 \ --object memory-backend-ram,id=3Dpc.ram,size=3D4294967296 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ @@ -56,7 +56,7 @@ addr=3D0x0 \ id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ -audiodev id=3Daudio1,driver=3Dnone \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.5,addr=3D0x0 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.6,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ --=20 2.29.2