diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2017-01-13 19:02:32 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-02-28 20:40:36 +0100 |
| commit | d7086422b1c1e75e320519cfe26176db6ec97a37 (patch) | |
| tree | 5b8cc8a489ee05f6432288590f1b621bccfa39c4 /hmp.c | |
| parent | 6d0eb64d5c6d57017c52a4f36ccae1db79215ee1 (diff) | |
| download | focaccia-qemu-d7086422b1c1e75e320519cfe26176db6ec97a37.tar.gz focaccia-qemu-d7086422b1c1e75e320519cfe26176db6ec97a37.zip | |
block: Add error parameter to blk_insert_bs()
Now that blk_insert_bs() requests the BlockBackend permissions for the node it attaches to, it can fail. Instead of aborting, pass the errors to the callers. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Acked-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'hmp.c')
| -rw-r--r-- | hmp.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hmp.c b/hmp.c index 020141b344..e219f97239 100644 --- a/hmp.c +++ b/hmp.c @@ -2045,6 +2045,7 @@ void hmp_qemu_io(Monitor *mon, const QDict *qdict) const char* device = qdict_get_str(qdict, "device"); const char* command = qdict_get_str(qdict, "command"); Error *err = NULL; + int ret; blk = blk_by_name(device); if (!blk) { @@ -2052,7 +2053,10 @@ void hmp_qemu_io(Monitor *mon, const QDict *qdict) if (bs) { /* FIXME Use real permissions */ blk = local_blk = blk_new(0, BLK_PERM_ALL); - blk_insert_bs(blk, bs); + ret = blk_insert_bs(blk, bs, &err); + if (ret < 0) { + goto fail; + } } else { goto fail; } |