diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index c14a1dd..39bc7fd 100644
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -367,27 +367,21 @@ static void pmac_ide_transfer(DBDMA_io *io)
     s->io_buffer_size = 0;
     if (s->drive_kind == IDE_CD) {
 
+        bdrv_acct_start(s->bs, &s->acct, io->len, BDRV_ACCT_READ);
+
         /* Handle non-block ATAPI DMA transfers */
         if (s->lba == -1) {
-            s->io_buffer_size = MIN(io->len, s->packet_transfer_size);
-            bdrv_acct_start(s->bs, &s->acct, s->io_buffer_size,
-                            BDRV_ACCT_READ);
             MACIO_DPRINTF("non-block ATAPI DMA transfer size: %d\n",
-                          s->io_buffer_size);
+                          io->len);
 
-            /* Copy ATAPI buffer directly to RAM and finish */
+            /* Copy ATAPI buffer directly to RAM */
             cpu_physical_memory_write(io->addr, s->io_buffer,
-                                      s->io_buffer_size);
-            ide_atapi_cmd_ok(s);
-            m->dma_active = false;
-
-            MACIO_DPRINTF("end of non-block ATAPI DMA transfer\n");
-            bdrv_acct_done(s->bs, &s->acct);
-            io->dma_end(io);
-            return;
+                                      io->len);
+
+            /* Finish on next callback */
+            io->len = 0;
         }
 
-        bdrv_acct_start(s->bs, &s->acct, io->len, BDRV_ACCT_READ);
         pmac_ide_atapi_transfer_cb(io, 0);
         return;
     }