You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
50 lines
1.7 KiB
50 lines
1.7 KiB
From 2f4436e7cc2f63d198229dc8ba32783460c0b185 Mon Sep 17 00:00:00 2001
|
|
From: Stefano Garzarella <sgarzare@redhat.com>
|
|
Date: Thu, 27 Jul 2023 18:10:20 +0200
|
|
Subject: [PATCH 06/14] block/blkio: use blkio_set_int("fd") to check fd
|
|
support
|
|
|
|
RH-Author: Stefano Garzarella <sgarzare@redhat.com>
|
|
RH-MergeRequest: 194: block/blkio: backport latest fixes for virtio-blk-* drivers
|
|
RH-Bugzilla: 2225354 2225439
|
|
RH-Acked-by: Hanna Czenczek <hreitz@redhat.com>
|
|
RH-Acked-by: Alberto Faria <None>
|
|
RH-Commit: [6/6] d57aafb2c3a8ed13aa3c6dcce5525a9cc8f5aa21 (sgarzarella/qemu-kvm-c-9-s)
|
|
|
|
Setting the `fd` property fails with virtio-blk-* libblkio drivers
|
|
that do not support fd passing since
|
|
https://gitlab.com/libblkio/libblkio/-/merge_requests/208.
|
|
|
|
Getting the `fd` property, on the other hand, always succeeds for
|
|
virtio-blk-* libblkio drivers even when they don't support fd passing.
|
|
|
|
This patch switches to setting the `fd` property because it is a
|
|
better mechanism for probing fd passing support than getting the `fd`
|
|
property.
|
|
|
|
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
Message-id: 20230727161020.84213-5-sgarzare@redhat.com
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
(cherry picked from commit 1c38fe69e2b8a05c1762b122292fa7e3662f06fd)
|
|
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
---
|
|
block/blkio.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/block/blkio.c b/block/blkio.c
|
|
index eef80e9ce5..8defbf744f 100644
|
|
--- a/block/blkio.c
|
|
+++ b/block/blkio.c
|
|
@@ -689,7 +689,7 @@ static int blkio_virtio_blk_connect(BlockDriverState *bs, QDict *options,
|
|
return -EINVAL;
|
|
}
|
|
|
|
- if (blkio_get_int(s->blkio, "fd", &fd) == 0) {
|
|
+ if (blkio_set_int(s->blkio, "fd", -1) == 0) {
|
|
fd_supported = true;
|
|
}
|
|
|
|
--
|
|
2.39.3
|
|
|