diff options
| author | Peter Maydell | 2018-05-04 14:49:08 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-05-04 14:49:08 +0200 |
| commit | 7c867af89a43e4be56ea25dd9691196eb1818fe6 (patch) | |
| tree | ce2da0f65f3408a71fb30ec086e15e3fd6a44d77 /migration | |
| parent | Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20180504' into staging (diff) | |
| parent | qapi: deprecate CpuInfoFast.arch (diff) | |
| download | qemu-7c867af89a43e4be56ea25dd9691196eb1818fe6.tar.gz qemu-7c867af89a43e4be56ea25dd9691196eb1818fe6.tar.xz qemu-7c867af89a43e4be56ea25dd9691196eb1818fe6.zip | |
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 'migration')
| -rw-r--r-- | migration/migration.c | 4 | ||||
| -rw-r--r-- | migration/qjson.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/migration/migration.c b/migration/migration.c index 0bdb28e144..35f2781b03 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1040,14 +1040,14 @@ void qmp_migrate_set_parameters(MigrateSetParameters *params, Error **errp) /* TODO Rewrite "" to null instead */ if (params->has_tls_creds && params->tls_creds->type == QTYPE_QNULL) { - QDECREF(params->tls_creds->u.n); + qobject_unref(params->tls_creds->u.n); params->tls_creds->type = QTYPE_QSTRING; params->tls_creds->u.s = strdup(""); } /* TODO Rewrite "" to null instead */ if (params->has_tls_hostname && params->tls_hostname->type == QTYPE_QNULL) { - QDECREF(params->tls_hostname->u.n); + qobject_unref(params->tls_hostname->u.n); params->tls_hostname->type = QTYPE_QSTRING; params->tls_hostname->u.s = strdup(""); } diff --git a/migration/qjson.c b/migration/qjson.c index 9d7f6eb9eb..e9889bdcb0 100644 --- a/migration/qjson.c +++ b/migration/qjson.c @@ -109,6 +109,6 @@ void qjson_finish(QJSON *json) void qjson_destroy(QJSON *json) { - QDECREF(json->str); + qobject_unref(json->str); g_free(json); } |