From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=36175 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pi2Zc-0004GU-NE for qemu-devel@nongnu.org; Wed, 26 Jan 2011 05:26:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pi2Yu-000810-Nd for qemu-devel@nongnu.org; Wed, 26 Jan 2011 05:25:19 -0500 Received: from mtagate6.uk.ibm.com ([194.196.100.166]:47978) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pi2Yu-00080g-DK for qemu-devel@nongnu.org; Wed, 26 Jan 2011 05:25:16 -0500 Received: from d06nrmr1806.portsmouth.uk.ibm.com (d06nrmr1806.portsmouth.uk.ibm.com [9.149.39.193]) by mtagate6.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p0QAPCYw023204 for ; Wed, 26 Jan 2011 10:25:12 GMT Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by d06nrmr1806.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p0QAPFOa1691728 for ; Wed, 26 Jan 2011 10:25:15 GMT Received: from d06av09.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p0QAPCfb015586 for ; Wed, 26 Jan 2011 03:25:12 -0700 From: Stefan Hajnoczi Date: Wed, 26 Jan 2011 10:24:56 +0000 Message-Id: <1296037496-15429-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH] ahci: Fix cpu_physical_memory_unmap() argument ordering List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Alexander Graf , Stefan Hajnoczi The len and is_write arguments to cpu_physical_memory_unmap() were swapped. This patch changes calls to use the correct argument ordering. Signed-off-by: Stefan Hajnoczi --- hw/ide/ahci.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) Rebased on qemu.git/master. diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 968fdce..433171c 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -513,12 +513,12 @@ static void map_page(uint8_t **ptr, uint64_t addr, uint32_t wanted) target_phys_addr_t len = wanted; if (*ptr) { - cpu_physical_memory_unmap(*ptr, 1, len, len); + cpu_physical_memory_unmap(*ptr, len, 1, len); } *ptr = cpu_physical_memory_map(addr, &len, 1); if (len < wanted) { - cpu_physical_memory_unmap(*ptr, 1, len, len); + cpu_physical_memory_unmap(*ptr, len, 1, len); *ptr = NULL; } } @@ -956,7 +956,7 @@ static void ahci_write_fis_d2h(AHCIDevice *ad, uint8_t *cmd_fis) ahci_trigger_irq(ad->hba, ad, PORT_IRQ_D2H_REG_FIS); if (cmd_mapped) { - cpu_physical_memory_unmap(cmd_fis, 0, cmd_len, cmd_len); + cpu_physical_memory_unmap(cmd_fis, cmd_len, 0, cmd_len); } } @@ -1002,7 +1002,7 @@ static int ahci_populate_sglist(AHCIDevice *ad, QEMUSGList *sglist) } out: - cpu_physical_memory_unmap(prdt, 0, prdt_len, prdt_len); + cpu_physical_memory_unmap(prdt, prdt_len, 0, prdt_len); return r; } @@ -1228,7 +1228,7 @@ static int handle_cmd(AHCIState *s, int port, int slot) } out: - cpu_physical_memory_unmap(cmd_fis, 1, cmd_len, cmd_len); + cpu_physical_memory_unmap(cmd_fis, cmd_len, 1, cmd_len); if (s->dev[port].port.ifs[0].status & (BUSY_STAT|DRQ_STAT)) { /* async command, complete later */ -- 1.7.2.3