From nobody Thu Nov 21 12:42:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=reject dis=none) header.from=linux.ibm.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1730903691341619.8348947905814; Wed, 6 Nov 2024 06:34:51 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 07B21155E; Wed, 6 Nov 2024 09:34:49 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4B4E214A9; Wed, 6 Nov 2024 09:32:11 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 09AA7E79; Wed, 6 Nov 2024 09:32:06 -0500 (EST) Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 1A08E13A9 for ; Wed, 6 Nov 2024 09:32:04 -0500 (EST) Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4A6CB7e6015612; Wed, 6 Nov 2024 14:32:03 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 42r87yrppe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 Nov 2024 14:32:03 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 4A6DD1Jd008433; Wed, 6 Nov 2024 14:32:02 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 42nywkuvx9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 Nov 2024 14:32:02 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 4A6EVwMi65732936 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 6 Nov 2024 14:31:58 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0DB0A2004B; Wed, 6 Nov 2024 14:31:58 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CE60620040; Wed, 6 Nov 2024 14:31:57 +0000 (GMT) Received: from fiuczyvm.. (unknown [9.152.222.247]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 6 Nov 2024 14:31:57 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=KhtZTOkWg9pW0D2tF apt9cxT0bDFKn8HzufvDq427nQ=; b=kgF1jfoRSKnZX1N/gbeZYpdhxAa3BPTpw oZjEpgDV+zfM8OBO4+qKBDtgzqY0qb7sLVUT7UzD+uoWrpMwAtsYJMitJLvuqLdw 0NkHRKyWpwbXNNQlQufGkgMj8ECbPvZZewjkv6nVDO5mMgq68zAdXJTyq1GAO+8j ctKo0n4MhQEnAXI+DqOnDhvq4zKgQ4L170amSb4Uko5gLGFzkqd1nfb1ngZXUptD eqHkY2fcJMkmeXGcogj0RhUDRa6SQGHTKEVBn2YoAsaiBKIgdpG9EGA4OnwCmAiG b/BHJ9m0W+uv3j8/rnVSVotx0t12AJbwbn6HIQ+BCkBP8vQ+ahnHw== From: Boris Fiuczynski To: devel@lists.libvirt.org Subject: [PATCH 1/3] qemu: capabilities: Add QEMU_CAPS_VIRTIO_CCW_DEVICE_LOADPARM Date: Wed, 6 Nov 2024 15:31:55 +0100 Message-ID: <20241106143157.58978-2-fiuczy@linux.ibm.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241106143157.58978-1-fiuczy@linux.ibm.com> References: <20241106143157.58978-1-fiuczy@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: Tx6GXVKhVy-kPl02BC9XweYAzkSvVjL0 X-Proofpoint-GUID: Tx6GXVKhVy-kPl02BC9XweYAzkSvVjL0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-15_01,2024-10-11_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 impostorscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 bulkscore=0 mlxlogscore=999 lowpriorityscore=0 suspectscore=0 mlxscore=0 adultscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2411060110 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: LI4A3NLGXWD5OWYWDGL4SBLEZHNCIFFX X-Message-ID-Hash: LI4A3NLGXWD5OWYWDGL4SBLEZHNCIFFX X-MailFrom: fiuczy@linux.ibm.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: thuth@redhat.com, jrossi@linux.ibm.com, shalini@linux.ibm.com, mhartmay@linux.ibm.com X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1730903692211116600 Content-Type: text/plain; charset="utf-8" Add capability QEMU_CAPS_VIRTIO_CCW_DEVICE_LOADPARM to detect multi boot device support in QEMU by checking the virtio-blk-ccw device property existence of loadparm. Signed-off-by: Boris Fiuczynski Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 8 + src/qemu/qemu_capabilities.h | 1 + .../caps_5.2.0_s390x.replies | 321 ++++++++++++++++-- .../caps_6.0.0_s390x.replies | 321 ++++++++++++++++-- .../caps_8.1.0_s390x.replies | 321 ++++++++++++++++-- .../caps_8.2.0_s390x.replies | 321 ++++++++++++++++-- .../caps_9.1.0_s390x.replies | 321 ++++++++++++++++-- 7 files changed, 1514 insertions(+), 100 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 38fdade255..6b67da30ec 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -719,6 +719,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 465 */ "snapshot-internal-qmp", /* QEMU_CAPS_SNAPSHOT_INTERNAL_QMP = */ "chardev-reconnect-miliseconds", /* QEMU_CAPS_CHARDEV_RECONN= ECT_MILISECONDS */ + "virtio-ccw.loadparm", /* QEMU_CAPS_VIRTIO_CCW_DEVICE_LOADPA= RM */ ); =20 =20 @@ -1547,6 +1548,10 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCap= sDevicePropsVirtioIOMMU[] =3D { "boot-bypass", QEMU_CAPS_VIRTIO_IOMMU_BOOT_BYPASS, NULL }, }; =20 +static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlkC= CW[] =3D { + { "loadparm", QEMU_CAPS_VIRTIO_CCW_DEVICE_LOADPARM, NULL }, +}; + /* see documentation for virQEMUQAPISchemaPathGet for the query format */ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] =3D { { "blockdev-add/arg-type/+file/drop-cache", QEMU_CAPS_MIGRATION_FILE_D= ROP_CACHE }, @@ -1704,6 +1709,9 @@ static virQEMUCapsDeviceTypeProps virQEMUCapsDevicePr= ops[] =3D { { "virtio-iommu-pci", virQEMUCapsDevicePropsVirtioIOMMU, G_N_ELEMENTS(virQEMUCapsDevicePropsVirtioIOMMU), QEMU_CAPS_DEVICE_VIRTIO_IOMMU_PCI }, + { "virtio-blk-ccw", virQEMUCapsDevicePropsVirtioBlkCCW, + G_N_ELEMENTS(virQEMUCapsDevicePropsVirtioBlkCCW), + QEMU_CAPS_VIRTIO_CCW }, }; =20 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMemoryBackendFi= le[] =3D { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 261abcc1b4..e49fda6721 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -698,6 +698,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ /* 465 */ QEMU_CAPS_SNAPSHOT_INTERNAL_QMP, /* internal snapshot support via QMP = commands 'snapshot-save'/'snapshot-delete' */ QEMU_CAPS_CHARDEV_RECONNECT_MILISECONDS, /* 'reconnect-ms' option for = chardevs supported */ + QEMU_CAPS_VIRTIO_CCW_DEVICE_LOADPARM, /* loadparm available on CCW dev= ice for multi device boot */ =20 QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.replies b/tests/qe= mucapabilitiesdata/caps_5.2.0_s390x.replies index 3dfd0b502d..4ee6725d90 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.replies @@ -18830,12 +18830,293 @@ "id": "libvirt-28" } =20 +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-ccw" + }, + "id": "libvirt-29" +} + +{ + "return": [ + { + "name": "dev_id", + "description": "Read-only identifier of an I/O device in the channel= subsystem, example: fe.1.23ab", + "type": "str" + }, + { + "name": "devno", + "description": "Identifier of an I/O device in the channel subsystem= , example: fe.1.23ab", + "type": "str" + }, + { + "name": "subch_id", + "description": "Read-only identifier of an I/O device in the channel= subsystem, example: fe.1.23ab", + "type": "str" + }, + { + "default-value": 2, + "name": "max_revision", + "type": "uint32" + }, + { + "default-value": true, + "name": "ioeventfd", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "notify_on_empty", + "description": "on/off", + "type": "bool" + }, + { + "default-value": false, + "name": "share-rw", + "type": "bool" + }, + { + "default-value": 0, + "name": "lcyls", + "type": "uint32" + }, + { + "default-value": 256, + "name": "queue-size", + "type": "uint16" + }, + { + "default-value": 0, + "name": "lsecs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "heads", + "type": "uint32" + }, + { + "default-value": "auto", + "name": "account-invalid", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "name": "iothread", + "type": "link" + }, + { + "default-value": 0, + "name": "lheads", + "type": "uint32" + }, + { + "default-value": 65535, + "name": "num-queues", + "type": "uint16" + }, + { + "default-value": 0, + "name": "cyls", + "type": "uint32" + }, + { + "default-value": 0, + "name": "secs", + "type": "uint32" + }, + { + "name": "virtio-backend", + "type": "child" + }, + { + "default-value": 0, + "name": "min_io_size", + "type": "size" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "default-value": true, + "name": "config-wce", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "seg-max-adjust", + "type": "bool" + }, + { + "name": "drive", + "description": "Node name or ID of a block device to use as a backen= d", + "type": "str" + }, + { + "default-value": "auto", + "name": "werror", + "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", + "description": "Error handling policy, report/ignore/enospc/stop/aut= o", + "type": "BlockdevOnError" + }, + { + "default-value": "auto", + "name": "write-cache", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "default-value": true, + "name": "use-disabled-flag", + "type": "bool" + }, + { + "default-value": false, + "name": "x-disable-legacy-check", + "type": "bool" + }, + { + "default-value": true, + "name": "use-started", + "type": "bool" + }, + { + "default-value": false, + "name": "iommu_platform", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "physical_block_size", + "description": "A power of two between 512 B and 2 MiB", + "type": "size" + }, + { + "default-value": false, + "name": "scsi", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "any_layout", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "opt_io_size", + "type": "size" + }, + { + "default-value": 0, + "name": "logical_block_size", + "description": "A power of two between 512 B and 2 MiB", + "type": "size" + }, + { + "default-value": 4194303, + "name": "max-discard-sectors", + "type": "uint32" + }, + { + "default-value": true, + "name": "discard", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 4294967295, + "name": "discard_granularity", + "type": "size" + }, + { + "default-value": true, + "name": "request-merging", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "queue_reset", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "write-zeroes", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 4194303, + "name": "max-write-zeroes-sectors", + "type": "uint32" + }, + { + "default-value": false, + "name": "packed", + "description": "on/off", + "type": "bool" + }, + { + "default-value": "auto", + "name": "account-failed", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "default-value": true, + "name": "indirect_desc", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "event_idx", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "x-enable-wce-if-config-wce", + "type": "bool" + }, + { + "default-value": "auto", + "name": "backend_defaults", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "name": "serial", + "type": "str" + } + ], + "id": "libvirt-29" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-29" + "id": "libvirt-30" } =20 { @@ -18905,7 +19186,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-30" } =20 { @@ -18913,7 +19194,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -18982,12 +19263,12 @@ "type": "int" } ], - "id": "libvirt-30" + "id": "libvirt-31" } =20 { "execute": "query-machines", - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -19156,7 +19437,7 @@ "default-ram-id": "s390.ram" } ], - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -19164,7 +19445,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -19249,12 +19530,12 @@ "type": "string" } ], - "id": "libvirt-32" + "id": "libvirt-33" } =20 { "execute": "query-cpu-definitions", - "id": "libvirt-33" + "id": "libvirt-34" } =20 { @@ -19860,32 +20141,32 @@ "deprecated": false } ], - "id": "libvirt-33" + "id": "libvirt-34" } =20 { "execute": "query-tpm-models", - "id": "libvirt-34" + "id": "libvirt-35" } =20 { "return": [], - "id": "libvirt-34" + "id": "libvirt-35" } =20 { "execute": "query-tpm-types", - "id": "libvirt-35" + "id": "libvirt-36" } =20 { "return": [], - "id": "libvirt-35" + "id": "libvirt-36" } =20 { "execute": "query-command-line-options", - "id": "libvirt-36" + "id": "libvirt-37" } =20 { @@ -21032,12 +21313,12 @@ "option": "drive" } ], - "id": "libvirt-36" + "id": "libvirt-37" } =20 { "execute": "query-migrate-capabilities", - "id": "libvirt-37" + "id": "libvirt-38" } =20 { @@ -21115,7 +21396,7 @@ "capability": "validate-uuid" } ], - "id": "libvirt-37" + "id": "libvirt-38" } =20 { @@ -21126,7 +21407,7 @@ "name": "host" } }, - "id": "libvirt-38" + "id": "libvirt-39" } =20 { @@ -21182,7 +21463,7 @@ } } }, - "id": "libvirt-38" + "id": "libvirt-39" } =20 { diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.replies b/tests/qe= mucapabilitiesdata/caps_6.0.0_s390x.replies index 6fcc0a484b..cc42499fa1 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.replies @@ -20471,12 +20471,293 @@ "id": "libvirt-28" } =20 +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-ccw" + }, + "id": "libvirt-29" +} + +{ + "return": [ + { + "name": "dev_id", + "description": "Read-only identifier of an I/O device in the channel= subsystem, example: fe.1.23ab", + "type": "str" + }, + { + "name": "devno", + "description": "Identifier of an I/O device in the channel subsystem= , example: fe.1.23ab", + "type": "str" + }, + { + "name": "subch_id", + "description": "Read-only identifier of an I/O device in the channel= subsystem, example: fe.1.23ab", + "type": "str" + }, + { + "default-value": 2, + "name": "max_revision", + "type": "uint32" + }, + { + "default-value": true, + "name": "ioeventfd", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "notify_on_empty", + "description": "on/off", + "type": "bool" + }, + { + "default-value": false, + "name": "share-rw", + "type": "bool" + }, + { + "default-value": 0, + "name": "lcyls", + "type": "uint32" + }, + { + "default-value": 256, + "name": "queue-size", + "type": "uint16" + }, + { + "default-value": 0, + "name": "lsecs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "heads", + "type": "uint32" + }, + { + "default-value": "auto", + "name": "account-invalid", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "name": "iothread", + "type": "link" + }, + { + "default-value": 0, + "name": "lheads", + "type": "uint32" + }, + { + "default-value": 65535, + "name": "num-queues", + "type": "uint16" + }, + { + "default-value": 0, + "name": "cyls", + "type": "uint32" + }, + { + "default-value": 0, + "name": "secs", + "type": "uint32" + }, + { + "name": "virtio-backend", + "type": "child" + }, + { + "default-value": 0, + "name": "min_io_size", + "type": "size" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "default-value": true, + "name": "config-wce", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "seg-max-adjust", + "type": "bool" + }, + { + "name": "drive", + "description": "Node name or ID of a block device to use as a backen= d", + "type": "str" + }, + { + "default-value": "auto", + "name": "werror", + "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", + "description": "Error handling policy, report/ignore/enospc/stop/aut= o", + "type": "BlockdevOnError" + }, + { + "default-value": "auto", + "name": "write-cache", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "default-value": true, + "name": "use-disabled-flag", + "type": "bool" + }, + { + "default-value": false, + "name": "x-disable-legacy-check", + "type": "bool" + }, + { + "default-value": true, + "name": "use-started", + "type": "bool" + }, + { + "default-value": false, + "name": "iommu_platform", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "physical_block_size", + "description": "A power of two between 512 B and 2 MiB", + "type": "size" + }, + { + "default-value": false, + "name": "scsi", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "any_layout", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "opt_io_size", + "type": "size" + }, + { + "default-value": 0, + "name": "logical_block_size", + "description": "A power of two between 512 B and 2 MiB", + "type": "size" + }, + { + "default-value": 4194303, + "name": "max-discard-sectors", + "type": "uint32" + }, + { + "default-value": true, + "name": "discard", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 4294967295, + "name": "discard_granularity", + "type": "size" + }, + { + "default-value": true, + "name": "request-merging", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "queue_reset", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "write-zeroes", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 4194303, + "name": "max-write-zeroes-sectors", + "type": "uint32" + }, + { + "default-value": false, + "name": "packed", + "description": "on/off", + "type": "bool" + }, + { + "default-value": "auto", + "name": "account-failed", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "default-value": true, + "name": "indirect_desc", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "event_idx", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "x-enable-wce-if-config-wce", + "type": "bool" + }, + { + "default-value": "auto", + "name": "backend_defaults", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "name": "serial", + "type": "str" + } + ], + "id": "libvirt-29" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-29" + "id": "libvirt-30" } =20 { @@ -20546,7 +20827,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-30" } =20 { @@ -20554,7 +20835,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -20623,12 +20904,12 @@ "type": "int" } ], - "id": "libvirt-30" + "id": "libvirt-31" } =20 { "execute": "query-machines", - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -20806,7 +21087,7 @@ "default-ram-id": "s390.ram" } ], - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -20814,7 +21095,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -20912,12 +21193,12 @@ "type": "child" } ], - "id": "libvirt-32" + "id": "libvirt-33" } =20 { "execute": "query-cpu-definitions", - "id": "libvirt-33" + "id": "libvirt-34" } =20 { @@ -21523,32 +21804,32 @@ "deprecated": false } ], - "id": "libvirt-33" + "id": "libvirt-34" } =20 { "execute": "query-tpm-models", - "id": "libvirt-34" + "id": "libvirt-35" } =20 { "return": [], - "id": "libvirt-34" + "id": "libvirt-35" } =20 { "execute": "query-tpm-types", - "id": "libvirt-35" + "id": "libvirt-36" } =20 { "return": [], - "id": "libvirt-35" + "id": "libvirt-36" } =20 { "execute": "query-command-line-options", - "id": "libvirt-36" + "id": "libvirt-37" } =20 { @@ -22715,12 +22996,12 @@ "option": "drive" } ], - "id": "libvirt-36" + "id": "libvirt-37" } =20 { "execute": "query-migrate-capabilities", - "id": "libvirt-37" + "id": "libvirt-38" } =20 { @@ -22802,7 +23083,7 @@ "capability": "background-snapshot" } ], - "id": "libvirt-37" + "id": "libvirt-38" } =20 { @@ -22813,7 +23094,7 @@ "name": "host" } }, - "id": "libvirt-38" + "id": "libvirt-39" } =20 { @@ -22870,7 +23151,7 @@ } } }, - "id": "libvirt-38" + "id": "libvirt-39" } =20 { diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies b/tests/qe= mucapabilitiesdata/caps_8.1.0_s390x.replies index 77014169cb..032c102d4b 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies @@ -27524,12 +27524,293 @@ "id": "libvirt-28" } =20 +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-ccw" + }, + "id": "libvirt-29" +} + +{ + "return": [ + { + "name": "dev_id", + "description": "Read-only identifier of an I/O device in the channel= subsystem, example: fe.1.23ab", + "type": "str" + }, + { + "name": "devno", + "description": "Identifier of an I/O device in the channel subsystem= , example: fe.1.23ab", + "type": "str" + }, + { + "name": "subch_id", + "description": "Read-only identifier of an I/O device in the channel= subsystem, example: fe.1.23ab", + "type": "str" + }, + { + "default-value": 2, + "name": "max_revision", + "type": "uint32" + }, + { + "default-value": true, + "name": "ioeventfd", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "notify_on_empty", + "description": "on/off", + "type": "bool" + }, + { + "default-value": false, + "name": "share-rw", + "type": "bool" + }, + { + "default-value": 0, + "name": "lcyls", + "type": "uint32" + }, + { + "default-value": 256, + "name": "queue-size", + "type": "uint16" + }, + { + "default-value": 0, + "name": "lsecs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "heads", + "type": "uint32" + }, + { + "default-value": "auto", + "name": "account-invalid", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "name": "iothread", + "type": "link" + }, + { + "default-value": 0, + "name": "lheads", + "type": "uint32" + }, + { + "default-value": 65535, + "name": "num-queues", + "type": "uint16" + }, + { + "default-value": 0, + "name": "cyls", + "type": "uint32" + }, + { + "default-value": 0, + "name": "secs", + "type": "uint32" + }, + { + "name": "virtio-backend", + "type": "child" + }, + { + "default-value": 0, + "name": "min_io_size", + "type": "size" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "default-value": true, + "name": "config-wce", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "seg-max-adjust", + "type": "bool" + }, + { + "name": "drive", + "description": "Node name or ID of a block device to use as a backen= d", + "type": "str" + }, + { + "default-value": "auto", + "name": "werror", + "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", + "description": "Error handling policy, report/ignore/enospc/stop/aut= o", + "type": "BlockdevOnError" + }, + { + "default-value": "auto", + "name": "write-cache", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "default-value": true, + "name": "use-disabled-flag", + "type": "bool" + }, + { + "default-value": false, + "name": "x-disable-legacy-check", + "type": "bool" + }, + { + "default-value": true, + "name": "use-started", + "type": "bool" + }, + { + "default-value": false, + "name": "iommu_platform", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "physical_block_size", + "description": "A power of two between 512 B and 2 MiB", + "type": "size" + }, + { + "default-value": false, + "name": "scsi", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "any_layout", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "opt_io_size", + "type": "size" + }, + { + "default-value": 0, + "name": "logical_block_size", + "description": "A power of two between 512 B and 2 MiB", + "type": "size" + }, + { + "default-value": 4194303, + "name": "max-discard-sectors", + "type": "uint32" + }, + { + "default-value": true, + "name": "discard", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 4294967295, + "name": "discard_granularity", + "type": "size" + }, + { + "default-value": true, + "name": "request-merging", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "queue_reset", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "write-zeroes", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 4194303, + "name": "max-write-zeroes-sectors", + "type": "uint32" + }, + { + "default-value": false, + "name": "packed", + "description": "on/off", + "type": "bool" + }, + { + "default-value": "auto", + "name": "account-failed", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "default-value": true, + "name": "indirect_desc", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "event_idx", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "x-enable-wce-if-config-wce", + "type": "bool" + }, + { + "default-value": "auto", + "name": "backend_defaults", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "name": "serial", + "type": "str" + } + ], + "id": "libvirt-29" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-29" + "id": "libvirt-30" } =20 { @@ -27614,7 +27895,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-30" } =20 { @@ -27622,7 +27903,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -27701,12 +27982,12 @@ "type": "int" } ], - "id": "libvirt-30" + "id": "libvirt-31" } =20 { "execute": "query-machines", - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -27981,7 +28262,7 @@ "default-ram-id": "s390.ram" } ], - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -27989,7 +28270,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -28102,12 +28383,12 @@ "type": "child" } ], - "id": "libvirt-32" + "id": "libvirt-33" } =20 { "execute": "query-cpu-definitions", - "id": "libvirt-33" + "id": "libvirt-34" } =20 { @@ -28871,32 +29152,32 @@ "deprecated": false } ], - "id": "libvirt-33" + "id": "libvirt-34" } =20 { "execute": "query-tpm-models", - "id": "libvirt-34" + "id": "libvirt-35" } =20 { "return": [], - "id": "libvirt-34" + "id": "libvirt-35" } =20 { "execute": "query-tpm-types", - "id": "libvirt-35" + "id": "libvirt-36" } =20 { "return": [], - "id": "libvirt-35" + "id": "libvirt-36" } =20 { "execute": "query-command-line-options", - "id": "libvirt-36" + "id": "libvirt-37" } =20 { @@ -30119,12 +30400,12 @@ "option": "drive" } ], - "id": "libvirt-36" + "id": "libvirt-37" } =20 { "execute": "query-migrate-capabilities", - "id": "libvirt-37" + "id": "libvirt-38" } =20 { @@ -30222,7 +30503,7 @@ "capability": "dirty-limit" } ], - "id": "libvirt-37" + "id": "libvirt-38" } =20 { @@ -30233,7 +30514,7 @@ "name": "host" } }, - "id": "libvirt-38" + "id": "libvirt-39" } =20 { @@ -30282,7 +30563,7 @@ } } }, - "id": "libvirt-38" + "id": "libvirt-39" } =20 { diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies b/tests/qe= mucapabilitiesdata/caps_8.2.0_s390x.replies index fa9051c305..222a9fdfdc 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies @@ -28217,12 +28217,293 @@ "id": "libvirt-28" } =20 +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-ccw" + }, + "id": "libvirt-29" +} + +{ + "return": [ + { + "name": "dev_id", + "description": "Read-only identifier of an I/O device in the channel= subsystem, example: fe.1.23ab", + "type": "str" + }, + { + "name": "devno", + "description": "Identifier of an I/O device in the channel subsystem= , example: fe.1.23ab", + "type": "str" + }, + { + "name": "subch_id", + "description": "Read-only identifier of an I/O device in the channel= subsystem, example: fe.1.23ab", + "type": "str" + }, + { + "default-value": 2, + "name": "max_revision", + "type": "uint32" + }, + { + "default-value": true, + "name": "ioeventfd", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "notify_on_empty", + "description": "on/off", + "type": "bool" + }, + { + "default-value": false, + "name": "share-rw", + "type": "bool" + }, + { + "default-value": 0, + "name": "lcyls", + "type": "uint32" + }, + { + "default-value": 256, + "name": "queue-size", + "type": "uint16" + }, + { + "default-value": 0, + "name": "lsecs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "heads", + "type": "uint32" + }, + { + "default-value": "auto", + "name": "account-invalid", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "name": "iothread", + "type": "link" + }, + { + "default-value": 0, + "name": "lheads", + "type": "uint32" + }, + { + "default-value": 65535, + "name": "num-queues", + "type": "uint16" + }, + { + "default-value": 0, + "name": "cyls", + "type": "uint32" + }, + { + "default-value": 0, + "name": "secs", + "type": "uint32" + }, + { + "name": "virtio-backend", + "type": "child" + }, + { + "default-value": 0, + "name": "min_io_size", + "type": "size" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "default-value": true, + "name": "config-wce", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "seg-max-adjust", + "type": "bool" + }, + { + "name": "drive", + "description": "Node name or ID of a block device to use as a backen= d", + "type": "str" + }, + { + "default-value": "auto", + "name": "werror", + "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", + "description": "Error handling policy, report/ignore/enospc/stop/aut= o", + "type": "BlockdevOnError" + }, + { + "default-value": "auto", + "name": "write-cache", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "default-value": true, + "name": "use-disabled-flag", + "type": "bool" + }, + { + "default-value": false, + "name": "x-disable-legacy-check", + "type": "bool" + }, + { + "default-value": true, + "name": "use-started", + "type": "bool" + }, + { + "default-value": false, + "name": "iommu_platform", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "physical_block_size", + "description": "A power of two between 512 B and 2 MiB", + "type": "size" + }, + { + "default-value": false, + "name": "scsi", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "any_layout", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "opt_io_size", + "type": "size" + }, + { + "default-value": 0, + "name": "logical_block_size", + "description": "A power of two between 512 B and 2 MiB", + "type": "size" + }, + { + "default-value": 4194303, + "name": "max-discard-sectors", + "type": "uint32" + }, + { + "default-value": true, + "name": "discard", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 4294967295, + "name": "discard_granularity", + "type": "size" + }, + { + "default-value": true, + "name": "request-merging", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "queue_reset", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "write-zeroes", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 4194303, + "name": "max-write-zeroes-sectors", + "type": "uint32" + }, + { + "default-value": false, + "name": "packed", + "description": "on/off", + "type": "bool" + }, + { + "default-value": "auto", + "name": "account-failed", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "default-value": true, + "name": "indirect_desc", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "event_idx", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "x-enable-wce-if-config-wce", + "type": "bool" + }, + { + "default-value": "auto", + "name": "backend_defaults", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "name": "serial", + "type": "str" + } + ], + "id": "libvirt-29" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-29" + "id": "libvirt-30" } =20 { @@ -28312,7 +28593,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-30" } =20 { @@ -28320,7 +28601,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -28399,12 +28680,12 @@ "type": "int" } ], - "id": "libvirt-30" + "id": "libvirt-31" } =20 { "execute": "query-machines", - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -28689,7 +28970,7 @@ "default-ram-id": "s390.ram" } ], - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -28697,7 +28978,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -28810,12 +29091,12 @@ "type": "child" } ], - "id": "libvirt-32" + "id": "libvirt-33" } =20 { "execute": "query-cpu-definitions", - "id": "libvirt-33" + "id": "libvirt-34" } =20 { @@ -29579,32 +29860,32 @@ "deprecated": false } ], - "id": "libvirt-33" + "id": "libvirt-34" } =20 { "execute": "query-tpm-models", - "id": "libvirt-34" + "id": "libvirt-35" } =20 { "return": [], - "id": "libvirt-34" + "id": "libvirt-35" } =20 { "execute": "query-tpm-types", - "id": "libvirt-35" + "id": "libvirt-36" } =20 { "return": [], - "id": "libvirt-35" + "id": "libvirt-36" } =20 { "execute": "query-command-line-options", - "id": "libvirt-36" + "id": "libvirt-37" } =20 { @@ -30835,12 +31116,12 @@ "option": "drive" } ], - "id": "libvirt-36" + "id": "libvirt-37" } =20 { "execute": "query-migrate-capabilities", - "id": "libvirt-37" + "id": "libvirt-38" } =20 { @@ -30938,7 +31219,7 @@ "capability": "dirty-limit" } ], - "id": "libvirt-37" + "id": "libvirt-38" } =20 { @@ -30949,7 +31230,7 @@ "name": "host" } }, - "id": "libvirt-38" + "id": "libvirt-39" } =20 { @@ -30998,7 +31279,7 @@ } } }, - "id": "libvirt-38" + "id": "libvirt-39" } =20 { diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies b/tests/qe= mucapabilitiesdata/caps_9.1.0_s390x.replies index 4e54acb5b1..2d4ab8ed75 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies @@ -29266,12 +29266,293 @@ "id": "libvirt-29" } =20 +{ + "execute": "device-list-properties", + "arguments": { + "typename": "virtio-blk-ccw" + }, + "id": "libvirt-30" +} + +{ + "return": [ + { + "name": "dev_id", + "description": "Read-only identifier of an I/O device in the channel= subsystem, example: fe.1.23ab", + "type": "str" + }, + { + "name": "devno", + "description": "Identifier of an I/O device in the channel subsystem= , example: fe.1.23ab", + "type": "str" + }, + { + "name": "subch_id", + "description": "Read-only identifier of an I/O device in the channel= subsystem, example: fe.1.23ab", + "type": "str" + }, + { + "default-value": 2, + "name": "max_revision", + "type": "uint32" + }, + { + "default-value": true, + "name": "ioeventfd", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "notify_on_empty", + "description": "on/off", + "type": "bool" + }, + { + "default-value": false, + "name": "share-rw", + "type": "bool" + }, + { + "default-value": 0, + "name": "lcyls", + "type": "uint32" + }, + { + "default-value": 256, + "name": "queue-size", + "type": "uint16" + }, + { + "default-value": 0, + "name": "lsecs", + "type": "uint32" + }, + { + "default-value": 0, + "name": "heads", + "type": "uint32" + }, + { + "default-value": "auto", + "name": "account-invalid", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "name": "iothread", + "type": "link" + }, + { + "default-value": 0, + "name": "lheads", + "type": "uint32" + }, + { + "default-value": 65535, + "name": "num-queues", + "type": "uint16" + }, + { + "default-value": 0, + "name": "cyls", + "type": "uint32" + }, + { + "default-value": 0, + "name": "secs", + "type": "uint32" + }, + { + "name": "virtio-backend", + "type": "child" + }, + { + "default-value": 0, + "name": "min_io_size", + "type": "size" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "default-value": true, + "name": "config-wce", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "seg-max-adjust", + "type": "bool" + }, + { + "name": "drive", + "description": "Node name or ID of a block device to use as a backen= d", + "type": "str" + }, + { + "default-value": "auto", + "name": "werror", + "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", + "description": "Error handling policy, report/ignore/enospc/stop/aut= o", + "type": "BlockdevOnError" + }, + { + "default-value": "auto", + "name": "write-cache", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "default-value": true, + "name": "use-disabled-flag", + "type": "bool" + }, + { + "default-value": false, + "name": "x-disable-legacy-check", + "type": "bool" + }, + { + "default-value": true, + "name": "use-started", + "type": "bool" + }, + { + "default-value": false, + "name": "iommu_platform", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "physical_block_size", + "description": "A power of two between 512 B and 2 MiB", + "type": "size" + }, + { + "default-value": false, + "name": "scsi", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "any_layout", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 0, + "name": "opt_io_size", + "type": "size" + }, + { + "default-value": 0, + "name": "logical_block_size", + "description": "A power of two between 512 B and 2 MiB", + "type": "size" + }, + { + "default-value": 4194303, + "name": "max-discard-sectors", + "type": "uint32" + }, + { + "default-value": true, + "name": "discard", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 4294967295, + "name": "discard_granularity", + "type": "size" + }, + { + "default-value": true, + "name": "request-merging", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "queue_reset", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "write-zeroes", + "description": "on/off", + "type": "bool" + }, + { + "default-value": 4194303, + "name": "max-write-zeroes-sectors", + "type": "uint32" + }, + { + "default-value": false, + "name": "packed", + "description": "on/off", + "type": "bool" + }, + { + "default-value": "auto", + "name": "account-failed", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "default-value": true, + "name": "indirect_desc", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "event_idx", + "description": "on/off", + "type": "bool" + }, + { + "default-value": true, + "name": "x-enable-wce-if-config-wce", + "type": "bool" + }, + { + "default-value": "auto", + "name": "backend_defaults", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "name": "serial", + "type": "str" + } + ], + "id": "libvirt-30" +} + { "execute": "qom-list-properties", "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -29361,7 +29642,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-31" } =20 { @@ -29369,7 +29650,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-31" + "id": "libvirt-32" } =20 { @@ -29448,12 +29729,12 @@ "type": "int" } ], - "id": "libvirt-31" + "id": "libvirt-32" } =20 { "execute": "query-machines", - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -29758,7 +30039,7 @@ "default-ram-id": "s390.ram" } ], - "id": "libvirt-32" + "id": "libvirt-33" } =20 { @@ -29766,7 +30047,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-33" + "id": "libvirt-34" } =20 { @@ -29879,12 +30160,12 @@ "type": "child" } ], - "id": "libvirt-33" + "id": "libvirt-34" } =20 { "execute": "query-cpu-definitions", - "id": "libvirt-34" + "id": "libvirt-35" } =20 { @@ -30522,32 +30803,32 @@ "deprecated": false } ], - "id": "libvirt-34" + "id": "libvirt-35" } =20 { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-36" } =20 { "return": [], - "id": "libvirt-35" + "id": "libvirt-36" } =20 { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-37" } =20 { "return": [], - "id": "libvirt-36" + "id": "libvirt-37" } =20 { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-38" } =20 { @@ -31786,12 +32067,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-38" } =20 { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-39" } =20 { @@ -31885,7 +32166,7 @@ "capability": "mapped-ram" } ], - "id": "libvirt-38" + "id": "libvirt-39" } =20 { @@ -31896,7 +32177,7 @@ "name": "host" } }, - "id": "libvirt-39" + "id": "libvirt-40" } =20 { @@ -31968,7 +32249,7 @@ } } }, - "id": "libvirt-39" + "id": "libvirt-40" } =20 { --=20 2.45.0 From nobody Thu Nov 21 12:42:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=reject dis=none) header.from=linux.ibm.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1730903591623363.70657361662234; Wed, 6 Nov 2024 06:33:11 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 9205315E8; Wed, 6 Nov 2024 09:33:10 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id CFBE31543; Wed, 6 Nov 2024 09:32:07 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id AC7A8E79; Wed, 6 Nov 2024 09:32:04 -0500 (EST) Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id D22F11399 for ; Wed, 6 Nov 2024 09:32:03 -0500 (EST) Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4A6EARWU029104; Wed, 6 Nov 2024 14:32:03 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 42r9ytg3a1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 Nov 2024 14:32:02 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 4A6E16gZ024242; Wed, 6 Nov 2024 14:32:02 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 42nxsymcxq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 Nov 2024 14:32:02 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 4A6EVwVF65732938 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 6 Nov 2024 14:31:58 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3E01D2004D; Wed, 6 Nov 2024 14:31:58 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 141A02004F; Wed, 6 Nov 2024 14:31:58 +0000 (GMT) Received: from fiuczyvm.. (unknown [9.152.222.247]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 6 Nov 2024 14:31:58 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=9P31opHOOoQI7D6AA heanEvmDP4ccRx4qwaIsK/uz08=; b=ZSGP+YgqPmgcNfLy1tiVbTGkVr/LZ9OhR pgNn90CcJdshDu/WSS93aseAJgOudd/LxCnWwOb4tXkcx47ezQL3yz1OLbPBfrIy hAas4Df6ZcCNI3u1csRvd17ZUkbutr3JkdN5+RkwnIax5XOVSjOwE12Lrf2KXxKv fqyJa3ZYi3DMSvY/CiZcVGngjup15+7ayznGz1+9/3cXPskKSpTw7qRdoSKtI1vZ 3CfnLvTwAVND7Z7bEnpVQzq4FTvDKeNwmG3xrt0DJngQl/BeAydU051lR0+RwBg+ dZ1rPnejWcylQk4yEgLDnDQYRDNsXn5gBeUewXmojDILILKgqqs+Q== From: Boris Fiuczynski To: devel@lists.libvirt.org Subject: [PATCH 2/3] tests: add capabilities for QEMU 9.2.0 on s390x Date: Wed, 6 Nov 2024 15:31:56 +0100 Message-ID: <20241106143157.58978-3-fiuczy@linux.ibm.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241106143157.58978-1-fiuczy@linux.ibm.com> References: <20241106143157.58978-1-fiuczy@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: zJZ7PgFpUUd8hsiupeTfF_LtnlsmaGPz X-Proofpoint-ORIG-GUID: zJZ7PgFpUUd8hsiupeTfF_LtnlsmaGPz X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-15_01,2024-10-11_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 mlxscore=0 spamscore=0 impostorscore=0 phishscore=0 mlxlogscore=580 malwarescore=0 bulkscore=0 priorityscore=1501 clxscore=1015 lowpriorityscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2411060111 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: BTTIEO7N2ZNBAMNC6ZXN7MSHZJ7HD4BS X-Message-ID-Hash: BTTIEO7N2ZNBAMNC6ZXN7MSHZJ7HD4BS X-MailFrom: fiuczy@linux.ibm.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: thuth@redhat.com, jrossi@linux.ibm.com, shalini@linux.ibm.com, mhartmay@linux.ibm.com X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1730903593502116600 Content-Type: text/plain; charset="utf-8" Let us introduce the xml and reply files for QEMU 9.2.0 on s390x. Signed-off-by: Shalini Chellathurai Saroja Signed-off-by: Boris Fiuczynski --- tests/domaincapsdata/qemu_9.2.0.s390x.xml | 311 + .../caps_9.2.0_s390x.replies | 36741 ++++++++++++++++ .../qemucapabilitiesdata/caps_9.2.0_s390x.xml | 3752 ++ 3 files changed, 40804 insertions(+) create mode 100644 tests/domaincapsdata/qemu_9.2.0.s390x.xml create mode 100644 tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies create mode 100644 tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml diff --git a/tests/domaincapsdata/qemu_9.2.0.s390x.xml b/tests/domaincapsda= ta/qemu_9.2.0.s390x.xml new file mode 100644 index 0000000000..e13809bc63 --- /dev/null +++ b/tests/domaincapsdata/qemu_9.2.0.s390x.xml @@ -0,0 +1,311 @@ + + /usr/bin/qemu-system-s390x + kvm + s390-ccw-virtio-9.2 + s390x + + + + + + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd + + rom + pflash + + + yes + no + + + no + + + + + + + off + + + + + on + off + + + + gen16a-base + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + gen15a + gen15a-base + gen15b + gen15b-base + gen16a + gen16a-base + gen16b + gen16b-base + max + qemu + z10BC + z10BC-base + z10BC.2 + z10BC.2-base + z10EC + z10EC-base + z10EC.2 + z10EC.2-base + z10EC.3 + z10EC.3-base + z114 + z114-base + z13 + z13-base + z13.2 + z13.2-base + z13s + z13s-base + z14 + z14-base + z14.2 + z14.2-base + z14ZR1 + z14ZR1-base + z196 + z196-base + z196.2 + z196.2-base + z800 + z800-base + z890 + z890-base + z890.2 + z890.2-base + z890.3 + z890.3-base + z900 + z900-base + z900.2 + z900.2-base + z900.3 + z900.3-base + z990 + z990-base + z990.2 + z990.2-base + z990.3 + z990.3-base + z990.4 + z990.4-base + z990.5 + z990.5-base + z9BC + z9BC-base + z9BC.2 + z9BC.2-base + z9EC + z9EC-base + z9EC.2 + z9EC.2-base + z9EC.3 + z9EC.3-base + zBC12 + zBC12-base + zEC12 + zEC12-base + zEC12.2 + zEC12.2-base + + + + + file + anonymous + memfd + + + + + + disk + cdrom + floppy + lun + + + fdc + scsi + virtio + usb + + + virtio + virtio-transitional + virtio-non-transitional + + + + + sdl + vnc + egl-headless + dbus + + + + + + subsystem + + + default + mandatory + requisite + optional + + + usb + pci + scsi + + + + default + vfio + + + + + virtio + virtio-transitional + virtio-non-transitional + + + random + egd + builtin + + + + + path + handle + virtiofs + + + + + + usb + + + + + pty + unix + + + + + virtio + + + qemu + + + builtin + lkcf + + + + + default + passt + + + + + s390 + + + + + + + + + + + + + + + + + s390-pv + + + + diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies b/tests/qe= mucapabilitiesdata/caps_9.2.0_s390x.replies new file mode 100644 index 0000000000..0f97cd3499 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies @@ -0,0 +1,36741 @@ [...] diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml b/tests/qemuca= pabilitiesdata/caps_9.2.0_s390x.xml new file mode 100644 index 0000000000..8a6a516fa3 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml @@ -0,0 +1,3752 @@ [...] --=20 2.45.0 From nobody Thu Nov 21 12:42:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=reject dis=none) header.from=linux.ibm.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1730903773426897.0245533285156; Wed, 6 Nov 2024 06:36:13 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 41729154F; Wed, 6 Nov 2024 09:36:12 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3366F15F2; Wed, 6 Nov 2024 09:32:13 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5F6A513A9; Wed, 6 Nov 2024 09:32:06 -0500 (EST) Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id CC6781399 for ; Wed, 6 Nov 2024 09:32:04 -0500 (EST) Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4A6EA42W028850; Wed, 6 Nov 2024 14:32:04 GMT Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 42r9ytg3a4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 Nov 2024 14:32:04 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 4A65UkeI032050; Wed, 6 Nov 2024 14:32:03 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 42nydmpb7x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 Nov 2024 14:32:03 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 4A6EVwJ564487810 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 6 Nov 2024 14:31:58 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 799612004D; Wed, 6 Nov 2024 14:31:58 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 453322005A; Wed, 6 Nov 2024 14:31:58 +0000 (GMT) Received: from fiuczyvm.. (unknown [9.152.222.247]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 6 Nov 2024 14:31:58 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=CK21eAcdK6PKIsvSg 2GrnAYrCLvBTDBwokleUdBTjuk=; b=K9Yb42K9iuKHmN3Nh/UP0Z9IOB8pBO9d3 rFpK81rug493FHyP+0nrfe5Duli7VjefCw8BX7m92k/nKZGwgz6ZM6a0LjkGcjM8 rAShyWQn4DDaWnKtDj3Po/jRaI8ebi1TLKE+sIOTbCHbz8838WtPE2UIUr5GQkBO w5+VGKnSsFtMBz6ZzQRVxyAveNR447QHuDwKdqxw+sgcM1dQUhX3g5pS3WvrjIUF 69umw1NhSZPIMv8JRXH8yMiEUTPnE75XVUHyHh4xK8EFahMiECUY3xRpyXWEvOD+ BpK30i0cQod7eo4QL3kf/KVB23OXtdqzcpcx7iNkNzyZjHEfYS7+Q== From: Boris Fiuczynski To: devel@lists.libvirt.org Subject: [PATCH 3/3] qemu: command: add multi boot device support on s390x Date: Wed, 6 Nov 2024 15:31:57 +0100 Message-ID: <20241106143157.58978-4-fiuczy@linux.ibm.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241106143157.58978-1-fiuczy@linux.ibm.com> References: <20241106143157.58978-1-fiuczy@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: yAj48sEzEYzMmBKmiz3nksB55O5V5VaW X-Proofpoint-ORIG-GUID: yAj48sEzEYzMmBKmiz3nksB55O5V5VaW X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-15_01,2024-10-11_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 mlxscore=0 spamscore=0 impostorscore=0 phishscore=0 mlxlogscore=999 malwarescore=0 bulkscore=0 priorityscore=1501 clxscore=1015 lowpriorityscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2411060111 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 65I373PYKO4VXNGCC5HNWH7DTHPTRGET X-Message-ID-Hash: 65I373PYKO4VXNGCC5HNWH7DTHPTRGET X-MailFrom: fiuczy@linux.ibm.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: thuth@redhat.com, jrossi@linux.ibm.com, shalini@linux.ibm.com, mhartmay@linux.ibm.com X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1730903774869116600 Content-Type: text/plain; charset="utf-8" If QEMU supports multi boot device make use of it instead of using the single boot device machine parameter. Signed-off-by: Boris Fiuczynski Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 40 ++++++++++++--- src/qemu/qemu_command.h | 6 ++- src/qemu/qemu_hotplug.c | 6 ++- .../machine-loadparm-hostdev.s390x-9.1.0.args | 33 ++++++++++++ .../machine-loadparm-hostdev.s390x-9.1.0.xml | 33 ++++++++++++ ...machine-loadparm-hostdev.s390x-latest.args | 4 +- ...-multiple-disks-nets-s390.s390x-9.1.0.args | 40 +++++++++++++++ ...m-multiple-disks-nets-s390.s390x-9.1.0.xml | 51 +++++++++++++++++++ ...multiple-disks-nets-s390.s390x-latest.args | 8 +-- ...machine-loadparm-net-s390.s390x-9.1.0.args | 34 +++++++++++++ .../machine-loadparm-net-s390.s390x-9.1.0.xml | 32 ++++++++++++ ...achine-loadparm-net-s390.s390x-latest.args | 4 +- .../machine-loadparm-s390.s390x-9.1.0.args | 34 +++++++++++++ .../machine-loadparm-s390.s390x-9.1.0.xml | 33 ++++++++++++ .../machine-loadparm-s390.s390x-latest.args | 4 +- tests/qemuxmlconftest.c | 4 ++ 16 files changed, 346 insertions(+), 20 deletions(-) create mode 100644 tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-9.= 1.0.args create mode 100644 tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-9.= 1.0.xml create mode 100644 tests/qemuxmlconfdata/machine-loadparm-multiple-disks-n= ets-s390.s390x-9.1.0.args create mode 100644 tests/qemuxmlconfdata/machine-loadparm-multiple-disks-n= ets-s390.s390x-9.1.0.xml create mode 100644 tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-9= .1.0.args create mode 100644 tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-9= .1.0.xml create mode 100644 tests/qemuxmlconfdata/machine-loadparm-s390.s390x-9.1.0= .args create mode 100644 tests/qemuxmlconfdata/machine-loadparm-s390.s390x-9.1.0= .xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a5ff7695c3..cdc0ea18d7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1608,6 +1608,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, g_autofree char *chardev =3D NULL; g_autofree char *drive =3D NULL; unsigned int bootindex =3D 0; + g_autofree char *bootLoadparm =3D NULL; unsigned int logical_block_size =3D disk->blockio.logical_block_size; unsigned int physical_block_size =3D disk->blockio.physical_block_size; unsigned int discard_granularity =3D disk->blockio.discard_granularity; @@ -1746,9 +1747,14 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, } =20 /* bootindex for floppies is configured via the fdc controller */ - if (disk->device !=3D VIR_DOMAIN_DISK_DEVICE_FLOPPY) + if (disk->device !=3D VIR_DOMAIN_DISK_DEVICE_FLOPPY) { bootindex =3D disk->info.effectiveBootIndex; =20 + if (disk->info.loadparm && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_CCW_DEVICE_LOADPARM)) + bootLoadparm =3D g_strdup(disk->info.loadparm); + } + if (disk->wwn) { unsigned long long w =3D 0; =20 @@ -1791,6 +1797,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, "S:chardev", chardev, "s:id", disk->info.alias, "p:bootindex", bootindex, + "S:loadparm", bootLoadparm, "p:logical_block_size", logical_block_size, "p:physical_block_size", physical_block_size, "p:discard_granularity", discard_granularity, @@ -3616,6 +3623,7 @@ qemuBuildNicDevProps(virDomainDef *def, g_autoptr(virJSONValue) props =3D NULL; char macaddr[VIR_MAC_STRING_BUFLEN]; g_autofree char *netdev =3D g_strdup_printf("host%s", net->info.alias); + g_autofree char *bootLoadparm =3D NULL; =20 if (virDomainNetIsVirtioModel(net)) { const char *tx =3D NULL; @@ -3701,11 +3709,16 @@ qemuBuildNicDevProps(virDomainDef *def, =20 virMacAddrFormat(&net->mac, macaddr); =20 + if (net->info.loadparm && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_CCW_DEVICE_LOADPARM)) + bootLoadparm =3D g_strdup(net->info.loadparm); + if (virJSONValueObjectAdd(&props, "s:netdev", netdev, "s:id", net->info.alias, "s:mac", macaddr, "p:bootindex", net->info.effectiveBootIndex, + "S:loadparm", bootLoadparm, NULL) < 0) return NULL; =20 @@ -4751,15 +4764,22 @@ qemuBuildSCSIVHostHostdevDevProps(const virDomainDe= f *def, virJSONValue * qemuBuildSCSIHostdevDevProps(const virDomainDef *def, virDomainHostdevDef *dev, - const char *backendAlias) + const char *backendAlias, + virQEMUCaps *qemuCaps) { + g_autofree char *bootLoadparm =3D NULL; g_autoptr(virJSONValue) props =3D NULL; =20 + if (dev->info->loadparm && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_CCW_DEVICE_LOADPARM)) + bootLoadparm =3D g_strdup(dev->info->loadparm); + if (virJSONValueObjectAdd(&props, "s:driver", "scsi-generic", "s:drive", backendAlias, "s:id", dev->info->alias, "p:bootindex", dev->info->bootIndex, + "S:loadparm", bootLoadparm, NULL) < 0) return NULL; =20 @@ -4840,16 +4860,22 @@ qemuBuildHostdevMdevModelTypeString(virDomainHostde= vSubsysMediatedDev *mdev) =20 virJSONValue * qemuBuildHostdevMediatedDevProps(const virDomainDef *def, - virDomainHostdevDef *dev) + virDomainHostdevDef *dev, + virQEMUCaps *qemuCaps) { g_autoptr(virJSONValue) props =3D NULL; virDomainHostdevSubsysMediatedDev *mdevsrc =3D &dev->source.subsys.u.m= dev; g_autofree char *mdevPath =3D NULL; + g_autofree char *bootLoadparm =3D NULL; /* 'ramfb' property must be omitted unless it's to be enabled */ bool ramfb =3D mdevsrc->ramfb =3D=3D VIR_TRISTATE_SWITCH_ON; =20 mdevPath =3D virMediatedDeviceGetSysfsPath(mdevsrc->uuidstr); =20 + if (dev->info->loadparm && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_CCW_DEVICE_LOADPARM)) + bootLoadparm =3D g_strdup(dev->info->loadparm); + if (virJSONValueObjectAdd(&props, "s:driver", qemuBuildHostdevMdevModelTypeStr= ing(mdevsrc), "s:id", dev->info->alias, @@ -4857,6 +4883,7 @@ qemuBuildHostdevMediatedDevProps(const virDomainDef *= def, "S:display", qemuOnOffAuto(mdevsrc->display), "B:ramfb", ramfb, "p:bootindex", dev->info->bootIndex, + "S:loadparm", bootLoadparm, NULL) < 0) return NULL; =20 @@ -4955,7 +4982,7 @@ qemuBuildHostdevSCSICommandLine(virCommand *cmd, if (qemuBuildBlockStorageSourceAttachDataCommandline(cmd, data, qemuCa= ps) < 0) return -1; =20 - if (!(devprops =3D qemuBuildSCSIHostdevDevProps(def, hostdev, backendA= lias))) + if (!(devprops =3D qemuBuildSCSIHostdevDevProps(def, hostdev, backendA= lias, qemuCaps))) return -1; =20 if (qemuBuildDeviceCommandlineFromJSON(cmd, devprops, def, qemuCaps) <= 0) @@ -5054,7 +5081,7 @@ qemuBuildHostdevCommandLine(virCommand *cmd, return -1; } =20 - if (!(devprops =3D qemuBuildHostdevMediatedDevProps(def, hostd= ev))) + if (!(devprops =3D qemuBuildHostdevMediatedDevProps(def, hostd= ev, qemuCaps))) return -1; =20 if (qemuBuildDeviceCommandlineFromJSON(cmd, devprops, def, qem= uCaps) < 0) @@ -6879,7 +6906,8 @@ qemuBuildMachineCommandLine(virCommand *cmd, virBufferAsprintf(&buf, ",max-cpu-compat=3D%s", cpu->model); } =20 - qemuAppendLoadparmMachineParm(&buf, def); + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_CCW_DEVICE_LOADPARM)) + qemuAppendLoadparmMachineParm(&buf, def); =20 if (def->sec) { switch (def->sec->sectype) { diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 309e566f6c..befc3f4ef9 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -179,7 +179,8 @@ qemuBuildUSBHostdevDevProps(const virDomainDef *def, virJSONValue * qemuBuildSCSIHostdevDevProps(const virDomainDef *def, virDomainHostdevDef *dev, - const char *backendAlias); + const char *backendAlias, + virQEMUCaps *qemuCaps); =20 qemuBlockStorageSourceAttachData * qemuBuildHostdevSCSIAttachPrepare(virDomainHostdevDef *hostdev, @@ -197,7 +198,8 @@ qemuBuildSCSIVHostHostdevDevProps(const virDomainDef *d= ef, =20 virJSONValue * qemuBuildHostdevMediatedDevProps(const virDomainDef *def, - virDomainHostdevDef *dev); + virDomainHostdevDef *dev, + virQEMUCaps *qemuCaps); =20 virJSONValue * qemuBuildRedirdevDevProps(const virDomainDef *def, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1a7b69e5bb..5db72ef634 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2541,7 +2541,8 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriver *driver, priv->qemuCaps))) goto cleanup; =20 - if (!(devprops =3D qemuBuildSCSIHostdevDevProps(vm->def, hostdev, back= endalias))) + if (!(devprops =3D qemuBuildSCSIHostdevDevProps(vm->def, hostdev, back= endalias, + priv->qemuCaps))) goto cleanup; =20 VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1); @@ -2761,7 +2762,8 @@ qemuDomainAttachMediatedDevice(virQEMUDriver *driver, =20 qemuAssignDeviceHostdevAlias(vm->def, &hostdev->info->alias, -1); =20 - if (!(devprops =3D qemuBuildHostdevMediatedDevProps(vm->def, hostdev))) + if (!(devprops =3D qemuBuildHostdevMediatedDevProps(vm->def, hostdev, + priv->qemuCaps))) goto cleanup; =20 VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1); diff --git a/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-9.1.0.arg= s b/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-9.1.0.args new file mode 100644 index 0000000000..0a025e6335 --- /dev/null +++ b/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-9.1.0.args @@ -0,0 +1,33 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-s390x \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio-9.1,usb=3Doff,dump-guest-core=3Doff,memory-backen= d=3Ds390.ram,loadparm=3D2 \ +-accel tcg \ +-cpu qemu \ +-m size=3D524288k \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":536870912= }' \ +-overcommit mem-lock=3Doff \ +-smp 2,sockets=3D2,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 \ +-boot strict=3Don \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"vfio-ccw","id":"hostdev0","sysfsdev":"/sys/bus/mdev/de= vices/90c6c135-ad44-41d0-b1b7-bae47de48627","bootindex":1,"devno":"fe.0.000= 0"}' \ +-device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-9.1.0.xml= b/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-9.1.0.xml new file mode 100644 index 0000000000..119ae6b0fa --- /dev/null +++ b/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-9.1.0.xml @@ -0,0 +1,33 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 524288 + 524288 + 2 + + hvm + + + qemu + + + destroy + restart + destroy + + /usr/bin/qemu-system-s390x + +