diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2011-03-21 21:28:19 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2011-03-21 21:28:19 +0100 |
| commit | 32465727627711ff3e1cde6777a014413c3cb9ee (patch) | |
| tree | 8564302dab9b2939e556ad01e369cf1712485eb7 /hw/xen_disk.c | |
| parent | cc4e8741ccdaa905017f3c7c59e14c685a239c2d (diff) | |
| parent | 03feae73056ba3223151c31871860e30630645ac (diff) | |
Merge branch 'for-anthony' of git://repo.or.cz/qemu/kevin
* 'for-anthony' of git://repo.or.cz/qemu/kevin:
Add qcow2 documentation
hw/xen_disk: aio_inflight not released in handling ioreq when nr_segments==0
Improve error handling in do_snapshot_blkdev()
Fix ATA SMART and CHECK POWER MODE
Don't allow multiwrites against a block device without underlying medium
tools: Use real async.c instead of stubs
Add error message for loading snapshot without VM state
block/qcow: Don't ignore immediate read/write and other failures
block/vdi: Don't ignore immediate read/write failures
Diffstat (limited to 'hw/xen_disk.c')
| -rw-r--r-- | hw/xen_disk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xen_disk.c b/hw/xen_disk.c index ed9e5eb4d7..445bf03aa0 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -408,9 +408,9 @@ static int ioreq_runio_qemu_aio(struct ioreq *ioreq) break; case BLKIF_OP_WRITE: case BLKIF_OP_WRITE_BARRIER: - ioreq->aio_inflight++; if (!ioreq->req.nr_segments) break; + ioreq->aio_inflight++; bdrv_aio_writev(blkdev->bs, ioreq->start / BLOCK_SIZE, &ioreq->v, ioreq->v.size / BLOCK_SIZE, qemu_aio_complete, ioreq); |