diff options
| author | Anthony Liguori | 2012-03-28 19:46:39 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2012-03-28 19:46:39 +0200 |
| commit | cbd5979bb2ca8609ef19ebdfdc46043c46f0b42e (patch) | |
| tree | 0891d9c797563eee368abcbf23de238d181078b0 | |
| parent | Merge remote-tracking branch 'sstabellini/xen-fixes' into staging (diff) | |
| parent | xen_disk: when using AIO flush after the operation is completed (diff) | |
| download | qemu-cbd5979bb2ca8609ef19ebdfdc46043c46f0b42e.tar.gz qemu-cbd5979bb2ca8609ef19ebdfdc46043c46f0b42e.tar.xz qemu-cbd5979bb2ca8609ef19ebdfdc46043c46f0b42e.zip | |
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
| -rw-r--r-- | hw/xen_disk.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/xen_disk.c b/hw/xen_disk.c index bf06fc1978..9719395b09 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -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; } |