Index: uspace/drv/block/ahci/ahci.c
===================================================================
--- uspace/drv/block/ahci/ahci.c	(revision 9904eb90403c954baeba44936b6c146c62a3563d)
+++ uspace/drv/block/ahci/ahci.c	(revision a00d5556cec82c86f4b79c6098d66b715a903bb2)
@@ -527,5 +527,5 @@
 	sata->shadow_pxis.u32 &= ~pxis.u32;
 	
-	if ((sata->invalid_device) || (ahci_port_is_error(pxis))_ {
+	if ((sata->invalid_device) || (ahci_port_is_error(pxis))) {
 		ddf_msg(LVL_ERROR,
 		    "%s: Unrecoverable error during FPDMA read", sata->model);
@@ -622,12 +622,18 @@
 	{
 		/* Disable interrupt - interrupt is deasserted in qemu 1.0.1 */
-		.cmd = CMD_MEM_WRITE_32,
+		.cmd = CMD_PIO_WRITE_32,
 		.addr = NULL,
 		.value = AHCI_GHC_GHC_AE
 	},
 	{
+		.cmd = CMD_PIO_READ_32,
+		.addr = NULL,
+		.dstarg = 1
+	},
+	{
 		/* Clear interrupt status register - for vbox and real hw */
-		.cmd = CMD_MEM_REWRITE_32,
-		.addr = NULL
+		.cmd = CMD_PIO_WRITE_A_32,
+		.addr = NULL,
+		.srcarg = 1
 	},
 	{
@@ -896,4 +902,5 @@
 	ahci_cmds[1].addr =
 	    ((uint32_t *) (size_t) hw_res_parsed.mem_ranges.ranges[0].address) + 2;
+	ahci_cmds[2].addr = ahci_cmds[1].addr;
 	
 	irq_code_t ct;