diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-04-05 00:18:19 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-04-05 00:18:19 +0100 |
| commit | 8ae60ee85ceaea6bfc4c62fb8ed180a1ba8010a5 (patch) | |
| tree | 6af18d5958af66edb12948805bfe3bf01516ffa6 /dma-helpers.c | |
| parent | bae2c270906475093e3d5f4c3103dbe67bf82009 (diff) | |
| parent | 54bee5c2b487250dcb8631ddff4307f329ec0541 (diff) | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block patches for 2.0.0
# gpg: Signature made Fri 04 Apr 2014 20:25:08 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
dataplane: replace iothread object_add() with embedded instance
iothread: make IOThread struct definition public
dma-helpers: Initialize DMAAIOCB in_cancel flag
block: Check bdrv_getlength() return value in bdrv_append_temp_snapshot()
block: Fix snapshot=on for protocol parsed from filename
qemu-iotests: Remove CR line endings in reference output
block: Don't parse 'filename' option
qcow2: Put cache reference in error case
qcow2: Flush metadata during read-only reopen
iscsi: Don't set error if already set in iscsi_do_inquiry
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'dma-helpers.c')
| -rw-r--r-- | dma-helpers.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/dma-helpers.c b/dma-helpers.c index c9620a5bbd..5f421e9814 100644 --- a/dma-helpers.c +++ b/dma-helpers.c @@ -213,6 +213,7 @@ BlockDriverAIOCB *dma_bdrv_io( dbs->sg_cur_index = 0; dbs->sg_cur_byte = 0; dbs->dir = dir; + dbs->in_cancel = false; dbs->io_func = io_func; dbs->bh = NULL; qemu_iovec_init(&dbs->iov, sg->nsg); |