yannick.naumann/RT-Task-Generator-QEMU
1
0
Fork 0
forked from alwin.berger/FRET-qemu
Code Pull Requests Activity

block/blkio: fall back on using path when fd setting fails

Browse Source 
qemu_open() fails if called with an unix domain socket in this way:
    -blockdev node-name=drive0,driver=virtio-blk-vhost-user,path=vhost-user-blk.sock,cache.direct=on: Could not open 'vhost-user-blk.sock': No such device or address

Since virtio-blk-vhost-user does not support fd passing, let`s always fall back
on using `path` if we fail the fd passing.

Fixes: cad2ccc395 ("block/blkio: use qemu_open() to support fd passing for virtio-blk")
Reported-by: Qing Wang <qinwang@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Message-id: 20230727161020.84213-4-sgarzare@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefano Garzarella 2023-07-27 18:10:19 +02:00 committed by Stefan Hajnoczi
parent 809c319f8a
commit 723bea27b1
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
block/blkio.c
View File

@ -711,19 +711,19 @@ static int blkio_virtio_blk_connect(BlockDriverState *bs, QDict *options,
* In order to open the device read-only, we are using the `read-only` * In order to open the device read-only, we are using the `read-only`
* property of the libblkio driver in blkio_file_open(). * property of the libblkio driver in blkio_file_open().
*/ */
fd = qemu_open(path, O_RDWR, errp); fd = qemu_open(path, O_RDWR, NULL);
if (fd < 0) { if (fd < 0) {
return -EINVAL; fd_supported = false;
} else {
ret = blkio_set_int(s->blkio, "fd", fd);
if (ret < 0) {
fd_supported = false;
qemu_close(fd);
}
} }
}
ret = blkio_set_int(s->blkio, "fd", fd); if (!fd_supported) {
if (ret < 0) {
error_setg_errno(errp, -ret, "failed to set fd: %s",
blkio_get_error_msg());
qemu_close(fd);
return ret;
}
} else {
ret = blkio_set_str(s->blkio, "path", path); ret = blkio_set_str(s->blkio, "path", path);
if (ret < 0) { if (ret < 0) {
error_setg_errno(errp, -ret, "failed to set path: %s", error_setg_errno(errp, -ret, "failed to set path: %s",