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);
>
>