[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/23] ide: kill ide_dma_submit_check
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 08/23] ide: kill ide_dma_submit_check |
Date: |
Mon, 24 Jan 2011 22:10:37 +0100 |
From: Christoph Hellwig <address@hidden>
Merge ide_dma_submit_check into it's only caller. Also use tail recursion
using a goto instead of a real recursion - this avoid overflowing the
stack in the pathological situation of an recurring error that is ignored.
We'll still be busy looping in ide_dma_cb, but at least won't eat up
all stack space after this.
Signed-off-by: Christoph Hellwig <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
hw/ide/core.c | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 12b9c53..e698c13 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -321,14 +321,6 @@ static inline void ide_abort_command(IDEState *s)
s->error = ABRT_ERR;
}
-static inline void ide_dma_submit_check(IDEState *s,
- BlockDriverCompletionFunc *dma_cb)
-{
- if (s->bus->dma->aiocb)
- return;
- dma_cb(s, -1);
-}
-
/* prepare data transfer and tell what to do after */
static void ide_transfer_start(IDEState *s, uint8_t *buf, int size,
EndTransferFunc *end_transfer_func)
@@ -493,6 +485,7 @@ void ide_dma_cb(void *opaque, int ret)
int n;
int64_t sector_num;
+handle_rw_error:
if (ret < 0) {
int op = BM_STATUS_DMA_RETRY;
@@ -538,7 +531,11 @@ void ide_dma_cb(void *opaque, int ret)
s->bus->dma->aiocb = dma_bdrv_write(s->bs, &s->sg, sector_num,
ide_dma_cb, s);
}
- ide_dma_submit_check(s, ide_dma_cb);
+
+ if (!s->bus->dma->aiocb) {
+ ret = -1;
+ goto handle_rw_error;
+ }
return;
eot:
--
1.7.2.3
- [Qemu-devel] [PULL 00/23] Block patches, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 01/23] qcow2: fix unaligned access, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 02/23] qemu-img snapshot: Use writeback caching, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 03/23] do_snapshot_blkdev() error on missing snapshot_file argument, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 04/23] Make strtosz() return int64_t instead of ssize_t, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 05/23] Avoid divide by zero when there is no block device to migrate, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 06/23] ide: factor dma handling helpers, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 07/23] ide: also reset io_buffer_index for writes, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 08/23] ide: kill ide_dma_submit_check,
Kevin Wolf <=
- [Qemu-devel] [PATCH 09/23] qcow2: Add QcowCache, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 11/23] qcow2: Batch flushes for COW, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 10/23] qcow2: Use QcowCache, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 12/23] ide: Remove unneeded null pointer check, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 13/23] Documentation: Add qemu-img check/rebase, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 14/23] qed: Refuse to create images on block devices, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 15/23] Fix block migration when the device size is not a multiple of 1 MB, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 16/23] blockdev: Fix error message for invalid -drive CHS, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 17/23] blockdev: Make drive_init() use error_report(), Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 18/23] blockdev: Fix drive_del not to crash when drive is not in use, Kevin Wolf, 2011/01/24