diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-05-04 13:49:08 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-05-04 13:49:08 +0100 |
| commit | 7c867af89a43e4be56ea25dd9691196eb1818fe6 (patch) | |
| tree | ce2da0f65f3408a71fb30ec086e15e3fd6a44d77 /target | |
| parent | 46e04dacd3a6e7e453fb0b76b144b5fc67f52349 (diff) | |
| parent | 6ffa3ab453b431ec047ff1fc87120059b5266014 (diff) | |
| download | qemu-7c867af89a43e4be56ea25dd9691196eb1818fe6.zip qemu-7c867af89a43e4be56ea25dd9691196eb1818fe6.tar.gz qemu-7c867af89a43e4be56ea25dd9691196eb1818fe6.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2018-05-04' into staging
QAPI patches for 2018-05-04
# gpg: Signature made Fri 04 May 2018 08:59:16 BST
# gpg: using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-qapi-2018-05-04:
qapi: deprecate CpuInfoFast.arch
qapi: discriminate CpuInfoFast on SysEmuTarget, not CpuInfoArch
qapi: change the type of TargetInfo.arch from string to enum SysEmuTarget
qapi: add SysEmuTarget to "common.json"
qapi: fill in CpuInfoFast.arch in query-cpus-fast
qobject: Modify qobject_ref() to return obj
qobject: Replace qobject_incref/QINCREF qobject_decref/QDECREF
qobject: use a QObjectBase_ struct
qobject: Ensure base is at offset 0
qobject: Use qobject_to() instead of type cast
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target')
| -rw-r--r-- | target/ppc/translate_init.c | 2 | ||||
| -rw-r--r-- | target/s390x/cpu_models.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c index 118631e..a72be6d 100644 --- a/target/ppc/translate_init.c +++ b/target/ppc/translate_init.c @@ -8364,7 +8364,7 @@ static void getset_compat_deprecated(Object *obj, Visitor *v, const char *name, "use max-cpu-compat machine property instead"); } visit_type_null(v, name, &null, NULL); - QDECREF(null); + qobject_unref(null); } static const PropertyInfo ppc_compat_deprecated_propinfo = { diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 2741b68..e10035a 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -551,7 +551,7 @@ static void cpu_info_from_model(CpuModelInfo *info, const S390CPUModel *model, } if (!qdict_size(qdict)) { - QDECREF(qdict); + qobject_unref(qdict); } else { info->props = QOBJECT(qdict); info->has_props = true; |