From 8b61adae4e25d9f6ec17462ac2b6f7ad6b5bab14 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 1 Jul 2026 08:11:36 +0200 Subject: [PATCH 1/4] qapi: Fix misspelled section tags in doc comments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Section tags are case sensitive and end with a colon. Screwing up either gets them interpreted as ordinary paragraph. Fix a few. Fixes: 4e88e7e340 (qapi/qom: Define cache enumeration and properties for machine, 2024-11-01) Fixes: 8eb6d39e22 (qom: qom-list-get, 2025-07-11) Signed-off-by: Markus Armbruster Message-ID: <20260701061136.798815-1-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé --- qapi/machine-common.json | 2 +- qapi/qom.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qapi/machine-common.json b/qapi/machine-common.json index 92e84dfb14..aca98e994a 100644 --- a/qapi/machine-common.json +++ b/qapi/machine-common.json @@ -108,7 +108,7 @@ # # @caches: the list of `SmpCacheProperties`. # -# Since 9.2 +# Since: 9.2 ## { 'struct': 'SmpCachePropertiesWrapper', 'data': { 'caches': ['SmpCacheProperties'] } } diff --git a/qapi/qom.json b/qapi/qom.json index d96cc5aa21..c55776af7d 100644 --- a/qapi/qom.json +++ b/qapi/qom.json @@ -58,7 +58,7 @@ # @value: the value of the property. Absent when the property cannot # be read. # -# Since 10.1 +# Since: 10.1 ## { 'struct': 'ObjectPropertyValue', 'data': { 'name': 'str', @@ -70,7 +70,7 @@ # # @properties: a list of properties. # -# Since 10.1 +# Since: 10.1 ## { 'struct': 'ObjectPropertiesValues', 'data': { 'properties': [ 'ObjectPropertyValue' ] }} @@ -167,7 +167,7 @@ # Returns: A list where each element is the result for the # corresponding element of @paths. # -# Since 10.1 +# Since: 10.1 ## { 'command': 'qom-list-get', 'data': { 'paths': [ 'str' ] }, From 9dbce799e7087a75851ba1ae321b22c19b6f75c3 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 8 Jul 2026 16:09:48 +0200 Subject: [PATCH 2/4] qom: Fix device-list-properties & friends to show legacy-FOO props MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qmp_device_list_properties() skips properties whose name starts with "legacy-". This is a flawed test for "is a legacy property". The test is flawed because non-legacy properties can and do start with "legacy-". Back when it was added, no such properties existed. Right now, three such properties do: property "legacy-cmb" of device "nvme", and properties "legacy-cache" and "legacy-multi-node" of devices "x86_64-cpu", "i386-cpu", and its children. This affects QMP command "device-list-properties", HMP command "device_add T,help", and command line option "-device T,help". Legacy properties are gone since commit a61383f7ab (qdev: Legacy properties are now unused internally, drop, 2025-10-22). This makes the fix easy: delete the code that skips them. Reproducer: -device nvme,help doesn't show legacy-cmb before the patch, and does after. Fixes: f4eb32b590 (qmp: show QOM properties in device-list-properties, 2014-05-20) Signed-off-by: Markus Armbruster Message-ID: <20260708140948.2622814-1-armbru@redhat.com> Reviewed-by: Daniel P. Berrangé --- qom/qom-qmp-cmds.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c index 48b38d2b7f..330895361d 100644 --- a/qom/qom-qmp-cmds.c +++ b/qom/qom-qmp-cmds.c @@ -218,13 +218,6 @@ ObjectPropertyInfoList *qmp_device_list_properties(const char *typename, continue; } - /* Skip legacy properties since they are just string versions of - * properties that we already list. - */ - if (strstart(prop->name, "legacy-", NULL)) { - continue; - } - info = g_new0(ObjectPropertyInfo, 1); info->name = g_strdup(prop->name); info->type = g_strdup(prop->type); From f87693a841337badb894c28f2089a104a13557d5 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 10 Jul 2026 13:14:03 +0200 Subject: [PATCH 3/4] MAINTAINERS: Regularise the status fields (again) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Orphaned isn't a state, Orphan is. Fixes: fb7001e458 (MAINTAINERS: Remove PhilMD from firmware sections, 2026-04-17) Signed-off-by: Markus Armbruster Message-ID: <20260710111403.2953873-1-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index e25df9493c..8f84f3c61b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2937,7 +2937,7 @@ F: include/hw/isa/vt82c686.h Firmware configuration (fw_cfg) R: Gerd Hoffmann -S: Orphaned +S: Orphan F: docs/specs/fw_cfg.rst F: hw/nvram/fw_cfg*.c F: stubs/fw_cfg.c From 87f608e3c20677e57fc1c854085218dab8a45946 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 13 Jul 2026 13:46:22 +0200 Subject: [PATCH 4/4] json-parser: fix formatting of comment Signed-off-by: Paolo Bonzini Message-ID: <20260713114622.1950506-1-pbonzini@redhat.com> Reviewed-by: Markus Armbruster [Mea culpa] Signed-off-by: Markus Armbruster --- qobject/json-parser.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qobject/json-parser.c b/qobject/json-parser.c index 5935730c0c..6b1b4762bd 100644 --- a/qobject/json-parser.c +++ b/qobject/json-parser.c @@ -29,9 +29,10 @@ * object, an error, or NULL (if the object is incomplete and no error * happened) after every token. Therefore it has an explicit * representation of its parser stack; each stack entry consists of a - * parser state and a QObject: - a QList, for an array that is being - * added to - a QDict, for a dictionary that is being added to - a - * QString, for the key of the next pair that will be added to a QDict + * parser state and a QObject: + * - a QList, for an array that is being added to + * - a QDict, for a dictionary that is being added to + * - a QString, for the key of the next pair that will be added to a QDict * * The stack represents an arbitrary nesting of arrays and dictionaries * (whose next key has been parsed); it can also have a dictionary whose