Commit cbd5979b authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'sstabellini/disk_io' into staging 

* sstabellini/disk_io:
  xen_disk: when using AIO flush after the operation is completed
  xen_disk: open disk with BDRV_O_NOCACHE | BDRV_O_CACHE_WB | BDRV_O_NATIVE_AIO
parents 49e00ba9 d56de074

hw/xen_disk.c

+5 −5
Original line number Diff line number Diff line
@@ -330,6 +330,9 @@ static void qemu_aio_complete(void *opaque, int ret) 
    if (ioreq->aio_inflight > 0) {

        return;

    }

    if (ioreq->postsync) {

        bdrv_flush(ioreq->blkdev->bs);

    }



    ioreq->status = ioreq->aio_errors ? BLKIF_RSP_ERROR : BLKIF_RSP_OKAY;

    ioreq_unmap(ioreq);
@@ -376,9 +379,6 @@ static int ioreq_runio_qemu_aio(struct ioreq *ioreq) 
        goto err;

    }



    if (ioreq->postsync) {

        bdrv_flush(blkdev->bs); /* FIXME: aio_flush() ??? */

    }

    qemu_aio_complete(ioreq, 0);



    return 0;
@@ -584,10 +584,10 @@ static int blk_init(struct XenDevice *xendev) 
    }



    /* read-only ? */

    qflags = BDRV_O_NOCACHE | BDRV_O_CACHE_WB | BDRV_O_NATIVE_AIO;

    if (strcmp(blkdev->mode, "w") == 0) {

        qflags = BDRV_O_RDWR;

        qflags |= BDRV_O_RDWR;

    } else {

        qflags = 0;

        info  |= VDISK_READONLY;

    }