openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Paolo Bonzini 2011-12-15 15:11:16 +01:00 committed by Stefan Hajnoczi
parent 5ab97b7f81
commit b61744b391
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/ide/core.c
View File

@ -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;