Merge tag 'pull-misc-2026-07-14' of https://repo.or.cz/qemu/armbru into staging

Miscellaneous patches for 2026-07-14

# -----BEGIN PGP SIGNATURE-----
#
# iQJGBAABCgAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmpV/gsSHGFybWJydUBy
# ZWRoYXQuY29tAAoJEDhwtADrkYZTi/oP/1B9i3crkWVFgzZ3YyvDFG5aAPtMZ4MU
# TFEh3xKtzOMIu/jvFvapSNAHG/4kPuiHTJXsi8VYtvzoKhhJggczSJI1K3JSxEtg
# 8j7RVKevIwEk3kBR4+L3yegGerNJd2cFfyJLK6DzljxqwRd1bo6/iigxwrg5WzG6
# YDyPqeOtrOBVDjjRXH5T1k+rL5HgmUp5JQWsc+gZSqdVSLWPnTEOtg1Xs1ipEIRm
# JRiKG/5ADwao8Ml6iGmmQQsFvNe6EYWbm6NGdavzuD7mp6Roxuq4CtxD+6jT3roK
# GxQKsig2Un2vBWgvI9ZokwULcpB4esiUAvz9pPYg9WZB/PXi24Fjivhjm2w69E8N
# QIU1TimQFkR0nIFkChYPAfQvBbzdTGv71dZ4/vxVI5ha7kAYw3xWMAGuMhX4FivW
# mEGu7j999IlRSWZYBLUsbsBCM4gXuxzPjs9Cp8xghLi9mnF+MITz0zCHKx2FQwE7
# 06yTeEvjPe8LWqx6mfeFq/k4c+Hpiib+D4cOyIBLqldGjFowbaaTmLP8W6VUGM07
# QsuPIE0Py9EOBwOXqYTYrv/SsBLPp03j3Om/P4Bo6E3Zhms0gF8+WXACyJX1t1H0
# V+GtgloccjgfP9hynHa5RaoFeDxOZwksV6cxbuWm38yhhcyaq0iZMXqGWjfO4h5f
# HgNAI8X660MA
# =fEwp
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 14 Jul 2026 10:14:51 BST
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* tag 'pull-misc-2026-07-14' of https://repo.or.cz/qemu/armbru:
  json-parser: fix formatting of comment
  MAINTAINERS: Regularise the status fields (again)
  qom: Fix device-list-properties & friends to show legacy-FOO props
  qapi: Fix misspelled section tags in doc comments

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi
2026-07-17 10:00:20 +01:00
5 changed files with 9 additions and 15 deletions

View File

@@ -2940,7 +2940,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

View File

@@ -108,7 +108,7 @@
#
# @caches: the list of `SmpCacheProperties`.
#
# Since 9.2
# Since: 9.2
##
{ 'struct': 'SmpCachePropertiesWrapper',
'data': { 'caches': ['SmpCacheProperties'] } }

View File

@@ -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' ] },

View File

@@ -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

View File

@@ -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);