[Qemu-devel] [PATCH v2 01/13] Use unsigned types for the 'len' argument of all memory read/write functions

[Qemu-devel] [PATCH v2 01/13] Use unsigned types for the 'len' argument of all memory read/write functions

[Martin Galvan]

---
 cpus.c                    |  2 +-
 exec.c                    | 29 +++++++++++++++--------------
 include/exec/cpu-all.h    |  2 +-
 include/exec/cpu-common.h | 10 +++++-----
 include/exec/memory.h     | 10 +++++-----
 kvm-all.c                 |  2 +-
 6 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/cpus.c b/cpus.c
index 9592163..e7aa8cc 100644
--- a/cpus.c
+++ b/cpus.c
@@ -1602,7 +1602,7 @@ void qmp_memsave(int64_t addr, int64_t size, const char *filename,
                  bool has_cpu, int64_t cpu_index, Error **errp)
 {
     FILE *f;
-    uint32_t l;
+    size_t l;
     CPUState *cpu;
     uint8_t buf[1024];
     int64_t orig_addr = addr, orig_size = size;
diff --git a/exec.c b/exec.c
index c62c439..b5c26d6 100644
--- a/exec.c
+++ b/exec.c
@@ -2458,9 +2458,10 @@ MemoryRegion *get_system_io(void)
 /* physical memory access (slow version, mainly for debug) */
 #if defined(CONFIG_USER_ONLY)
 int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr,
-                        uint8_t *buf, int len, int is_write)
+                        uint8_t *buf, size_t len, int is_write)
 {
-    int l, flags;
+    size_t l;
+    int flags;
     target_ulong page;
     void * p;

@@ -2517,7 +2518,7 @@ static void invalidate_and_set_dirty(MemoryRegion *mr, hwaddr addr,
     cpu_physical_memory_set_dirty_range(addr, length, dirty_log_mask);
 }

-static int memory_access_size(MemoryRegion *mr, unsigned l, hwaddr addr)
+static hwaddr memory_access_size(MemoryRegion *mr, size_t l, hwaddr addr)
 {
     unsigned access_size_max = mr->ops->valid.max_access_size;

@@ -2571,7 +2572,7 @@ static bool prepare_mmio_access(MemoryRegion *mr)
 static MemTxResult address_space_write_continue(AddressSpace *as, hwaddr addr,
                                                 MemTxAttrs attrs,
                                                 const uint8_t *buf,
-                                                int len, hwaddr addr1,
+                                                size_t len, hwaddr addr1,
                                                 hwaddr l, MemoryRegion *mr)
 {
     uint8_t *ptr;
@@ -2642,7 +2643,7 @@ static MemTxResult address_space_write_continue(AddressSpace *as, hwaddr addr,
 }

 MemTxResult address_space_write(AddressSpace *as, hwaddr addr, MemTxAttrs attrs,
-                                const uint8_t *buf, int len)
+                                const uint8_t *buf, size_t len)
 {
     hwaddr l;
     hwaddr addr1;
@@ -2664,7 +2665,7 @@ MemTxResult address_space_write(AddressSpace *as, hwaddr addr, MemTxAttrs attrs,
 /* Called within RCU critical section.  */
 MemTxResult address_space_read_continue(AddressSpace *as, hwaddr addr,
                                         MemTxAttrs attrs, uint8_t *buf,
-                                        int len, hwaddr addr1, hwaddr l,
+                                        size_t len, hwaddr addr1, hwaddr l,
                                         MemoryRegion *mr)
 {
     uint8_t *ptr;
@@ -2732,7 +2733,7 @@ MemTxResult address_space_read_continue(AddressSpace *as, hwaddr addr,
 }

 MemTxResult address_space_read_full(AddressSpace *as, hwaddr addr,
-                                    MemTxAttrs attrs, uint8_t *buf, int len)
+                                    MemTxAttrs attrs, uint8_t *buf, size_t len)
 {
     hwaddr l;
     hwaddr addr1;
@@ -2752,7 +2753,7 @@ MemTxResult address_space_read_full(AddressSpace *as, hwaddr addr,
 }

 MemTxResult address_space_rw(AddressSpace *as, hwaddr addr, MemTxAttrs attrs,
-                             uint8_t *buf, int len, bool is_write)
+                             uint8_t *buf, size_t len, bool is_write)
 {
     if (is_write) {
         return address_space_write(as, addr, attrs, (uint8_t *)buf, len);
@@ -2762,7 +2763,7 @@ MemTxResult address_space_rw(AddressSpace *as, hwaddr addr, MemTxAttrs attrs,
 }

 void cpu_physical_memory_rw(hwaddr addr, uint8_t *buf,
-                            int len, int is_write)
+                            size_t len, int is_write)
 {
     address_space_rw(&address_space_memory, addr, MEMTXATTRS_UNSPECIFIED,
                      buf, len, is_write);
@@ -2812,12 +2813,12 @@ static inline void cpu_physical_memory_write_rom_internal(AddressSpace *as,

 /* used for ROM loading : can write in RAM and ROM */
 void cpu_physical_memory_write_rom(AddressSpace *as, hwaddr addr,
-                                   const uint8_t *buf, int len)
+                                   const uint8_t *buf, size_t len)
 {
     cpu_physical_memory_write_rom_internal(as, addr, buf, len, WRITE_DATA);
 }

-void cpu_flush_icache_range(hwaddr start, int len)
+void cpu_flush_icache_range(hwaddr star t, size_t len)
 {
     /*
      * This function should do the same thing as an icache flush that was
@@ -3661,14 +3662,14 @@ void stq_be_phys(AddressSpace *as, hwaddr addr, uint64_t val)

 /* virtual memory access for debug (includes writing to ROM) */
 int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr,
-                        uint8_t *buf, int len, int is_write)
+                        uint8_t *buf, size_t len, int is_write)
 {
-    int l;
+    size_t l;
     hwaddr phys_addr;
     target_ulong page;

     while (len > 0) {
-        int asidx;
+        hwaddr asidx;
         MemTxAttrs attrs;

         page = addr & TARGET_PAGE_MASK;
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index 08e5093..c824d5f 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -282,6 +282,6 @@ void dump_opcount_info(FILE *f, fprintf_function cpu_fprintf);
 #endif /* !CONFIG_USER_ONLY */

 int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr,
-                        uint8_t *buf, int len, int is_write);
+                        uint8_t *buf, size_t len, int is_write);

 #endif /* CPU_ALL_H */
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index a0ad2ac..f413387 100644
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -71,14 +71,14 @@ void qemu_ram_unset_idstr(ram_addr_t addr);
 const char *qemu_ram_get_idstr(RAMBlock *rb);

 void cpu_physical_memory_rw(hwaddr addr, uint8_t *buf,
-                            int len, int is_write);
+                            size_t len, int is_write);
 static inline void cpu_physical_memory_read(hwaddr addr,
-                                            void *buf, int len)
+                                            void *buf, size_t len)
 {
     cpu_physical_memory_rw(addr, buf, len, 0);
 }
 static inline void cpu_physical_memory_write(hwaddr addr,
-                                             const void *buf, int len)
+                                             const void *buf, size_t len)
 {
     cpu_physical_memory_rw(addr, (void *)buf, len, 1);
 }
@@ -125,8 +125,8 @@ void stq_phys(AddressSpace *as, hwaddr addr, uint64_t val);
 #endif

 void cpu_physical_memory_write_rom(AddressSpace *as, hwaddr addr,
-                                   const uint8_t *buf, int len);
-void cpu_flush_icache_range(hwaddr start, int len);
+                                   const uint8_t *buf, size_t len);
+void cpu_flush_icache_range(hwaddr start, size_t len);

 extern struct MemoryRegion io_mem_rom;
 extern struct MemoryRegion io_mem_notdirty;
diff --git a/include/exec/memory.h b/include/exec/memory.h
index d5284c2..a4d34f1 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -1233,7 +1233,7 @@ void address_space_destroy(AddressSpace *as);
  */
 MemTxResult address_space_rw(AddressSpace *as, hwaddr addr,
                              MemTxAttrs attrs, uint8_t *buf,
-                             int len, bool is_write);
+                             size_t len, bool is_write);

 /**
  * address_space_write: write to address space.
@@ -1249,7 +1249,7 @@ MemTxResult address_space_rw(AddressSpace *as, hwaddr addr,
  */
 MemTxResult address_space_write(AddressSpace *as, hwaddr addr,
                                 MemTxAttrs attrs,
-                                const uint8_t *buf, int len);
+                                const uint8_t *buf, size_t len);

 /* address_space_ld*: load from an address space
  * address_space_st*: store to an address space
@@ -1384,10 +1384,10 @@ void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len,
 /* Internal functions, part of the implementation of address_space_read.  */
 MemTxResult address_space_read_continue(AddressSpace *as, hwaddr addr,
                                         MemTxAttrs attrs, uint8_t *buf,
-                                        int len, hwaddr addr1, hwaddr l,
+                                        size_t len, hwaddr addr1, size_t l,
 					MemoryRegion *mr);
 MemTxResult address_space_read_full(AddressSpace *as, hwaddr addr,
-                                    MemTxAttrs attrs, uint8_t *buf, int len);
+                                    MemTxAttrs attrs, uint8_t *buf, size_t len);
 void *qemu_get_ram_ptr(RAMBlock *ram_block, ram_addr_t addr);

 static inline bool memory_access_is_direct(MemoryRegion *mr, bool is_write)
@@ -1413,7 +1413,7 @@ static inline bool memory_access_is_direct(MemoryRegion *mr, bool is_write)
  */
 static inline __attribute__((__always_inline__))
 MemTxResult address_space_read(AddressSpace *as, hwaddr addr, MemTxAttrs attrs,
-                               uint8_t *buf, int len)
+                               uint8_t *buf, size_t len)
 {
     MemTxResult result = MEMTX_OK;
     hwaddr l, addr1;
diff --git a/kvm-all.c b/kvm-all.c
index a65e73f..14098b6 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1703,7 +1703,7 @@ void kvm_set_sigmask_len(KVMState *s, unsigned int sigmask_len)
 }

 static void kvm_handle_io(uint16_t port, MemTxAttrs attrs, void *data, int direction,
-                          int size, uint32_t count)
+                          size_t size, uint32_t count)
 {
     int i;
     uint8_t *ptr = data;
--
1.9.1

[Qemu-devel] [PATCH v2 02/13] Use unsigned types for the 'len' argument of all memory read/write functions

[Martin Galvan]

---
 disas/s390.c              | 3 ++-
 hw/s390x/virtio-ccw.c     | 2 +-
 target-s390x/mmu_helper.c | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/disas/s390.c b/disas/s390.c
index 1f167d2..fff6135 100644
--- a/disas/s390.c
+++ b/disas/s390.c
@@ -287,7 +287,8 @@ print_insn_s390 (bfd_vma memaddr, struct disassemble_info *info)
   const struct s390_opcode *opcode;
   const struct s390_opcode *opcode_end;
   unsigned int value;
-  int status, opsize, bufsize;
+  int status;
+  size_t opsize, bufsize;
   char separator;

   if (init_flag == 0)
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 74b9e2e..6fe88cd 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -427,7 +427,7 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw)
     VirtioCcwDevice *dev = sch->driver_data;
     VirtIODevice *vdev = virtio_ccw_get_vdev(sch);
     bool check_len;
-    int len;
+    size_t len;
     hwaddr hw_len;
     VirtioThinintInfo *thinint;

diff --git a/target-s390x/mmu_helper.c b/target-s390x/mmu_helper.c
index 5323c53..07654a1 100644
--- a/target-s390x/mmu_helper.c
+++ b/target-s390x/mmu_helper.c
@@ -422,7 +422,7 @@ static bool lowprot_enabled(const CPUS390XState *env)
  * translate_pages: Translate a set of consecutive logical page addresses
  * to absolute addresses
  */
-static int translate_pages(S390CPU *cpu, vaddr addr, int nr_pages,
+static int translate_pages(S390CPU *cpu, vaddr addr, size_t nr_pages,
                            target_ulong *pages, bool is_write)
 {
     bool lowprot = is_write && lowprot_enabled(&cpu->env);
@@ -466,7 +466,7 @@ static int translate_pages(S390CPU *cpu, vaddr addr, int nr_pages,
 int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *hostbuf,
                          int len, bool is_write)
 {
-    int currlen, nr_pages, i;
+    size_t currlen, nr_pages, i;
     target_ulong *pages;
     int ret;

--
2.7.1

Re: [Qemu-devel] [PATCH v2 02/13] Use unsigned types for the 'len' argument of all memory read/write functions

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 522 bytes --]

On 03/01/2016 08:57 AM, Martin Galvan wrote:

Missing S-o-b. Patch subject line is identical to 1/13, which is a no-no
(if I'm backporting a patch, I want the subject line to be sufficient to
determine which patch I'm backporting, and not give me 13 candidates);
please resubmit the series with distinct subject lines (adding an
appropriate prefix for each maintainer that you are targetting will help).

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

[Qemu-devel] [PATCH v2 03/13] Use unsigned types for the 'len' argument of all memory read/write functions

[Martin Galvan]

---
 disas/cris.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/disas/cris.c b/disas/cris.c
index 7f35bc0..241db56 100644
--- a/disas/cris.c
+++ b/disas/cris.c
@@ -2555,7 +2555,7 @@ print_insn_cris_generic (bfd_vma memaddr,
 			 disassemble_info *info,
 			 bfd_boolean with_reg_prefix)
 {
-  int nbytes;
+  size_t nbytes;
   unsigned int insn;
   const struct cris_opcode *matchedp;
   int advance = 0;
--
2.7.1

[Qemu-devel] [PATCH v2 04/13] Use unsigned types for the 'len' argument of all memory read/write functions

[Martin Galvan]

---
 disas/sh4.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/disas/sh4.c b/disas/sh4.c
index 8b0415d..24653a4 100644
--- a/disas/sh4.c
+++ b/disas/sh4.c
@@ -2031,7 +2031,7 @@ print_insn_sh (bfd_vma memaddr, struct disassemble_info *info)

       if (disp_pc && strcmp (op->name, "mova") != 0)
 	{
-	  int size;
+	  size_t size;
 	  bfd_byte bytes[4];

 	  if (relmask == ~(bfd_vma) 1)
--
2.7.1

[Qemu-devel] [PATCH v2 05/13] Use unsigned types for the 'len' argument of all memory read/write functions

[Martin Galvan]

---
 hw/arm/boot.c     | 2 +-
 hw/arm/musicpal.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index 0a56d34c..4dd18f6 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -290,7 +290,7 @@ static void set_kernel_args(const struct arm_boot_info *info)
     }
     if (info->atag_board) {
         /* ATAG_BOARD */
-        int atag_board_len;
+        size_t atag_board_len;
         uint8_t atag_board_buf[0x1000];

         atag_board_len = (info->atag_board(info, atag_board_buf) + 3) & ~3;
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 54548f3..5208e13 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -248,7 +248,7 @@ static void eth_send(mv88w8618_eth_state *s, int queue_index)
     mv88w8618_tx_desc desc;
     uint32_t next_desc;
     uint8_t buf[2048];
-    int len;
+    size_t len;

     do {
         eth_tx_desc_get(desc_addr, &desc);
--
2.7.1

[Qemu-devel] [PATCH v2 06/13] Use unsigned types for the 'len' argument of all memory read/write functions

[Martin Galvan]

---
 hw/audio/marvell_88w8618.c | 2 +-
 hw/audio/milkymist-ac97.c  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c
index a6ca180..c4edf99 100644
--- a/hw/audio/marvell_88w8618.c
+++ b/hw/audio/marvell_88w8618.c
@@ -64,7 +64,7 @@ static void mv88w8618_audio_callback(void *opaque, int free_out, int free_in)
     int16_t *codec_buffer;
     int8_t buf[4096];
     int8_t *mem_buffer;
-    int pos, block_size;
+    size_t pos, block_size;

     if (!(s->playback_mode & MP_AUDIO_PLAYBACK_EN)) {
         return;
diff --git a/hw/audio/milkymist-ac97.c b/hw/audio/milkymist-ac97.c
index 6a3b536..67639c6 100644
--- a/hw/audio/milkymist-ac97.c
+++ b/hw/audio/milkymist-ac97.c
@@ -195,7 +195,7 @@ static void ac97_in_cb(void *opaque, int avail_b)
     }

     while (temp) {
-        int acquired, to_copy;
+        size_t acquired, to_copy;

         to_copy = audio_MIN(temp, sizeof(buf));
         acquired = AUD_read(s->voice_in, buf, to_copy);
@@ -238,7 +238,7 @@ static void ac97_out_cb(void *opaque, int free_b)
     }

     while (temp) {
-        int copied, to_copy;
+        size_t copied, to_copy;

         to_copy = audio_MIN(temp, sizeof(buf));
         cpu_physical_memory_read(addr, buf, to_copy);
--
2.7.1

[Qemu-devel] [PATCH v2 07/13] Use unsigned types for the 'len' argument of all memory read/write functions

[Martin Galvan]

---
 hw/net/xgmac.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c
index 0c5f793..b992435 100644
--- a/hw/net/xgmac.c
+++ b/hw/net/xgmac.c
@@ -203,8 +203,8 @@ static void xgmac_write_desc(XgmacState *s, struct desc *d, int rx)
 static void xgmac_enet_send(XgmacState *s)
 {
     struct desc bd;
-    int frame_size;
-    int len;
+    size_t frame_size;
+    size_t len;
     uint8_t frame[8192];
     uint8_t *ptr;

--
2.7.1

[Qemu-devel] [PATCH v2 08/13] Use unsigned types for the 'len' argument of all memory read/write functions

[Martin Galvan]

---
 monitor.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/monitor.c b/monitor.c
index e99ca8c..9f5212a 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1175,7 +1175,8 @@ static void monitor_printc(Monitor *mon, int c)
 static void memory_dump(Monitor *mon, int count, int format, int wsize,
                         hwaddr addr, int is_physical)
 {
-    int l, line_size, i, max_digits, len;
+    size_t l, line_size, i, len;
+    int max_digits;
     uint8_t buf[16];
     uint64_t v;

--
2.7.1

[Qemu-devel] [PATCH v2 09/13] Use unsigned types for the 'len' argument of all memory read/write functions

[Martin Galvan]

---
 include/qom/cpu.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index 1df7cb4..0d23e0a 100644
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -148,7 +148,7 @@ typedef struct CPUClass {
                                 int is_write, int is_user, uintptr_t retaddr);
     bool (*virtio_is_big_endian)(CPUState *cpu);
     int (*memory_rw_debug)(CPUState *cpu, vaddr addr,
-                           uint8_t *buf, int len, bool is_write);
+                           uint8_t *buf, size_t len, bool is_write);
     void (*dump_state)(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf,
                        int flags);
     void (*dump_statistics)(CPUState *cpu, FILE *f,
--
2.7.1

[Qemu-devel] [PATCH v2 10/13] Use unsigned types for the 'len' argument of all memory read/write functions

[Martin Galvan]

---
 scripts/coverity-model.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/coverity-model.c b/scripts/coverity-model.c
index ee5bf9d..97759b0 100644
--- a/scripts/coverity-model.c
+++ b/scripts/coverity-model.c
@@ -68,7 +68,7 @@ static void __bufread(uint8_t *buf, ssize_t len)
 }

 MemTxResult address_space_rw(AddressSpace *as, hwaddr addr, MemTxAttrs attrs,
-                             uint8_t *buf, int len, bool is_write)
+                             uint8_t *buf, size_t len, bool is_write)
 {
     MemTxResult result;

--
2.7.1

[Qemu-devel] [PATCH v2 11/13] Use unsigned types for the 'len' argument of all memory read/write functions

[Martin Galvan]

---
 hw/net/vmware_utils.h | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/hw/net/vmware_utils.h b/hw/net/vmware_utils.h
index c0dbb2f..6887178 100644
--- a/hw/net/vmware_utils.h
+++ b/hw/net/vmware_utils.h
@@ -26,33 +26,34 @@
  *
  */
 static inline void
-vmw_shmem_read(hwaddr addr, void *buf, int len)
+vmw_shmem_read(hwaddr addr, void *buf, size_t len)
 {
-    VMW_SHPRN("SHMEM r: %" PRIx64 ", len: %d to %p", addr, len, buf);
+    VMW_SHPRN("SHMEM r: %" PRIx64 ", len: %zu to %p", addr, len, buf);
     cpu_physical_memory_read(addr, buf, len);
 }

 static inline void
-vmw_shmem_write(hwaddr addr, void *buf, int len)
+vmw_shmem_write(hwaddr addr, void *buf, size_t len)
 {
-    VMW_SHPRN("SHMEM w: %" PRIx64 ", len: %d to %p", addr, len, buf);
+    VMW_SHPRN("SHMEM w: %" PRIx64 ", len: %zu to %p", addr, len, buf);
     cpu_physical_memory_write(addr, buf, len);
 }

 static inline void
-vmw_shmem_rw(hwaddr addr, void *buf, int len, int is_write)
+vmw_shmem_rw(hwaddr addr, void *buf, size_t len, int is_write)
 {
-    VMW_SHPRN("SHMEM r/w: %" PRIx64 ", len: %d (to %p), is write: %d",
+    VMW_SHPRN("SHMEM r/w: %" PRIx64 ", len: %zu (to %p), is write: %d",
               addr, len, buf, is_write);

     cpu_physical_memory_rw(addr, buf, len, is_write);
 }

 static inline void
-vmw_shmem_set(hwaddr addr, uint8_t val, int len)
+vmw_shmem_set(hwaddr addr, uint8_t val, size_t len)
 {
     int i;
-    VMW_SHPRN("SHMEM set: %" PRIx64 ", len: %d (value 0x%X)", addr, len, val);
+    VMW_SHPRN("SHMEM set: %" PRIx64 ", len: %zu (value 0x%X)", addr,
+        len, val);

     for (i = 0; i < len; i++) {
         cpu_physical_memory_write(addr + i, &val, 1);
--
2.7.1

[Qemu-devel] [PATCH v2 12/13] Use unsigned types for the 'len' argument of all memory read/write functions

[Martin Galvan]

---
 include/hw/sparc/sun4m.h  | 6 +++---
 target-sparc/cpu.h        | 2 +-
 target-sparc/mmu_helper.c | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/hw/sparc/sun4m.h b/include/hw/sparc/sun4m.h
index 9c17425..fe0de1e 100644
--- a/include/hw/sparc/sun4m.h
+++ b/include/hw/sparc/sun4m.h
@@ -9,17 +9,17 @@

 /* iommu.c */
 void sparc_iommu_memory_rw(void *opaque, hwaddr addr,
-                                 uint8_t *buf, int len, int is_write);
+                                 uint8_t *buf, size_t len, int is_write);
 static inline void sparc_iommu_memory_read(void *opaque,
                                            hwaddr addr,
-                                           uint8_t *buf, int len)
+                                           uint8_t *buf, size_t len)
 {
     sparc_iommu_memory_rw(opaque, addr, buf, len, 0);
 }

 static inline void sparc_iommu_memory_write(void *opaque,
                                             hwaddr addr,
-                                            uint8_t *buf, int len)
+                                            uint8_t *buf, size_t len)
 {
     sparc_iommu_memory_rw(opaque, addr, buf, len, 1);
 }
diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h
index dc46122..49c458c 100644
--- a/target-sparc/cpu.h
+++ b/target-sparc/cpu.h
@@ -521,7 +521,7 @@ void dump_mmu(FILE *f, fprintf_function cpu_fprintf, CPUSPARCState *env);

 #if !defined(TARGET_SPARC64) && !defined(CONFIG_USER_ONLY)
 int sparc_cpu_memory_rw_debug(CPUState *cpu, vaddr addr,
-                              uint8_t *buf, int len, bool is_write);
+                              uint8_t *buf, size_t len, bool is_write);
 #endif


diff --git a/target-sparc/mmu_helper.c b/target-sparc/mmu_helper.c
index aa80c48..ac95f85 100644
--- a/target-sparc/mmu_helper.c
+++ b/target-sparc/mmu_helper.c
@@ -358,13 +358,13 @@ void dump_mmu(FILE *f, fprintf_function cpu_fprintf, CPUSPARCState *env)
  * that the sparc ABI is followed.
  */
 int sparc_cpu_memory_rw_debug(CPUState *cs, vaddr address,
-                              uint8_t *buf, int len, bool is_write)
+                              uint8_t *buf, size_t len, bool is_write)
 {
     SPARCCPU *cpu = SPARC_CPU(cs);
     CPUSPARCState *env = &cpu->env;
     target_ulong addr = address;
-    int i;
-    int len1;
+    size_t i;
+    size_t len1;
     int cwp = env->cwp;

     if (!is_write) {
--
2.7.1

[Qemu-devel] [PATCH v2 13/13] Use unsigned types for the 'len' argument of all memory read/write functions

[Martin Galvan]

---
 dma-helpers.c        | 2 +-
 gdbstub.c            | 3 ++-
 hw/dma/sun4m_iommu.c | 4 ++--
 hw/net/dp8393x.c     | 8 ++++----
 hw/net/mcf_fec.c     | 4 ++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dma-helpers.c b/dma-helpers.c
index 4ad0bca..8e56ec5 100644
--- a/dma-helpers.c
+++ b/dma-helpers.c
@@ -22,7 +22,7 @@ int dma_memory_set(AddressSpace *as, dma_addr_t addr, uint8_t c, dma_addr_t len)

 #define FILLBUF_SIZE 512
     uint8_t fillbuf[FILLBUF_SIZE];
-    int l;
+    size_t l;
     bool error = false;

     memset(fillbuf, c, FILLBUF_SIZE);
diff --git a/gdbstub.c b/gdbstub.c
index 61c12b1..21b2990 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -42,7 +42,8 @@
 #endif

 static inline int target_memory_rw_debug(CPUState *cpu, target_ulong addr,
-                                         uint8_t *buf, int len, bool is_write)
+                                         uint8_t *buf, size_t len,
+                                         bool is_write)
 {
     CPUClass *cc = CPU_GET_CLASS(cpu);

diff --git a/hw/dma/sun4m_iommu.c b/hw/dma/sun4m_iommu.c
index b3cbc54..5ce998a 100644
--- a/hw/dma/sun4m_iommu.c
+++ b/hw/dma/sun4m_iommu.c
@@ -293,9 +293,9 @@ static void iommu_bad_addr(IOMMUState *s, hwaddr addr,
 }

 void sparc_iommu_memory_rw(void *opaque, hwaddr addr,
-                           uint8_t *buf, int len, int is_write)
+                           uint8_t *buf, size_t len, int is_write)
 {
-    int l;
+    size_t l;
     uint32_t flags;
     hwaddr page, phys_addr;

diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index e847b77..136b1ad 100644
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -194,7 +194,7 @@ static void dp8393x_update_irq(dp8393xState *s)
 static void dp8393x_do_load_cam(dp8393xState *s)
 {
     uint16_t data[8];
-    int width, size;
+    size_t width, size;
     uint16_t index = 0;

     width = (s->regs[SONIC_DCR] & SONIC_DCR_DW) ? 2 : 1;
@@ -236,7 +236,7 @@ static void dp8393x_do_load_cam(dp8393xState *s)
 static void dp8393x_do_read_rra(dp8393xState *s)
 {
     uint16_t data[8];
-    int width, size;
+    size_t width, size;

     /* Read memory */
     width = (s->regs[SONIC_DCR] & SONIC_DCR_DW) ? 2 : 1;
@@ -347,8 +347,8 @@ static void dp8393x_do_transmit_packets(dp8393xState *s)
 {
     NetClientState *nc = qemu_get_queue(s->nic);
     uint16_t data[12];
-    int width, size;
-    int tx_len, len;
+    size_t width, size;
+    size_t tx_len, len;
     uint16_t i;

     width = (s->regs[SONIC_DCR] & SONIC_DCR_DW) ? 2 : 1;
diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c
index 7c0398e..59c3c97 100644
--- a/hw/net/mcf_fec.c
+++ b/hw/net/mcf_fec.c
@@ -148,8 +148,8 @@ static void mcf_fec_do_tx(mcf_fec_state *s)
 {
     uint32_t addr;
     mcf_fec_bd bd;
-    int frame_size;
-    int len;
+    size_t frame_size;
+    size_t len;
     uint8_t frame[FEC_MAX_FRAME_SIZE];
     uint8_t *ptr;

--
2.7.1

Re: [Qemu-devel] [PATCH v2 01/13] Use unsigned types for the 'len' argument of all memory read/write functions

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 1918 bytes --]

On 03/01/2016 08:57 AM, Martin Galvan wrote:

Missing a S-o-b line; we cannot accept patches unless you sign them:
http://wiki.qemu.org/Contribute/SubmitAPatch
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/SubmittingPatches?id=f6f94e2a#n297

Subject line is long, and lacking a 'topic: summary' prefix.  I'd suggest:

mem: use unsigned 'len' for read/write

Then give more details, if needed, in the body of the commit message.

Also, your threading didn't work right.  Patch 1/13 was sent with:

References:
<1456847859-4771-1-git-send-email-martin.galvan@tallertechnologies.com>

but with no In-Reply-To:. Meanwhile, the 00/13 cover letter was sent with:

Message-Id:
<1456847681-4532-1-git-send-email-martin.galvan@tallertechnologies.com>

which is subtly different from the references of all the other patches,
making it appear as separate threads.

> ---
>  cpus.c                    |  2 +-
>  exec.c                    | 29 +++++++++++++++--------------
>  include/exec/cpu-all.h    |  2 +-
>  include/exec/cpu-common.h | 10 +++++-----
>  include/exec/memory.h     | 10 +++++-----
>  kvm-all.c                 |  2 +-
>  6 files changed, 28 insertions(+), 27 deletions(-)
> 
> diff --git a/cpus.c b/cpus.c
> index 9592163..e7aa8cc 100644
> --- a/cpus.c
> +++ b/cpus.c
> @@ -1602,7 +1602,7 @@ void qmp_memsave(int64_t addr, int64_t size, const char *filename,
>                   bool has_cpu, int64_t cpu_index, Error **errp)
>  {
>      FILE *f;
> -    uint32_t l;
> +    size_t l;

These are both unsigned types.  So based on the subject line alone, this
doesn't fit in the patch, unless the commit message body goes into more
details on why you are changing the size of the type, and not just the
signedness.


-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

Re: [Qemu-devel] [PATCH v2 01/13] Use unsigned types for the 'len' argument of all memory read/write functions

[Martin Galvan]

On Tue, Mar 1, 2016 at 1:05 PM, Eric Blake <eblake@redhat.com> wrote:
> On 03/01/2016 08:57 AM, Martin Galvan wrote:
>
> Missing a S-o-b line; we cannot accept patches unless you sign them:
> http://wiki.qemu.org/Contribute/SubmitAPatch
> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/SubmittingPatches?id=f6f94e2a#n297

Oh, I forgot that. I did have a s-o-b in v1, I just forgot to add it here.

> Subject line is long, and lacking a 'topic: summary' prefix.  I'd suggest:
>
> mem: use unsigned 'len' for read/write
>
> Then give more details, if needed, in the body of the commit message.

Yeah, I thought it was too long myself. Will do.

> Also, your threading didn't work right.  Patch 1/13 was sent with:
>
> References:
> <1456847859-4771-1-git-send-email-martin.galvan@tallertechnologies.com>
>
> but with no In-Reply-To:. Meanwhile, the 00/13 cover letter was sent with:
>
> Message-Id:
> <1456847681-4532-1-git-send-email-martin.galvan@tallertechnologies.com>
>
> which is subtly different from the references of all the other patches,
> making it appear as separate threads.

Yeah, I think I messed that up. Sorry.

>>      FILE *f;
>> -    uint32_t l;
>> +    size_t l;
>
> These are both unsigned types.  So based on the subject line alone, this
> doesn't fit in the patch, unless the commit message body goes into more
> details on why you are changing the size of the type, and not just the
> signedness.

You're right, I recall changing that for size correctness, rather than
signedness. I'll mention in the commit message that I also fixed those
issues in a couple of places.

> (adding an appropriate prefix for each maintainer that you are targetting will help).

I actually thought of that, but the files grouped into each e-mail
weren't necessarily related (e.g. Paolo's include some stuff in exec/
and kvm-all.c). I'll see what I can do, though.

Before I re-send them, however, it'd be nice if the patches themselves
could be reviewed.