| Submitter | Paolo Bonzini |
|---|---|
| Date | Dec. 15, 2011, 2:11 p.m. |
| Message ID | <1323958276-29225-1-git-send-email-pbonzini@redhat.com> |
| Download | mbox | patch |
| Permalink | /patch/131651/ |
| State | New |
| Headers | show |
Comments
On Thu, Dec 15, 2011 at 03:11:16PM +0100, Paolo Bonzini wrote: > 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> > --- > hw/ide/core.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) Thanks, applied to the trivial patches tree: http://repo.or.cz/w/qemu/stefanha.git/shortlog/refs/heads/trivial-patches Stefan
Patch
diff --git a/hw/ide/core.c b/hw/ide/core.c index de9ed41..56b219b 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); @@ -565,7 +565,7 @@ void ide_dma_cb(void *opaque, int ret) 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;
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> --- hw/ide/core.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)