From nobody Sat Nov 23 12:24:19 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=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1732015674759199.26012797849114; Tue, 19 Nov 2024 03:27:54 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id AD42C1B1D; Tue, 19 Nov 2024 06:27:53 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 094ED1BBB; Tue, 19 Nov 2024 06:27:17 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 881A819D4; Tue, 19 Nov 2024 06:27:12 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 070A81828 for ; Tue, 19 Nov 2024 06:27:12 -0500 (EST) Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-314-7f0pPX4CMZaS8ISgZFlVeg-1; Tue, 19 Nov 2024 06:27:10 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D5EE9197732C for ; Tue, 19 Nov 2024 11:27:09 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.6]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E22231956054 for ; Tue, 19 Nov 2024 11:27:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, 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=redhat.com; s=mimecast20190719; t=1732015631; h=from:from: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; bh=d46GMVP4GJuEThSc2BEyppAVsVLN9+2oXjO5L5baF5I=; b=ex42cuWzapy0hpuhBXj53m86erDse5ymFujQM42QdQSjy/WZMOQMCDBmHTRm2RuOSFTgHi FwBMimj6HQiW961eIr5hNLr+II/rH+8bR8SFN98OZ9OGtdwKx8tIJicqgo1AfM6czFDe7U irKfCL+kwkZhneKqwryGx0m4Vs4DSQU= X-MC-Unique: 7f0pPX4CMZaS8ISgZFlVeg-1 X-Mimecast-MFC-AGG-ID: 7f0pPX4CMZaS8ISgZFlVeg From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 1/4] qemu: capabilities: Restore grouping in 'virQEMUCapsQMPSchemaQueries' Date: Tue, 19 Nov 2024 12:27:02 +0100 Message-ID: <3317b4dbad7d8b64deda9818312becd494d3ae56.1732015586.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 7ss5Lk_oqnRPAVpebJpWbO1wfvRciwrIXsM0mJu2uf0_1732015630 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: QTCSNJVSWKS6MFH2A5VM64UXT7RH2IK2 X-Message-ID-Hash: QTCSNJVSWKS6MFH2A5VM64UXT7RH2IK2 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1732015675257116600 Content-Type: text/plain; charset="utf-8" Historically the QMP schema lookup queries were grouped by the first component of the query (which was also sorted), but not fully sorted. This deteriorated over time. Re-group the query strings now that some were added at the bottom. Signed-off-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 9cdcec8efa..167356ff8c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1564,8 +1564,10 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPS= chemaQueries[] =3D { { "blockdev-add/arg-type/+qcow2/discard-no-unref", QEMU_CAPS_QCOW2_DIS= CARD_NO_UNREF }, { "blockdev-add/arg-type/+virtio-blk-vhost-vdpa/$fdset", QEMU_CAPS_DEV= ICE_VIRTIO_BLK_VHOST_VDPA}, { "blockdev-snapshot/$allow-write-only-overlay", QEMU_CAPS_BLOCKDEV_SN= APSHOT_ALLOW_WRITE_ONLY }, + { "calc-dirty-rate/arg-type/mode", QEMU_CAPS_DIRTYRATE_MODE }, { "chardev-add/arg-type/backend/+socket/data/reconnect", QEMU_CAPS_CHA= RDEV_RECONNECT }, { "chardev-add/arg-type/backend/+socket/data/reconnect-ms", QEMU_CAPS_= CHARDEV_RECONNECT_MILISECONDS }, + { "chardev-add/arg-type/backend/+qemu-vdagent", QEMU_CAPS_CHARDEV_QEMU= _VDAGENT }, { "device_add/$json-cli-hotplug", QEMU_CAPS_DEVICE_JSON }, { "migrate-set-parameters/arg-type/block-bitmap-mapping/bitmaps/transf= orm", QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING }, { "nbd-server-start/arg-type/tls-creds", QEMU_CAPS_NBD_TLS }, @@ -1575,23 +1577,21 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMP= SchemaQueries[] =3D { { "netdev_add/arg-type/+vhost-vdpa", QEMU_CAPS_NETDEV_VHOST_VDPA }, /* JSON support for -netdev was introduced for the 'dgram' netdev type= */ { "netdev_add/arg-type/type/^dgram", QEMU_CAPS_NETDEV_JSON }, + { "netdev_add/arg-type/+user", QEMU_CAPS_NETDEV_USER }, { "object-add/arg-type/qom-type/^secret", QEMU_CAPS_OBJECT_JSON }, + { "object-add/arg-type/+sev-guest/kernel-hashes", QEMU_CAPS_SEV_GUEST_= KERNEL_HASHES }, + { "object-add/arg-type/+iothread/thread-pool-max", QEMU_CAPS_IOTHREAD_= THREAD_POOL_MAX }, { "query-display-options/ret-type/+egl-headless/rendernode", QEMU_CAPS= _EGL_HEADLESS_RENDERNODE }, { "query-display-options/ret-type/+sdl", QEMU_CAPS_SDL }, { "query-display-options/ret-type/+egl-headless", QEMU_CAPS_EGL_HEADLE= SS }, + { "query-display-options/ret-type/+dbus", QEMU_CAPS_DISPLAY_DBUS }, { "query-hotpluggable-cpus/ret-type/props/die-id", QEMU_CAPS_SMP_DIES = }, { "query-hotpluggable-cpus/ret-type/props/cluster-id", QEMU_CAPS_SMP_C= LUSTERS }, + { "query-migrate/ret-type/blocked-reasons", QEMU_CAPS_MIGRATION_BLOCKE= D_REASONS }, { "query-named-block-nodes/arg-type/flat", QEMU_CAPS_QMP_QUERY_NAMED_B= LOCK_NODES_FLAT }, { "screendump/arg-type/device", QEMU_CAPS_SCREENDUMP_DEVICE }, - { "set-numa-node/arg-type/+hmat-lb", QEMU_CAPS_NUMA_HMAT }, - { "object-add/arg-type/+sev-guest/kernel-hashes", QEMU_CAPS_SEV_GUEST_= KERNEL_HASHES }, - { "calc-dirty-rate/arg-type/mode", QEMU_CAPS_DIRTYRATE_MODE }, - { "chardev-add/arg-type/backend/+qemu-vdagent", QEMU_CAPS_CHARDEV_QEMU= _VDAGENT }, - { "query-display-options/ret-type/+dbus", QEMU_CAPS_DISPLAY_DBUS }, - { "object-add/arg-type/+iothread/thread-pool-max", QEMU_CAPS_IOTHREAD_= THREAD_POOL_MAX }, - { "query-migrate/ret-type/blocked-reasons", QEMU_CAPS_MIGRATION_BLOCKE= D_REASONS }, { "screendump/arg-type/format/^png", QEMU_CAPS_SCREENSHOT_FORMAT_PNG }, - { "netdev_add/arg-type/+user", QEMU_CAPS_NETDEV_USER }, + { "set-numa-node/arg-type/+hmat-lb", QEMU_CAPS_NUMA_HMAT }, }; typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps; --=20 2.47.0