Commit 908c7b9f authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Blue Swirl
Browse files

xen_disk: move sanity check to the correct place 



Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 70503264

hw/xen_disk.c

+5 −4
Original line number Diff line number Diff line
@@ -179,10 +179,6 @@ static int ioreq_parse(struct ioreq *ioreq) 
    switch (ioreq->req.operation) {

    case BLKIF_OP_READ:

	ioreq->prot = PROT_WRITE; /* to memory */

        if (ioreq->req.operation != BLKIF_OP_READ && blkdev->mode[0] != 'w') {

	    xen_be_printf(&blkdev->xendev, 0, "error: write req for ro device\n");

	    goto err;

	}

	break;

    case BLKIF_OP_WRITE_BARRIER:

	if (!syncwrite)
@@ -199,6 +195,11 @@ static int ioreq_parse(struct ioreq *ioreq) 
	goto err;

    };



    if (ioreq->req.operation != BLKIF_OP_READ && blkdev->mode[0] != 'w') {

        xen_be_printf(&blkdev->xendev, 0, "error: write req for ro device\n");

        goto err;

    }



    ioreq->start = ioreq->req.sector_number * blkdev->file_blk;

    for (i = 0; i < ioreq->req.nr_segments; i++) {

	if (i == BLKIF_MAX_SEGMENTS_PER_REQUEST) {