[PULL 0/4] Miscellaneous patches for 2026-07-14

[PULL 0/4] Miscellaneous patches for 2026-07-14

[Markus Armbruster]

The following changes since commit 499039798cdad7d86b787fec0eaf1da4151c0f05:

  Merge tag 'pull-request-2026-07-12' of https://gitlab.com/huth/qemu into staging (2026-07-12 21:49:04 +0200)

are available in the Git repository at:

  https://repo.or.cz/qemu/armbru.git tags/pull-misc-2026-07-14

for you to fetch changes up to 87f608e3c20677e57fc1c854085218dab8a45946:

  json-parser: fix formatting of comment (2026-07-14 10:59:58 +0200)

----------------------------------------------------------------
Miscellaneous patches for 2026-07-14

----------------------------------------------------------------
Markus Armbruster (3):
      qapi: Fix misspelled section tags in doc comments
      qom: Fix device-list-properties & friends to show legacy-FOO props
      MAINTAINERS: Regularise the status fields (again)

Paolo Bonzini (1):
      json-parser: fix formatting of comment

 MAINTAINERS              | 2 +-
 qapi/machine-common.json | 2 +-
 qapi/qom.json            | 6 +++---
 qobject/json-parser.c    | 7 ++++---
 qom/qom-qmp-cmds.c       | 7 -------
 5 files changed, 9 insertions(+), 15 deletions(-)

-- 
2.54.0

[PULL 1/4] qapi: Fix misspelled section tags in doc comments

[Markus Armbruster]

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 <armbru@redhat.com>
Message-ID: <20260701061136.798815-1-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
---
 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' ] },
-- 
2.54.0

[PULL 2/4] qom: Fix device-list-properties & friends to show legacy-FOO props

[Markus Armbruster]

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 <armbru@redhat.com>
Message-ID: <20260708140948.2622814-1-armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
 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);
-- 
2.54.0

[PULL 3/4] MAINTAINERS: Regularise the status fields (again)

[Markus Armbruster]

Orphaned isn't a state, Orphan is.

Fixes: fb7001e458 (MAINTAINERS: Remove PhilMD from firmware sections, 2026-04-17)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20260710111403.2953873-1-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
---
 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 <kraxel@redhat.com>
-S: Orphaned
+S: Orphan
 F: docs/specs/fw_cfg.rst
 F: hw/nvram/fw_cfg*.c
 F: stubs/fw_cfg.c
-- 
2.54.0

[PULL 4/4] json-parser: fix formatting of comment

[Markus Armbruster]

From: Paolo Bonzini <pbonzini@redhat.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <20260713114622.1950506-1-pbonzini@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Mea culpa]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 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
-- 
2.54.0

Re: [PULL 0/4] Miscellaneous patches for 2026-07-14

[Stefan Hajnoczi]

On Tue, Jul 14, 2026 at 10:18 AM Markus Armbruster <armbru@redhat.com> wrote:
>
> The following changes since commit 499039798cdad7d86b787fec0eaf1da4151c0f05:
>
>   Merge tag 'pull-request-2026-07-12' of https://gitlab.com/huth/qemu into staging (2026-07-12 21:49:04 +0200)
>
> are available in the Git repository at:
>
>   https://repo.or.cz/qemu/armbru.git tags/pull-misc-2026-07-14

Hi Markus,
repo.or.cz is geoblocking the UK where I'm currently connecting from:
https://repo.or.cz/uk-blocked.html

Your pull request will make it into -rc1 and you don't need to take
any action, but I wanted to let you know that this pull request has
been delayed temporarily.

Stefan

>
> for you to fetch changes up to 87f608e3c20677e57fc1c854085218dab8a45946:
>
>   json-parser: fix formatting of comment (2026-07-14 10:59:58 +0200)
>
> ----------------------------------------------------------------
> Miscellaneous patches for 2026-07-14
>
> ----------------------------------------------------------------
> Markus Armbruster (3):
>       qapi: Fix misspelled section tags in doc comments
>       qom: Fix device-list-properties & friends to show legacy-FOO props
>       MAINTAINERS: Regularise the status fields (again)
>
> Paolo Bonzini (1):
>       json-parser: fix formatting of comment
>
>  MAINTAINERS              | 2 +-
>  qapi/machine-common.json | 2 +-
>  qapi/qom.json            | 6 +++---
>  qobject/json-parser.c    | 7 ++++---
>  qom/qom-qmp-cmds.c       | 7 -------
>  5 files changed, 9 insertions(+), 15 deletions(-)
>
> --
> 2.54.0
>
>

Re: [PULL 0/4] Miscellaneous patches for 2026-07-14

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 116 bytes --]

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/11.1 for any user-visible changes.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]