From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefan Hajnoczi <stefanha@redhat.com>,
Kevin Wolf <kwolf@redhat.com>, Fam Zheng <fam@euphon.net>,
qemu-block@nongnu.org, Richard Henderson <rth@twiddle.net>,
Hanna Reitz <hreitz@redhat.com>,
Stefano Garzarella <sgarzare@redhat.com>
Subject: [PULL for-8.1 8/8] block/blkio: use blkio_set_int("fd") to check fd support
Date: Thu, 27 Jul 2023 16:00:58 -0400 [thread overview]
Message-ID: <20230727200058.1071776-9-stefanha@redhat.com> (raw)
In-Reply-To: <20230727200058.1071776-1-stefanha@redhat.com>
From: Stefano Garzarella <sgarzare@redhat.com>
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>
---
block/blkio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/blkio.c b/block/blkio.c
index 72b46d61fd..8e7ce42c79 100644
--- a/block/blkio.c
+++ b/block/blkio.c
@@ -690,7 +690,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.41.0
next prev parent reply other threads:[~2023-07-27 20:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-27 20:00 [PULL for-8.1 0/8] Block patches Stefan Hajnoczi
2023-07-27 20:00 ` [PULL for-8.1 1/8] block/blkio: enable the completion eventfd Stefan Hajnoczi
2023-07-27 20:00 ` [PULL for-8.1 2/8] block/blkio: do not use open flags in qemu_open() Stefan Hajnoczi
2023-07-27 20:00 ` [PULL for-8.1 3/8] block/file-posix: fix g_file_get_contents return path Stefan Hajnoczi
2023-07-27 20:00 ` [PULL for-8.1 4/8] block: Fix pad_request's request restriction Stefan Hajnoczi
2023-07-27 20:00 ` [PULL for-8.1 5/8] block/blkio: move blkio_connect() in the drivers functions Stefan Hajnoczi
2023-07-27 20:00 ` [PULL for-8.1 6/8] block/blkio: retry blkio_connect() if it fails using `fd` Stefan Hajnoczi
2023-07-27 20:00 ` [PULL for-8.1 7/8] block/blkio: fall back on using `path` when `fd` setting fails Stefan Hajnoczi
2023-07-27 20:00 ` Stefan Hajnoczi [this message]
2023-07-28 12:56 ` [PULL for-8.1 0/8] Block patches Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230727200058.1071776-9-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=fam@euphon.net \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=sgarzare@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).