* [Qemu-devel] [PATCH] ahci: Fix cpu_physical_memory_unmap() argument ordering
@ 2011-01-26 10:24 Stefan Hajnoczi
2011-01-26 12:05 ` [Qemu-devel] " Kevin Wolf
0 siblings, 1 reply; 3+ messages in thread
From: Stefan Hajnoczi @ 2011-01-26 10:24 UTC (permalink / raw)
To: qemu-devel; +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 <stefanha@linux.vnet.ibm.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Qemu-devel] Re: [PATCH] ahci: Fix cpu_physical_memory_unmap() argument ordering
2011-01-26 10:24 [Qemu-devel] [PATCH] ahci: Fix cpu_physical_memory_unmap() argument ordering Stefan Hajnoczi
@ 2011-01-26 12:05 ` Kevin Wolf
0 siblings, 0 replies; 3+ messages in thread
From: Kevin Wolf @ 2011-01-26 12:05 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Alexander Graf
Am 26.01.2011 11:24, schrieb 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 <stefanha@linux.vnet.ibm.com>
Thanks, applied to the block branch.
Kevin
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Qemu-devel] Re: [PATCH] ahci: Fix cpu_physical_memory_unmap() argument ordering
2010-12-23 8:53 [Qemu-devel] " Stefan Hajnoczi
@ 2010-12-23 10:43 ` Alexander Graf
0 siblings, 0 replies; 3+ messages in thread
From: Alexander Graf @ 2010-12-23 10:43 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel
On 23.12.2010, at 09:53, Stefan Hajnoczi wrote:
> 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 <stefanha@linux.vnet.ibm.com>
Ouch :).
Acked-by: Alexander Graf <agraf@suse.de>
Alex
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-01-26 12:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-26 10:24 [Qemu-devel] [PATCH] ahci: Fix cpu_physical_memory_unmap() argument ordering Stefan Hajnoczi
2011-01-26 12:05 ` [Qemu-devel] " Kevin Wolf
-- strict thread matches above, loose matches on Subject: below --
2010-12-23 8:53 [Qemu-devel] " Stefan Hajnoczi
2010-12-23 10:43 ` [Qemu-devel] " Alexander Graf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.