[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/28] ahci: Fix cpu_physical_memory_unmap() argumen
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 10/28] ahci: Fix cpu_physical_memory_unmap() argument ordering |
Date: |
Mon, 31 Jan 2011 16:28:58 +0100 |
From: Stefan Hajnoczi <address@hidden>
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 <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
hw/ide/ahci.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
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
- [Qemu-devel] [PULL 00/28] Block patches, Kevin Wolf, 2011/01/31
- [Qemu-devel] [PATCH 01/28] strtosz(): use unsigned char and switch to qemu_isspace(), Kevin Wolf, 2011/01/31
- [Qemu-devel] [PATCH 04/28] strtosz(): Use suffix macros in switch() statement, Kevin Wolf, 2011/01/31
- [Qemu-devel] [PATCH 02/28] strtosz() use qemu_toupper() to simplify switch statement, Kevin Wolf, 2011/01/31
- [Qemu-devel] [PATCH 07/28] virtio-blk: tell the guest about size changes, Kevin Wolf, 2011/01/31
- [Qemu-devel] [PATCH 03/28] strtosz(): Fix name confusion in use of modf(), Kevin Wolf, 2011/01/31
- [Qemu-devel] [PATCH 12/28] sheepdog: support creating images on remote hosts, Kevin Wolf, 2011/01/31
- [Qemu-devel] [PATCH 05/28] block: add block_resize monitor command, Kevin Wolf, 2011/01/31
- [Qemu-devel] [PATCH 08/28] virtio-pci: Disable virtio-ioeventfd when !CONFIG_IOTHREAD, Kevin Wolf, 2011/01/31
- [Qemu-devel] [PATCH 10/28] ahci: Fix cpu_physical_memory_unmap() argument ordering,
Kevin Wolf <=
- [Qemu-devel] [PATCH 18/28] qcow2-refcount: remove write-only variables, Kevin Wolf, 2011/01/31
- [Qemu-devel] [PATCH 15/28] qed: Images with backing file do not require QED_F_NEED_CHECK, Kevin Wolf, 2011/01/31
- [Qemu-devel] [PATCH 11/28] Reorganize struct Qcow2Cache for better struct packing, Kevin Wolf, 2011/01/31
- [Qemu-devel] [PATCH 14/28] qcow2: Add bdrv_discard support, Kevin Wolf, 2011/01/31
- [Qemu-devel] [PATCH 17/28] scsi hotplug: Set DriveInfo member bus correctly, Kevin Wolf, 2011/01/31
- [Qemu-devel] [PATCH 16/28] raw-win32: Fix bdrv_flush return value, Kevin Wolf, 2011/01/31
- [Qemu-devel] [PATCH 24/28] blockdev: Factor drive_index_to_{bus, unit}_id out of drive_init(), Kevin Wolf, 2011/01/31
- [Qemu-devel] [PATCH 27/28] blockdev: Replace drive_add()'s fmt, ... by optstr parameter, Kevin Wolf, 2011/01/31
- [Qemu-devel] [PATCH 25/28] blockdev: New drive_get_by_index(), Kevin Wolf, 2011/01/31
- [Qemu-devel] [PATCH 28/28] blockdev: Fix drive_add for drives without media, Kevin Wolf, 2011/01/31