[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 55/65] block/xen: Use blk_new_open() in blk_connec
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL v2 55/65] block/xen: Use blk_new_open() in blk_connect() |
Date: |
Mon, 16 Feb 2015 15:46:20 +0000 |
From: Max Reitz <address@hidden>
As part of the required changes, this fixes a bug where specifying an
invalid driver would result in the block layer probing the image format;
now it will result in an error, unless "<unset>" is specified as the
driver name. Fixing this would require further work on the xen_disk code
which does not seem worth it (at this point and for this patch).
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
hw/block/xen_disk.c | 27 +++++++++++----------------
1 file changed, 11 insertions(+), 16 deletions(-)
diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c
index 21842a0..267d8a8 100644
--- a/hw/block/xen_disk.c
+++ b/hw/block/xen_disk.c
@@ -40,6 +40,8 @@
#include "xen_blkif.h"
#include "sysemu/blockdev.h"
#include "sysemu/block-backend.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qstring.h"
/* ------------------------------------------------------------- */
@@ -897,30 +899,23 @@ static int blk_connect(struct XenDevice *xendev)
blkdev->dinfo = drive_get(IF_XEN, 0, index);
if (!blkdev->dinfo) {
Error *local_err = NULL;
- BlockBackend *blk;
- BlockDriver *drv;
- BlockDriverState *bs;
+ QDict *options = NULL;
- /* setup via xenbus -> create new block driver instance */
- xen_be_printf(&blkdev->xendev, 2, "create new bdrv (xenbus setup)\n");
- blk = blk_new_with_bs(blkdev->dev, NULL);
- if (!blk) {
- return -1;
+ if (strcmp(blkdev->fileproto, "<unset>")) {
+ options = qdict_new();
+ qdict_put(options, "driver", qstring_from_str(blkdev->fileproto));
}
- blkdev->blk = blk;
- bs = blk_bs(blk);
- drv = bdrv_find_whitelisted_format(blkdev->fileproto, readonly);
- if (bdrv_open(&bs, blkdev->filename, NULL, NULL, qflags,
- drv, &local_err) != 0) {
+ /* setup via xenbus -> create new block driver instance */
+ xen_be_printf(&blkdev->xendev, 2, "create new bdrv (xenbus setup)\n");
+ blkdev->blk = blk_new_open(blkdev->dev, blkdev->filename, NULL,
options,
+ qflags, &local_err);
+ if (!blkdev->blk) {
xen_be_printf(&blkdev->xendev, 0, "error: %s\n",
error_get_pretty(local_err));
error_free(local_err);
- blk_unref(blk);
- blkdev->blk = NULL;
return -1;
}
- assert(bs == blk_bs(blk));
} else {
/* setup via qemu cmdline -> already setup for us */
xen_be_printf(&blkdev->xendev, 2, "get configured bdrv (cmdline
setup)\n");
--
2.1.0
- [Qemu-devel] [PULL v2 47/65] qemu-iotests: Add 093 for IO throttling, (continued)
- [Qemu-devel] [PULL v2 47/65] qemu-iotests: Add 093 for IO throttling, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 50/65] block: Lift some BDS functions to the BlockBackend, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 49/65] iotests: Add test for qemu-img convert to NBD, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 52/65] block: Add Error parameter to bdrv_find_protocol(), Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 53/65] iotests: Add test for driver=qcow2, format=qcow2, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 48/65] qemu-img: Fix qemu-img convert -n, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 51/65] block: Add blk_new_open(), Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 56/65] qemu-img: Use blk_new_open() in img_open(), Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 54/65] blockdev: Use blk_new_open() in blockdev_init(), Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 57/65] qemu-img: Use blk_new_open() in img_rebase(), Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 55/65] block/xen: Use blk_new_open() in blk_connect(),
Stefan Hajnoczi <=
- [Qemu-devel] [PULL v2 58/65] qemu-img: Use BlockBackend as far as possible, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 59/65] qemu-nbd: Use blk_new_open() in main(), Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 63/65] block: Clamp BlockBackend requests, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 61/65] qemu-io: Remove "growable" option, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 60/65] qemu-io: Use blk_new_open() in openfile(), Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 62/65] qemu-io: Use BlockBackend, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 64/65] block: Remove "growable" from BDS, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 65/65] block: Keep bdrv_check*_request()'s return value, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 27/65] libqos/ahci: Add cmd response sanity check helpers, Stefan Hajnoczi, 2015/02/16
- Re: [Qemu-devel] [PULL v2 00/65] Block patches, Peter Maydell, 2015/02/24