]> git.proxmox.com Git - mirror_qemu.git/commitdiff
ide: drop argument to dma_buf_commit
authorPaolo Bonzini <pbonzini@redhat.com>
Thu, 15 Dec 2011 14:11:16 +0000 (15:11 +0100)
committerStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Fri, 16 Dec 2011 09:53:38 +0000 (09:53 +0000)
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>
hw/ide/core.c

index 49847bd3ea559e321a833e284782b3f7144a0d0e..753c442bd5da6f621617c38cac748a72080e6435 100644 (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;