Commit 9a925356 authored by Max Reitz's avatar Max Reitz Committed by Stefan Hajnoczi
Browse files

block/xen: Use blk_new_open() in blk_connect() 



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: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-id: 1423162705-32065-7-git-send-email-mreitz@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent e4342ce5

hw/block/xen_disk.c

+11 −16
Original line number Diff line number Diff line
@@ -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");