Re: [Qemu-devel] [PATCH 2/5] address_space: replaced function calls
On 2016-03-13 19:56, Mriyam Tamuli wrote:
> replaced calls named cpu_physical_memory_* with address_space_*
Hmm, did you check if the signatures of both calls are identical? If
not, did you try to build the result of the patch? I'm afraid there is a
bit more work to do.
Jan
>
> hw/arm/armv7m.c
> hw/arm/boot.c
> hw/arm/musicpal.c
> hw/arm/nseries.c
> ---
> hw/arm/armv7m.c | 18 +-
> hw/arm/boot.c | 8
> hw/arm/musicpal.c | 14 +++---
> hw/arm/nseries.c | 8
> 4 files changed, 24 insertions(+), 24 deletions(-)
>
> diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
> index ed7d97f..5275e3a 100644
> --- a/hw/arm/armv7m.c
> +++ b/hw/arm/armv7m.c
> @@ -31,7 +31,7 @@ static inline uint32_t bitband_addr(void * opaque, uint32_t
> addr)
> static uint32_t bitband_readb(void *opaque, hwaddr offset)
> {
> uint8_t v;
> -cpu_physical_memory_read(bitband_addr(opaque, offset), , 1);
> +address_space_read(bitband_addr(opaque, offset), , 1);
> return (v & (1 << ((offset >> 2) & 7))) != 0;
> }
>
> @@ -43,12 +43,12 @@ static void bitband_writeb(void *opaque, hwaddr offset,
> uint8_t v;
> addr = bitband_addr(opaque, offset);
> mask = (1 << ((offset >> 2) & 7));
> -cpu_physical_memory_read(addr, , 1);
> +address_space_read(addr, , 1);
> if (value & 1)
> v |= mask;
> else
> v &= ~mask;
> -cpu_physical_memory_write(addr, , 1);
> +address_space_write(addr, , 1);
> }
>
> static uint32_t bitband_readw(void *opaque, hwaddr offset)
> @@ -59,7 +59,7 @@ static uint32_t bitband_readw(void *opaque, hwaddr offset)
> addr = bitband_addr(opaque, offset) & ~1;
> mask = (1 << ((offset >> 2) & 15));
> mask = tswap16(mask);
> -cpu_physical_memory_read(addr, , 2);
> +address_space_read(addr, , 2);
> return (v & mask) != 0;
> }
>
> @@ -72,12 +72,12 @@ static void bitband_writew(void *opaque, hwaddr offset,
> addr = bitband_addr(opaque, offset) & ~1;
> mask = (1 << ((offset >> 2) & 15));
> mask = tswap16(mask);
> -cpu_physical_memory_read(addr, , 2);
> +address_space_read(addr, , 2);
> if (value & 1)
> v |= mask;
> else
> v &= ~mask;
> -cpu_physical_memory_write(addr, , 2);
> +address_space_write(addr, , 2);
> }
>
> static uint32_t bitband_readl(void *opaque, hwaddr offset)
> @@ -88,7 +88,7 @@ static uint32_t bitband_readl(void *opaque, hwaddr offset)
> addr = bitband_addr(opaque, offset) & ~3;
> mask = (1 << ((offset >> 2) & 31));
> mask = tswap32(mask);
> -cpu_physical_memory_read(addr, , 4);
> +address_space_read(addr, , 4);
> return (v & mask) != 0;
> }
>
> @@ -101,12 +101,12 @@ static void bitband_writel(void *opaque, hwaddr offset,
> addr = bitband_addr(opaque, offset) & ~3;
> mask = (1 << ((offset >> 2) & 31));
> mask = tswap32(mask);
> -cpu_physical_memory_read(addr, , 4);
> +address_space_read(addr, , 4);
> if (value & 1)
> v |= mask;
> else
> v &= ~mask;
> -cpu_physical_memory_write(addr, , 4);
> +address_space_write(addr, , 4);
> }
>
> static const MemoryRegionOps bitband_ops = {
> diff --git a/hw/arm/boot.c b/hw/arm/boot.c
> index 8ba0e42..c89b533 100644
> --- a/hw/arm/boot.c
> +++ b/hw/arm/boot.c
> @@ -281,8 +281,8 @@ static void set_kernel_args(const struct arm_boot_info
> *info)
> int cmdline_size;
>
> cmdline_size = strlen(info->kernel_cmdline);
> -cpu_physical_memory_write(p + 8, info->kernel_cmdline,
> - cmdline_size + 1);
> +address_space_write(p + 8, info->kernel_cmdline,
> +cmdline_size + 1);
> cmdline_size = (cmdline_size >> 2) + 1;
> WRITE_WORD(p, cmdline_size + 2);
> WRITE_WORD(p, 0x54410009);
> @@ -296,7 +296,7 @@ static void set_kernel_args(const struct arm_boot_info
> *info)
> atag_board_len = (info->atag_board(info, atag_board_buf) + 3) & ~3;
> WRITE_WORD(p, (atag_board_len + 8) >> 2);
> WRITE_WORD(p, 0x414f4d50);
> -cpu_physical_memory_write(p, atag_board_buf, atag_board_len);
> +address_space_write(p, atag_board_buf, atag_board_len);
> p += atag_board_len;
> }
> /* ATAG_END */
> @@ -372,7 +372,7 @@ static void set_kernel_args_old(const struct
> arm_boot_info *info)
> }
> s = info->kernel_cmdline;
> if (s) {
> -cpu_physical_memory_write(p, s, strlen(s) + 1);
> +address_space_write(p, s, strlen(s) + 1);
> } else {
> WRITE_WORD(p, 0);
> }
> diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
> index 54548f3..e624d51 100644
> --- a/hw/arm/musicpal.c
> +++ b/hw/arm/musicpal.c
> @@ -175,12 +175,12 @@ static void eth_rx_desc_put(uint32_t addr,
> mv88w8618_rx_desc *desc)
> cpu_to_le16s(>buffer_size);
> cpu_to_le32s(>buffer);
> cpu_to_le32s(>next);
> -
[Qemu-devel] [PATCH 2/5] address_space: replaced function calls
replaced calls named cpu_physical_memory_* with address_space_*
hw/arm/armv7m.c
hw/arm/boot.c
hw/arm/musicpal.c
hw/arm/nseries.c
---
hw/arm/armv7m.c | 18 +-
hw/arm/boot.c | 8
hw/arm/musicpal.c | 14 +++---
hw/arm/nseries.c | 8
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index ed7d97f..5275e3a 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -31,7 +31,7 @@ static inline uint32_t bitband_addr(void * opaque, uint32_t
addr)
static uint32_t bitband_readb(void *opaque, hwaddr offset)
{
uint8_t v;
-cpu_physical_memory_read(bitband_addr(opaque, offset), , 1);
+address_space_read(bitband_addr(opaque, offset), , 1);
return (v & (1 << ((offset >> 2) & 7))) != 0;
}
@@ -43,12 +43,12 @@ static void bitband_writeb(void *opaque, hwaddr offset,
uint8_t v;
addr = bitband_addr(opaque, offset);
mask = (1 << ((offset >> 2) & 7));
-cpu_physical_memory_read(addr, , 1);
+address_space_read(addr, , 1);
if (value & 1)
v |= mask;
else
v &= ~mask;
-cpu_physical_memory_write(addr, , 1);
+address_space_write(addr, , 1);
}
static uint32_t bitband_readw(void *opaque, hwaddr offset)
@@ -59,7 +59,7 @@ static uint32_t bitband_readw(void *opaque, hwaddr offset)
addr = bitband_addr(opaque, offset) & ~1;
mask = (1 << ((offset >> 2) & 15));
mask = tswap16(mask);
-cpu_physical_memory_read(addr, , 2);
+address_space_read(addr, , 2);
return (v & mask) != 0;
}
@@ -72,12 +72,12 @@ static void bitband_writew(void *opaque, hwaddr offset,
addr = bitband_addr(opaque, offset) & ~1;
mask = (1 << ((offset >> 2) & 15));
mask = tswap16(mask);
-cpu_physical_memory_read(addr, , 2);
+address_space_read(addr, , 2);
if (value & 1)
v |= mask;
else
v &= ~mask;
-cpu_physical_memory_write(addr, , 2);
+address_space_write(addr, , 2);
}
static uint32_t bitband_readl(void *opaque, hwaddr offset)
@@ -88,7 +88,7 @@ static uint32_t bitband_readl(void *opaque, hwaddr offset)
addr = bitband_addr(opaque, offset) & ~3;
mask = (1 << ((offset >> 2) & 31));
mask = tswap32(mask);
-cpu_physical_memory_read(addr, , 4);
+address_space_read(addr, , 4);
return (v & mask) != 0;
}
@@ -101,12 +101,12 @@ static void bitband_writel(void *opaque, hwaddr offset,
addr = bitband_addr(opaque, offset) & ~3;
mask = (1 << ((offset >> 2) & 31));
mask = tswap32(mask);
-cpu_physical_memory_read(addr, , 4);
+address_space_read(addr, , 4);
if (value & 1)
v |= mask;
else
v &= ~mask;
-cpu_physical_memory_write(addr, , 4);
+address_space_write(addr, , 4);
}
static const MemoryRegionOps bitband_ops = {
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index 8ba0e42..c89b533 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -281,8 +281,8 @@ static void set_kernel_args(const struct arm_boot_info
*info)
int cmdline_size;
cmdline_size = strlen(info->kernel_cmdline);
-cpu_physical_memory_write(p + 8, info->kernel_cmdline,
- cmdline_size + 1);
+address_space_write(p + 8, info->kernel_cmdline,
+cmdline_size + 1);
cmdline_size = (cmdline_size >> 2) + 1;
WRITE_WORD(p, cmdline_size + 2);
WRITE_WORD(p, 0x54410009);
@@ -296,7 +296,7 @@ static void set_kernel_args(const struct arm_boot_info
*info)
atag_board_len = (info->atag_board(info, atag_board_buf) + 3) & ~3;
WRITE_WORD(p, (atag_board_len + 8) >> 2);
WRITE_WORD(p, 0x414f4d50);
-cpu_physical_memory_write(p, atag_board_buf, atag_board_len);
+address_space_write(p, atag_board_buf, atag_board_len);
p += atag_board_len;
}
/* ATAG_END */
@@ -372,7 +372,7 @@ static void set_kernel_args_old(const struct arm_boot_info
*info)
}
s = info->kernel_cmdline;
if (s) {
-cpu_physical_memory_write(p, s, strlen(s) + 1);
+address_space_write(p, s, strlen(s) + 1);
} else {
WRITE_WORD(p, 0);
}
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 54548f3..e624d51 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -175,12 +175,12 @@ static void eth_rx_desc_put(uint32_t addr,
mv88w8618_rx_desc *desc)
cpu_to_le16s(>buffer_size);
cpu_to_le32s(>buffer);
cpu_to_le32s(>next);
-cpu_physical_memory_write(addr, desc, sizeof(*desc));
+address_space_write(addr, desc, sizeof(*desc));
}
static void eth_rx_desc_get(uint32_t addr, mv88w8618_rx_desc *desc)
{
-cpu_physical_memory_read(addr, desc, sizeof(*desc));
+address_space_read(addr, desc, sizeof(*desc));
le32_to_cpus(>cmdstat);
le16_to_cpus(>bytes);
le16_to_cpus(>buffer_size);
@@ -203,8 +203,8 @@ static ssize_t eth_receive(NetClientState *nc, const
uint8_t *buf, size_t size)
