diff options
| author | Max Reitz <mreitz@redhat.com> | 2018-02-24 16:40:32 +0100 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2018-03-19 14:58:36 -0500 |
| commit | e59a0cf17b1b9932b65e6fc25d6856976f5e4831 (patch) | |
| tree | f303124257a396e0705ad0231d29c1d428adcbb3 /block.c | |
| parent | 532fb532847365f61a9c6e1291b6588a43bc1cc4 (diff) | |
| download | qemu-e59a0cf17b1b9932b65e6fc25d6856976f5e4831.tar.gz | |
block: Handle null backing link
Instead of converting all "backing": null instances into "backing": "",
handle a null value directly in bdrv_open_inherit().
This enables explicitly null backing links for json:{} filenames.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-Id: <20180224154033.29559-7-mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[eblake: rebase to qobject_to() parameter order and qapi headers split]
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'block.c')
| -rw-r--r-- | block.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -33,6 +33,7 @@ #include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" +#include "qapi/qmp/qnull.h" #include "qapi/qmp/qstring.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qapi-visit-block-core.h" @@ -2645,7 +2646,9 @@ static BlockDriverState *bdrv_open_inherit(const char *filename, /* See cautionary note on accessing @options above */ backing = qdict_get_try_str(options, "backing"); - if (backing && *backing == '\0') { + if (qobject_to(QNull, qdict_get(options, "backing")) != NULL || + (backing && *backing == '\0')) + { flags |= BDRV_O_NO_BACKING; qdict_del(options, "backing"); } |