From: Paul Durrant <xadimgnik@gmail.com>
To: Anthony PERARD <anthony.perard@citrix.com>, qemu-devel@nongnu.org
Cc: Stefano Stabellini <sstabellini@kernel.org>,
Kevin Wolf <kwolf@redhat.com>, Max Reitz <mreitz@redhat.com>,
xen-devel@lists.xenproject.org, qemu-block@nongnu.org
Subject: Re: [PATCH] xen-block: Use specific blockdev driver
Date: Wed, 5 May 2021 18:44:28 +0100 [thread overview]
Message-ID: <05554fc3-e900-e5b2-eef7-3155f8c9b4b4@xen.org> (raw)
In-Reply-To: <20210430163432.468894-1-anthony.perard@citrix.com>
On 30/04/2021 17:34, Anthony PERARD wrote:
> From: Anthony PERARD <anthony.perard@citrix.com>
>
> ... when a xen-block backend instance is created via xenstore.
>
> Following 8d17adf34f50 ("block: remove support for using "file" driver
> with block/char devices"), using the "file" blockdev driver for
> everything doesn't work anymore, we need to use the "host_device"
> driver when the disk image is a block device and "file" driver when it
> is a regular file.
>
> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Paul Durrant <paul@xen.org>
> ---
> hw/block/xen-block.c | 14 +++++++++++++-
> 1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c
> index 83754a434481..674953f1adee 100644
> --- a/hw/block/xen-block.c
> +++ b/hw/block/xen-block.c
> @@ -728,6 +728,8 @@ static XenBlockDrive *xen_block_drive_create(const char *id,
> XenBlockDrive *drive = NULL;
> QDict *file_layer;
> QDict *driver_layer;
> + struct stat st;
> + int rc;
>
> if (params) {
> char **v = g_strsplit(params, ":", 2);
> @@ -761,7 +763,17 @@ static XenBlockDrive *xen_block_drive_create(const char *id,
> file_layer = qdict_new();
> driver_layer = qdict_new();
>
> - qdict_put_str(file_layer, "driver", "file");
> + rc = stat(filename, &st);
> + if (rc) {
> + error_setg_errno(errp, errno, "Could not stat file '%s'", filename);
> + goto done;
> + }
> + if (S_ISBLK(st.st_mode)) {
> + qdict_put_str(file_layer, "driver", "host_device");
> + } else {
> + qdict_put_str(file_layer, "driver", "file");
> + }
> +
> qdict_put_str(file_layer, "filename", filename);
> g_free(filename);
>
>
prev parent reply other threads:[~2021-05-05 17:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-30 16:34 [PATCH] xen-block: Use specific blockdev driver Anthony PERARD
2021-05-05 17:44 ` Paul Durrant [this message]
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=05554fc3-e900-e5b2-eef7-3155f8c9b4b4@xen.org \
--to=xadimgnik@gmail.com \
--cc=anthony.perard@citrix.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=paul@xen.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=sstabellini@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/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).