Revision ad717139 hw/xen_disk.c

b/hw/xen_disk.c
634 634 
    if (!blkdev->dinfo) {
635 635 
        /* setup via xenbus -> create new block driver instance */
636 636 
        xen_be_printf(&blkdev->xendev, 2, "create new bdrv (xenbus setup)\n");
637 
	blkdev->bs = bdrv_new(blkdev->dev);
638 
	if (blkdev->bs) {
639 
	    if (bdrv_open(blkdev->bs, blkdev->filename, qflags,
640 
                           bdrv_find_whitelisted_format(blkdev->fileproto))
641 
                != 0) {
642 
		bdrv_delete(blkdev->bs);
643 
		blkdev->bs = NULL;
644 
	    }
645 
	}
646 
	if (!blkdev->bs)
647 
	    return -1;
637 
        blkdev->bs = bdrv_new(blkdev->dev);
638 
        if (bdrv_open(blkdev->bs, blkdev->filename, qflags,
639 
                      bdrv_find_whitelisted_format(blkdev->fileproto)) != 0) {
640 
            bdrv_delete(blkdev->bs);
641 
            return -1;
642 
        }
648 643 
    } else {
649 644 
        /* setup via qemu cmdline -> already setup for us */
650 645 
        xen_be_printf(&blkdev->xendev, 2, "get configured bdrv (cmdline setup)\n");

Also available in: Unified diff