[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 04/14] block/xen: Use blk_new_open() in blk_conne
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 04/14] block/xen: Use blk_new_open() in blk_connect() |
Date: |
Thu, 22 Jan 2015 15:10:01 -0500 |
Signed-off-by: Max Reitz <address@hidden>
---
hw/block/xen_disk.c | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c
index 21842a0..da333a4 100644
--- a/hw/block/xen_disk.c
+++ b/hw/block/xen_disk.c
@@ -899,28 +899,24 @@ static int blk_connect(struct XenDevice *xendev)
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_obj(options, "driver",
+ QOBJECT(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] [PATCH v2 00/14] block: Remove "growable", add blk_new_open(), Max Reitz, 2015/01/22
- [Qemu-devel] [PATCH v2 04/14] block/xen: Use blk_new_open() in blk_connect(),
Max Reitz <=
- [Qemu-devel] [PATCH v2 05/14] qemu-img: Use blk_new_open() in img_open(), Max Reitz, 2015/01/22
- [Qemu-devel] [PATCH v2 01/14] block: Lift some BDS functions to the BlockBackend, Max Reitz, 2015/01/22
- [Qemu-devel] [PATCH v2 07/14] qemu-img: Use BlockBackend as far as possible, Max Reitz, 2015/01/22
- [Qemu-devel] [PATCH v2 03/14] blockdev: Use blk_new_open() in blockdev_init(), Max Reitz, 2015/01/22
- [Qemu-devel] [PATCH v2 02/14] block: Add blk_new_open(), Max Reitz, 2015/01/22
- [Qemu-devel] [PATCH v2 09/14] qemu-io: Use blk_new_open() in openfile(), Max Reitz, 2015/01/22
- [Qemu-devel] [PATCH v2 08/14] qemu-nbd: Use blk_new_open() in main(), Max Reitz, 2015/01/22
- [Qemu-devel] [PATCH v2 12/14] block: Clamp BlockBackend requests, Max Reitz, 2015/01/22
- [Qemu-devel] [PATCH v2 06/14] qemu-img: Use blk_new_open() in img_rebase(), Max Reitz, 2015/01/22
- [Qemu-devel] [PATCH v2 13/14] block: Remove "growable" from BDS, Max Reitz, 2015/01/22