diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-20 11:01:10 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-20 11:01:10 -0600 |
| commit | 8b17ed4caa7e015324a4ecbe3c863e32458d840a (patch) | |
| tree | e323612dffd78dd4cb75f58f731d208c0bf9ffce /hw/ide/pci.c | |
| parent | b54c2873e731dd6fc81a4591cab909633b5a9eab (diff) | |
| parent | cf139388ad5b39228793f34eea99e0ea9a2924aa (diff) | |
Merge remote-tracking branch 'stefanha/block' into staging
# By Kevin Wolf (4) and others
# Via Stefan Hajnoczi
* stefanha/block:
dataplane: support viostor virtio-pci status bit setting
dataplane: avoid reentrancy during virtio_blk_data_plane_stop()
win32-aio: use iov utility functions instead of open-coding them
win32-aio: Fix memory leak
win32-aio: Fix vectored reads
aio: Fix return value of aio_poll()
ide: Remove wrong assertion
block: fix null-pointer bug on error case in block commit
Diffstat (limited to 'hw/ide/pci.c')
| -rw-r--r-- | hw/ide/pci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/ide/pci.c b/hw/ide/pci.c index e6226e3197..59fd53992a 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -311,7 +311,6 @@ void bmdma_cmd_writeb(BMDMAState *bm, uint32_t val) if (bm->bus->dma->aiocb) { bdrv_drain_all(); assert(bm->bus->dma->aiocb == NULL); - assert((bm->status & BM_STATUS_DMAING) == 0); } } else { bm->cur_addr = bm->addr; |