d90d5cae2b
The 'blockdev-create' QMP command was introduced as experimental feature in commitb0292b851b
, using the assert() debug call. It got promoted to 'stable' command in3fb588a0f2
, but the assert call was not removed. Some block drivers are optional, and bdrv_find_format() might return a NULL value, triggering the assertion. Stable code is not expected to abort, so return an error instead. This is easily reproducible when libnfs is not installed: ./configure [...] module support no Block whitelist (rw) Block whitelist (ro) libiscsi support yes libnfs support no [...] Start QEMU: $ qemu-system-x86_64 -S -qmp unix:/tmp/qemu.qmp,server,nowait Send the 'blockdev-create' with the 'nfs' driver: $ ( cat << 'EOF' {'execute': 'qmp_capabilities'} {'execute': 'blockdev-create', 'arguments': {'job-id': 'x', 'options': {'size': 0, 'driver': 'nfs', 'location': {'path': '/', 'server': {'host': '::1', 'type': 'inet'}}}}, 'id': 'x'} EOF ) | socat STDIO UNIX:/tmp/qemu.qmp {"QMP": {"version": {"qemu": {"micro": 50, "minor": 1, "major": 4}, "package": "v4.1.0-733-g89ea03a7dc"}, "capabilities": ["oob"]}} {"return": {}} QEMU crashes: $ gdb qemu-system-x86_64 core Program received signal SIGSEGV, Segmentation fault. (gdb) bt #0 0x00007ffff510957f in raise () at /lib64/libc.so.6 #1 0x00007ffff50f3895 in abort () at /lib64/libc.so.6 #2 0x00007ffff50f3769 in _nl_load_domain.cold.0 () at /lib64/libc.so.6 #3 0x00007ffff5101a26 in .annobin_assert.c_end () at /lib64/libc.so.6 #4 0x0000555555d7e1f1 in qmp_blockdev_create (job_id=0x555556baee40 "x", options=0x555557666610, errp=0x7fffffffc770) at block/create.c:69 #5 0x0000555555c96b52 in qmp_marshal_blockdev_create (args=0x7fffdc003830, ret=0x7fffffffc7f8, errp=0x7fffffffc7f0) at qapi/qapi-commands-block-core.c:1314 #6 0x0000555555deb0a0 in do_qmp_dispatch (cmds=0x55555645de70 <qmp_commands>, request=0x7fffdc005c70, allow_oob=false, errp=0x7fffffffc898) at qapi/qmp-dispatch.c:131 #7 0x0000555555deb2a1 in qmp_dispatch (cmds=0x55555645de70 <qmp_commands>, request=0x7fffdc005c70, allow_oob=false) at qapi/qmp-dispatch.c:174 With this patch applied, QEMU returns a QMP error: {'execute': 'blockdev-create', 'arguments': {'job-id': 'x', 'options': {'size': 0, 'driver': 'nfs', 'location': {'path': '/', 'server': {'host': '::1', 'type': 'inet'}}}}, 'id': 'x'} {"id": "x", "error": {"class": "GenericError", "desc": "Block driver 'nfs' not found or not supported"}} Cc: qemu-stable@nongnu.org Reported-by: Xu Tian <xutian@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: John Snow <jsnow@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
100 lines
3.3 KiB
C
100 lines
3.3 KiB
C
/*
|
|
* Block layer code related to image creation
|
|
*
|
|
* Copyright (c) 2018 Kevin Wolf <kwolf@redhat.com>
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "block/block_int.h"
|
|
#include "qemu/job.h"
|
|
#include "qemu/main-loop.h"
|
|
#include "qapi/qapi-commands-block-core.h"
|
|
#include "qapi/qapi-visit-block-core.h"
|
|
#include "qapi/clone-visitor.h"
|
|
#include "qapi/error.h"
|
|
|
|
typedef struct BlockdevCreateJob {
|
|
Job common;
|
|
BlockDriver *drv;
|
|
BlockdevCreateOptions *opts;
|
|
} BlockdevCreateJob;
|
|
|
|
static int coroutine_fn blockdev_create_run(Job *job, Error **errp)
|
|
{
|
|
BlockdevCreateJob *s = container_of(job, BlockdevCreateJob, common);
|
|
int ret;
|
|
|
|
job_progress_set_remaining(&s->common, 1);
|
|
ret = s->drv->bdrv_co_create(s->opts, errp);
|
|
job_progress_update(&s->common, 1);
|
|
|
|
qapi_free_BlockdevCreateOptions(s->opts);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static const JobDriver blockdev_create_job_driver = {
|
|
.instance_size = sizeof(BlockdevCreateJob),
|
|
.job_type = JOB_TYPE_CREATE,
|
|
.run = blockdev_create_run,
|
|
};
|
|
|
|
void qmp_blockdev_create(const char *job_id, BlockdevCreateOptions *options,
|
|
Error **errp)
|
|
{
|
|
BlockdevCreateJob *s;
|
|
const char *fmt = BlockdevDriver_str(options->driver);
|
|
BlockDriver *drv = bdrv_find_format(fmt);
|
|
|
|
if (!drv) {
|
|
error_setg(errp, "Block driver '%s' not found or not supported", fmt);
|
|
return;
|
|
}
|
|
|
|
/* If the driver is in the schema, we know that it exists. But it may not
|
|
* be whitelisted. */
|
|
if (bdrv_uses_whitelist() && !bdrv_is_whitelisted(drv, false)) {
|
|
error_setg(errp, "Driver is not whitelisted");
|
|
return;
|
|
}
|
|
|
|
/* Error out if the driver doesn't support .bdrv_co_create */
|
|
if (!drv->bdrv_co_create) {
|
|
error_setg(errp, "Driver does not support blockdev-create");
|
|
return;
|
|
}
|
|
|
|
/* Create the block job */
|
|
/* TODO Running in the main context. Block drivers need to error out or add
|
|
* locking when they use a BDS in a different AioContext. */
|
|
s = job_create(job_id, &blockdev_create_job_driver, NULL,
|
|
qemu_get_aio_context(), JOB_DEFAULT | JOB_MANUAL_DISMISS,
|
|
NULL, NULL, errp);
|
|
if (!s) {
|
|
return;
|
|
}
|
|
|
|
s->drv = drv,
|
|
s->opts = QAPI_CLONE(BlockdevCreateOptions, options),
|
|
|
|
job_start(&s->common);
|
|
}
|