aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2011-12-15 15:11:16 +0100
committerStefan Hajnoczi <stefanha@linux.vnet.ibm.com>2011-12-16 09:53:38 +0000
commitb61744b391e9184ac49c52f7eb42722507cc76ee (patch)
tree9b57b0a72c018878db114c64832b40dddb8dafcd
parent5ab97b7f81dccccee03a3f1d03a4d09a27f0eeff (diff)
ide: drop argument to dma_buf_commit
The argument is unused and even wrong when the function is called by ide_handle_rw_error. Drop it. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
-rw-r--r--hw/ide/core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 49847bd3ea..753c442bd5 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -493,7 +493,7 @@ void ide_sector_read(IDEState *s)
}
}
-static void dma_buf_commit(IDEState *s, int is_write)
+static void dma_buf_commit(IDEState *s)
{
qemu_sglist_destroy(&s->sg);
}
@@ -532,7 +532,7 @@ static int ide_handle_rw_error(IDEState *s, int error, int op)
bdrv_iostatus_set_err(s->bs, error);
} else {
if (op & BM_STATUS_DMA_RETRY) {
- dma_buf_commit(s, 0);
+ dma_buf_commit(s);
ide_dma_error(s);
} else {
ide_rw_error(s);
@@ -566,7 +566,7 @@ handle_rw_error:
n = s->io_buffer_size >> 9;
sector_num = ide_get_sector(s);
if (n > 0) {
- dma_buf_commit(s, ide_cmd_is_read(s));
+ dma_buf_commit(s);
sector_num += n;
ide_set_sector(s, sector_num);
s->nsector -= n;