diff options
| author | Peter Maydell | 2021-04-02 00:34:16 +0200 |
|---|---|---|
| committer | Peter Maydell | 2021-04-02 00:34:16 +0200 |
| commit | 50a9b4499ca99a439b400f715f9475b1702f4e87 (patch) | |
| tree | 9a96927b459f81d2705a5e1c30e86ce91fe8c0ce /qom | |
| parent | Merge remote-tracking branch 'remotes/marcandre/tags/for-6.0-pull-request' in... (diff) | |
| parent | device-crash-test: Ignore errors about a bus not being available (diff) | |
| download | qemu-50a9b4499ca99a439b400f715f9475b1702f4e87.tar.gz qemu-50a9b4499ca99a439b400f715f9475b1702f4e87.tar.xz qemu-50a9b4499ca99a439b400f715f9475b1702f4e87.zip | |
Merge remote-tracking branch 'remotes/thuth-gitlab/tags/pull-request-2021-04-01' into staging
* Updates for the MAINTAINERS file
* Some small documentation updates
* Some small misc fixes
# gpg: Signature made Thu 01 Apr 2021 13:30:39 BST
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* remotes/thuth-gitlab/tags/pull-request-2021-04-01:
device-crash-test: Ignore errors about a bus not being available
docs: Fix typo in the default name of the qemu-system-x86_64 binary
docs: Remove obsolete paragraph about config-target.mak
util/compatfd.c: Fixed style issues
qom: Fix default values in help
MAINTAINERS: Mark SH-4 hardware emulation orphan
MAINTAINERS: Mark RX hardware emulation orphan
MAINTAINERS: add virtio-fs mailing list
MAINTAINERS: Drop the line with Xiang Zheng
MAINTAINERS: replace Huawei's email to personal one
MAINTAINERS: Drop the lines with Sarah Harris
MAINTAINERS: add/replace backups for some s390 areas
MAINTAINERS: Fix tests/migration maintainers
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qom')
| -rw-r--r-- | qom/object_interfaces.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index b17aa57de1..4479ee693a 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -158,7 +158,7 @@ char *object_property_help(const char *name, const char *type, } if (defval) { g_autofree char *def_json = g_string_free(qobject_to_json(defval), - true); + false); g_string_append_printf(str, " (default: %s)", def_json); } |