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 /block/null.c | |
| 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 'block/null.c')
| -rw-r--r-- | block/null.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/null.c b/block/null.c index 806a8631e4..3944550f67 100644 --- a/block/null.c +++ b/block/null.c @@ -244,7 +244,6 @@ static int coroutine_fn null_co_block_status(BlockDriverState *bs, static void null_refresh_filename(BlockDriverState *bs, QDict *opts) { - QINCREF(opts); qdict_del(opts, "filename"); if (!qdict_size(opts)) { @@ -253,7 +252,7 @@ static void null_refresh_filename(BlockDriverState *bs, QDict *opts) } qdict_put_str(opts, "driver", bs->drv->format_name); - bs->full_open_options = opts; + bs->full_open_options = qobject_ref(opts); } static BlockDriver bdrv_null_co = { |