global exec/memory/dma APIs cleanup
Subsystems (3)
v3 cover global exec/memory/dma APIs cleanup
This series is inspired from Peter Maydel cleanup patch:
https://www.mail-archive.com/[email protected]/msg680625.html
- Convert 'is_write' argument to boolean
- Use void pointer for blob buffer
- Remove unnecessary casts (Stefan Weil)
- Replace [API]_rw() by [API]_read/write() when is_write is constant
Supersedes: <[email protected]>
Peter Maydell (1):
Avoid address_space_rw() with a constant is_write argument
Philippe Mathieu-Daudé (19):
scripts/git.orderfile: Display Cocci scripts before code modifications
hw: Remove unnecessary cast when calling dma_memory_read()
exec: Let qemu_ram_*() functions take a const pointer argument
exec: Rename ram_ptr variable
exec: Let flatview API take void pointer arguments
exec: Let the address_space API use void pointer arguments hw/net: Avoid casting non-const pointer, use address_space_write() Remove unnecessary cast when using the address_space API
exec: Let the cpu_[physical]_memory API use void pointer arguments Remove unnecessary cast when using the cpu_[physical]_memory API hw/ide/internal: Remove unused DMARestartFunc typedef hw/ide: Let the DMAIntFunc prototype use a boolean 'is_write' argument hw/virtio: Let virtqueue_map_iovec() use a boolean 'is_write' argument hw/virtio: Let vhost_memory_map() use a boolean 'is_write' argument
exec: Let address_space_unmap() use a boolean 'is_write' argument Let address_space_rw() calls pass a boolean 'is_write' argument
exec: Let cpu_[physical]_memory API use a boolean 'is_write' argument Let cpu_[physical]_memory() calls pass a boolean 'is_write' argument Avoid cpu_physical_memory_rw() with a constant is_write argument
scripts/coccinelle/exec_rw_const.cocci | 103 +++++++++++++++++++++++++ include/exec/cpu-all.h | 2 +- include/exec/cpu-common.h | 18 ++--- include/exec/memory.h | 16 ++-- include/hw/ide/internal.h | 3 +- include/sysemu/xen-mapcache.h | 4 +- target/i386/hvf/vmx.h | 7 +- accel/kvm/kvm-all.c | 6 +- dma-helpers.c | 4 +- exec.c | 75 +++++++++--------- hw/arm/boot.c | 6 +- hw/arm/smmu-common.c | 3 +- hw/arm/smmuv3.c | 10 +-- hw/display/exynos4210_fimd.c | 3 +- hw/display/milkymist-tmu2.c | 8 +- hw/display/omap_dss.c | 2 +- hw/display/omap_lcdc.c | 10 +-- hw/display/ramfb.c | 2 +- hw/dma/etraxfs_dma.c | 25 +++--- hw/dma/rc4030.c | 10 +-- hw/dma/xlnx-zdma.c | 11 +-- hw/i386/xen/xen-mapcache.c | 2 +- hw/ide/ahci.c | 2 +- hw/ide/core.c | 2 +- hw/ide/macio.c | 2 +- hw/ide/pci.c | 2 +- hw/misc/pc-testdev.c | 2 +- hw/net/cadence_gem.c | 21 +++-- hw/net/dp8393x.c | 70 +++++++++-------- hw/net/i82596.c | 25 +++--- hw/net/lasi_i82596.c | 5 +- hw/nvram/spapr_nvram.c | 4 +- hw/ppc/pnv_lpc.c | 8 +- hw/ppc/ppc440_uc.c | 6 +- hw/ppc/spapr_hcall.c | 4 +- hw/s390x/css.c | 12 +-- hw/s390x/ipl.c | 2 +- hw/s390x/s390-pci-bus.c | 2 +- hw/s390x/virtio-ccw.c | 2 +- hw/scsi/vmw_pvscsi.c | 8 +- hw/sd/sdhci.c | 15 ++-- hw/virtio/vhost.c | 8 +- hw/virtio/virtio.c | 7 +- hw/xen/xen_pt_graphics.c | 2 +- qtest.c | 52 ++++++------- target/i386/hax-all.c | 6 +- target/i386/hvf/x86_mmu.c | 12 +-- target/i386/whpx-all.c | 2 +- target/s390x/excp_helper.c | 2 +- target/s390x/helper.c | 6 +- target/s390x/mmu_helper.c | 2 +- scripts/git.orderfile | 3 + 52 files changed, 360 insertions(+), 266 deletions(-) create mode 100644 scripts/coccinelle/exec_rw_const.cocci
Signature · 1 line
2.21.1
PATCH v3 1/20 scripts/git.orderfile: Display Cocci scripts before code modifications
When we use a Coccinelle semantic script to do automatic code modifications, it makes sense to look at the semantic patch first.
--- scripts/git.orderfile | 3 +++ 1 file changed, 3 insertions(+)
scripts/git.orderfile +3 -0
@@ -22,6 +22,9 @@ Makefile* qapi/*.json qga/*.json +# semantic patches +*.cocci + # headers *.h
Signature · 1 line
2.21.1
Re: [PATCH v3 01/20] scripts/git.orderfile: Display Cocci scripts before code modifications
Quoted 15 lines · Philippe Mathieu-Daudé
When we use a Coccinelle semantic script to do automatic code modifications, it makes sense to look at the semantic patch first.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- scripts/git.orderfile | 3 +++ 1 file changed, 3 insertions(+)scripts/git.orderfile +0
-0
scripts/git.orderfile Makefile* · line 30
Quoted 9 lines
scripts/git.orderfile +3
-0@@ -22,6 +22,9 @@ Makefile* qapi/*.json qga/*.json +# semantic patches +*.cocci + # headers *.h
Re: [PATCH v3 01/20] scripts/git.orderfile: Display Cocci scripts before code modifications
In reply to Philippe Mathieu-DaudéQuoted 8 lines · Philippe Mathieu-Daudé
When we use a Coccinelle semantic script to do automatic code modifications, it makes sense to look at the semantic patch first.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- scripts/git.orderfile | 3 +++ 1 file changed, 3 insertions(+)
Quoted 16 lines
scripts/git.orderfile +3
-0@@ -22,6 +22,9 @@ Makefile* qapi/*.json qga/*.json +# semantic patches +*.cocci + # headers *.h
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH v3 01/20] scripts/git.orderfile: Display Cocci scripts before code modifications
In reply to Philippe Mathieu-DaudéQuoted 5 lines · Philippe Mathieu-Daudé
When we use a Coccinelle semantic script to do automatic code modifications, it makes sense to look at the semantic patch first.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 20 lines
--- scripts/git.orderfile | 3 +++ 1 file changed, 3 insertions(+)scripts/git.orderfile +3
-0@@ -22,6 +22,9 @@ Makefile* qapi/*.json qga/*.json +# semantic patches +*.cocci + # headers *.hSignature · 1 line
2.21.1
PATCH v3 2/20 hw: Remove unnecessary cast when calling dma_memory_read()
In reply to Philippe Mathieu-DaudéSince its introduction in commit d86a77f8abb, dma_memory_read() always accepted void pointer argument. Remove the unnecessary casts.
This commit was produced with the included Coccinelle script scripts/coccinelle/exec_rw_const.
--- scripts/coccinelle/exec_rw_const.cocci | 15 +++++++++++++++ hw/arm/smmu-common.c | 3 +-- hw/arm/smmuv3.c | 10 ++++------ hw/sd/sdhci.c | 15 +++++---------- 4 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 scripts/coccinelle/exec_rw_const.cocci
scripts/coccinelle/exec_rw_const.cocci new file +15 -0
@@ -0,0 +1,15 @@ +// Usage: +// spatch --sp-file scripts/coccinelle/exec_rw_const.cocci --dir . --in-place + +// Remove useless cast +@@ +expression E1, E2, E3, E4; +type T; +@@ +( +- dma_memory_read(E1, E2, (T *)E3, E4) ++ dma_memory_read(E1, E2, E3, E4) +| +- dma_memory_write(E1, E2, (T *)E3, E4) ++ dma_memory_write(E1, E2, E3, E4) +)
hw/arm/smmu-common.c +1 -2
@@ -74,8 +74,7 @@ static int get_pte(dma_addr_t baseaddr, uint32_t index, uint64_t *pte,dma_addr_t addr = baseaddr + index *sizeof (*pte);/* TODO: guarantee 64-bit single-copy atomicity */ - ret =dma_memory_read (&address_space_memory, addr, - (uint8_t *)pte,sizeof (*pte)); + ret =dma_memory_read (&address_space_memory, addr, pte,sizeof (*pte));if (ret !=MEMTX_OK ) { info->type =SMMU_PTW_ERR_WALK_EABT ;
hw/arm/smmuv3.c +4 -6
@@ -279,8 +279,7 @@ static int smmu_get_ste(SMMUv3State *s, dma_addr_t addr, STE *buf,trace_smmuv3_get_ste (addr);/* TODO: guarantee 64-bit single-copy atomicity */ - ret =dma_memory_read (&address_space_memory, addr, - (void *)buf,sizeof (*buf)); + ret =dma_memory_read (&address_space_memory, addr, buf,sizeof (*buf));if (ret !=MEMTX_OK ) {qemu_log_mask (LOG_GUEST_ERROR ,"Cannot fetch pte at address=0x%" PRIx64"\n" , addr);
@@ -301,8 +300,7 @@ static int smmu_get_cd(SMMUv3State *s, STE *ste, uint32_t ssid,trace_smmuv3_get_cd (addr);/* TODO: guarantee 64-bit single-copy atomicity */ - ret =dma_memory_read (&address_space_memory, addr, - (void *)buf,sizeof (*buf)); + ret =dma_memory_read (&address_space_memory, addr, buf,sizeof (*buf));if (ret !=MEMTX_OK ) {qemu_log_mask (LOG_GUEST_ERROR ,"Cannot fetch pte at address=0x%" PRIx64"\n" , addr);
@@ -406,8 +404,8 @@ static int smmu_find_ste(SMMUv3State *s, uint32_t sid, STE *ste, l2_ste_offset = sid & ((1 << s->sid_split) -1 ); l1ptr = (dma_addr_t)(strtab_base + l1_ste_offset *sizeof (l1std));/* TODO: guarantee 64-bit single-copy atomicity */ - ret =dma_memory_read (&address_space_memory, l1ptr, - (uint8_t *)&l1std,sizeof (l1std)); + ret =dma_memory_read (&address_space_memory, l1ptr, &l1std, +sizeof (l1std));if (ret !=MEMTX_OK ) {qemu_log_mask (LOG_GUEST_ERROR ,"Could not read L1PTR at 0X%" PRIx64"\n" , l1ptr);
hw/sd/sdhci.c +5 -10
@@ -701,8 +701,7 @@ static void get_adma_description(SDHCIState *s, ADMADescr *dscr)hwaddr entry_addr = (hwaddr )s->admasysaddr;switch (SDHC_DMA_TYPE (s->hostctl1)) {case SDHC_CTRL_ADMA2_32 : -dma_memory_read (s->dma_as, entry_addr, (uint8_t *)&adma2, -sizeof (adma2)); +dma_memory_read (s->dma_as, entry_addr, &adma2,sizeof (adma2)); adma2 =le64_to_cpu (adma2);/* The spec does not specify endianness of descriptor table. * We currently assume that it is LE.
@@ -713,8 +712,7 @@ static void get_adma_description(SDHCIState *s, ADMADescr *dscr) dscr->incr =8 ;break ;case SDHC_CTRL_ADMA1_32 : -dma_memory_read (s->dma_as, entry_addr, (uint8_t *)&adma1, -sizeof (adma1)); +dma_memory_read (s->dma_as, entry_addr, &adma1,sizeof (adma1)); adma1 =le32_to_cpu (adma1); dscr->addr = (hwaddr)(adma1 &0xFFFFF000 ); dscr->attr = (uint8_t )extract32 (adma1,0 ,7 );
@@ -726,13 +724,10 @@ static void get_adma_description(SDHCIState *s, ADMADescr *dscr) }break ;case SDHC_CTRL_ADMA2_64 : -dma_memory_read (s->dma_as, entry_addr, - (uint8_t *)(&dscr->attr),1 ); -dma_memory_read (s->dma_as, entry_addr +2 , - (uint8_t *)(&dscr->length),2 ); +dma_memory_read (s->dma_as, entry_addr, (&dscr->attr),1 ); +dma_memory_read (s->dma_as, entry_addr +2 , (&dscr->length),2 ); dscr->length =le16_to_cpu (dscr->length); -dma_memory_read (s->dma_as, entry_addr +4 , - (uint8_t *)(&dscr->addr),8 ); +dma_memory_read (s->dma_as, entry_addr +4 , (&dscr->addr),8 ); dscr->addr =le64_to_cpu (dscr->addr); dscr->attr &= (uint8_t ) ~0xC0 ; dscr->incr =12 ;
Signature · 1 line
2.21.1
Re: [PATCH v3 02/20] hw: Remove unnecessary cast when calling dma_memory_read()
Quoted 22 lines · Philippe Mathieu-Daudé
Since its introduction in commit
d86a77f8abb,dma_memory_read()always accepted void pointer argument. Remove the unnecessary casts.This commit was produced with the included Coccinelle script
scripts/coccinelle/exec_rw_const.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- scripts/coccinelle/exec_rw_const.cocci | 15 +++++++++++++++ hw/arm/smmu-common.c | 3 +-- hw/arm/smmuv3.c | 10 ++++------ hw/sd/sdhci.c | 15 +++++---------- 4 files changed, 25 insertions(+), 18 deletions(-)create mode 100644
scripts/coccinelle/exec_rw_const.cocciscripts/coccinelle/exec_rw_const.cocci new file +0
-0
scripts/coccinelle/exec_rw_const.cocci line 2
Quoted 2 lines
scripts/coccinelle/exec_rw_const.cocci new file +2
-0@@ -0,0 +1,15 @@ +// Usage: +// spatch --sp-file scripts/coccinelle/exec_rw_const.cocci --dir . --in-place
This command line should also use '--macro-file scripts/cocci-macro-file.h' to cover more of the code base (Coccinelle skips portions of the code that uses macros it doesn't recognize).
scripts/coccinelle/exec_rw_const.cocci static void get_adma_description(SDHCIState *s, ADMADescr *dscr) · line 728
Quoted 10 lines
scripts/coccinelle/exec_rw_const.cocci new file +2
-4@@ -726,13 +724,10 @@ static void get_adma_description(SDHCIState *s, ADMADescr *dscr) } break; case SDHC_CTRL_ADMA2_64: - dma_memory_read(s->dma_as, entry_addr, - (uint8_t *)(&dscr->attr), 1); - dma_memory_read(s->dma_as, entry_addr + 2, - (uint8_t *)(&dscr->length), 2); + dma_memory_read(s->dma_as, entry_addr, (&dscr->attr), 1); + dma_memory_read(s->dma_as, entry_addr + 2, (&dscr->length), 2);
The () around &dscr->length are now pointless.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH v3 02/20] hw: Remove unnecessary cast when calling dma_memory_read()
Quoted 30 lines · Eric Blake
Quoted 22 lines · Philippe Mathieu-Daudé
Since its introduction in commit
d86a77f8abb,dma_memory_read()always accepted void pointer argument. Remove the unnecessary casts.This commit was produced with the included Coccinelle script
scripts/coccinelle/exec_rw_const.Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
scripts/coccinelle/exec_rw_const.cocci| 15 +++++++++++++++ hw/arm/smmu-common.c | 3 +-- hw/arm/smmuv3.c | 10 ++++------ hw/sd/sdhci.c | 15 +++++----------4 files changed, 25 insertions(+), 18 deletions(-)create mode 100644
scripts/coccinelle/exec_rw_const.cocciscripts/coccinelle/exec_rw_const.cocci new file +0
-0scripts/coccinelle/exec_rw_const.cocci
Quoted 3 lines
scripts/coccinelle/exec_rw_const.cocci new file +2
-1@@ -0,0 +1,15 @@ +// Usage: +// spatch --sp-file scripts/coccinelle/exec_rw_const.cocci --dir . --in-placeThis command line should also use '--macro-file
scripts/cocci-macro-file.h' to cover more of the code base (Coccinelle skips portions of the code that uses macros it doesn't recognize).
Quoted 13 lines
Quoted 11 lines
scripts/coccinelle/exec_rw_const.cocci new file +0
-0@@ -726,13 +724,10 @@ static void get_adma_description(SDHCIState *s, ADMADescr *dscr) } break;case
SDHC_CTRL_ADMA2_64:
- dma_memory_read(s->dma_as,entry_addr,
- (uint8_t*)(&dscr->attr), 1);
- dma_memory_read(s->dma_as,entry_addr+ 2,
- (uint8_t*)(&dscr->length), 2);
+dma_memory_read(s->dma_as, entry_addr, (&dscr->attr), 1); +dma_memory_read(s->dma_as, entry_addr + 2, (&dscr->length), 2);The () around
&dscr->lengthare now pointless.
Thanks Eric, patch updated. Peter are you OK if I change the cocci header using /* */ as:
-- >8 --
scripts/coccinelle/exec_rw_const.cocci +12 -4
@@ -1,5 +1,13 @@ -// Usage: -// spatch --sp-file scripts/coccinelle/exec_rw_const.cocci --dir . --in-place +/* + Usage: + + spatch \ + --macro-file scripts/cocci-macro-file.h \ + --sp-file scripts/coccinelle/exec_rw_const.cocci \ + --keep-comments \ + --in-place \ + --dir . +*/ // Remove useless cast @@
@@ -7,9 +15,9 @@ expression E1, E2, E3, E4; type T; @@ ( -- dma_memory_read(E1, E2, (T *)E3, E4) +- dma_memory_read(E1, E2, (T *)(E3), E4) + dma_memory_read(E1, E2, E3, E4) | -- dma_memory_write(E1, E2, (T *)E3, E4) +- dma_memory_write(E1, E2, (T *)(E3), E4) + dma_memory_write(E1, E2, E3, E4) )
hw/sd/sdhci.c +3 -3
@@ -724,10 +724,10 @@ static void get_adma_description(SDHCIState *s, ADMADescr *dscr) }break ;case SDHC_CTRL_ADMA2_64 : -dma_memory_read (s->dma_as, entry_addr, (&dscr->attr),1 ); -dma_memory_read (s->dma_as, entry_addr +2 , (&dscr->length),2 ); +dma_memory_read (s->dma_as, entry_addr, &dscr->attr,1 ); +dma_memory_read (s->dma_as, entry_addr +2 , &dscr->length,2 ); dscr->length =le16_to_cpu (dscr->length); -dma_memory_read (s->dma_as, entry_addr +4 , (&dscr->addr),8 ); +dma_memory_read (s->dma_as, entry_addr +4 , &dscr->addr,8 ); dscr->addr =le64_to_cpu (dscr->addr); dscr->attr &= (uint8_t ) ~0xC0 ; dscr->incr =12 ;
---
Re: [PATCH v3 02/20] hw: Remove unnecessary cast when calling dma_memory_read()
Quoted 99 lines · Philippe Mathieu-Daudé
Quoted 30 lines · Eric Blake
Quoted 22 lines · Philippe Mathieu-Daudé
Since its introduction in commit
d86a77f8abb,dma_memory_read()always accepted void pointer argument. Remove the unnecessary casts.This commit was produced with the included Coccinelle script
scripts/coccinelle/exec_rw_const.Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
scripts/coccinelle/exec_rw_const.cocci| 15 +++++++++++++++ hw/arm/smmu-common.c | 3 +-- hw/arm/smmuv3.c | 10 ++++------ hw/sd/sdhci.c | 15 +++++----------4 files changed, 25 insertions(+), 18 deletions(-)create mode 100644
scripts/coccinelle/exec_rw_const.cocciscripts/coccinelle/exec_rw_const.cocci new file +0
-0scripts/coccinelle/exec_rw_const.cocci
Quoted 3 lines
scripts/coccinelle/exec_rw_const.cocci new file +2
-1@@ -0,0 +1,15 @@ +// Usage: +// spatch --sp-file scripts/coccinelle/exec_rw_const.cocci --dir . --in-placeThis command line should also use '--macro-file
scripts/cocci-macro-file.h' to cover more of the code base (Coccinelle skips portions of the code that uses macros it doesn't recognize).Quoted 13 lines
Quoted 11 lines
scripts/coccinelle/exec_rw_const.cocci new file +0
-0@@ -726,13 +724,10 @@ static void get_adma_description(SDHCIState *s, ADMADescr *dscr) } break;case
SDHC_CTRL_ADMA2_64:
- dma_memory_read(s->dma_as,entry_addr,
- (uint8_t*)(&dscr->attr), 1);
- dma_memory_read(s->dma_as,entry_addr+ 2,
- (uint8_t*)(&dscr->length), 2);
+dma_memory_read(s->dma_as, entry_addr, (&dscr->attr), 1); +dma_memory_read(s->dma_as, entry_addr + 2, (&dscr->length), 2);The () around
&dscr->lengthare now pointless.Thanks Eric, patch updated. Peter are you OK if I change the cocci header using /* */ as:
-- >8 --
scripts/coccinelle/exec_rw_const.cocci +12
-5@@ -1,5 +1,13 @@ -// Usage: -// spatch --sp-file scripts/coccinelle/exec_rw_const.cocci --dir . --in-place +/* + Usage: + + spatch \ + --macro-file scripts/cocci-macro-file.h \ + --sp-file scripts/coccinelle/exec_rw_const.cocci \ + --keep-comments \ + --in-place \ + --dir . +*/ // Remove useless cast @@@@ -7,9 +15,9 @@ expression E1, E2, E3, E4; type T; @@ ( -- dma_memory_read(E1, E2, (T *)E3, E4) +- dma_memory_read(E1, E2, (T *)(E3), E4) + dma_memory_read(E1, E2, E3, E4) | -- dma_memory_write(E1, E2, (T *)E3, E4) +- dma_memory_write(E1, E2, (T *)(E3), E4) + dma_memory_write(E1, E2, E3, E4) )hw/sd/sdhci.c +3
-3@@ -724,10 +724,10 @@ static void get_adma_description(SDHCIState *s, ADMADescr *dscr) } break; case SDHC_CTRL_ADMA2_64: - dma_memory_read(s->dma_as, entry_addr, (&dscr->attr), 1); - dma_memory_read(s->dma_as, entry_addr + 2, (&dscr->length), 2); + dma_memory_read(s->dma_as, entry_addr, &dscr->attr, 1); + dma_memory_read(s->dma_as, entry_addr + 2, &dscr->length, 2); dscr->length = le16_to_cpu(dscr->length); - dma_memory_read(s->dma_as, entry_addr + 4, (&dscr->addr), 8); + dma_memory_read(s->dma_as, entry_addr + 4, &dscr->addr, 8); dscr->addr = le64_to_cpu(dscr->addr); dscr->attr &= (uint8_t) ~0xC0;
Quoted 2 lines
dscr->incr= 12;
---
Series updated here:
https://github.com/philmd/qemu/commits/exec_rw_const_v4
Relevant spatch:
https://github.com/philmd/qemu/blob/exec_rw_const_v4/scripts/coccinelle/exec_rw_const.cocci
I will respin later to let people time to review.
PATCH v3 3/20 exec: Let qemu_ram_*() functions take a const pointer argument
In reply to Philippe Mathieu-Daudé--- include/exec/cpu-common.h | 6 +++--- include/sysemu/xen-mapcache.h | 4 ++-- exec.c | 8 ++++---- hw/i386/xen/xen-mapcache.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-)
include/exec/cpu-common.h +3 -3
@@ -48,11 +48,11 @@ typedef uint32_t CPUReadMemoryFunc(void *opaque, hwaddr addr);void qemu_ram_remap (ram_addr_t addr,ram_addr_t length);/* This should not be used by devices. */ -ram_addr_t qemu_ram_addr_from_host (void *ptr); +ram_addr_t qemu_ram_addr_from_host (const void *ptr);RAMBlock *qemu_ram_block_by_name (const char *name); -RAMBlock *qemu_ram_block_from_host (void *ptr,bool round_offset, +RAMBlock *qemu_ram_block_from_host (const void *ptr,bool round_offset,ram_addr_t *offset); -ram_addr_t qemu_ram_block_host_offset (RAMBlock *rb,void *host); +ram_addr_t qemu_ram_block_host_offset (RAMBlock *rb,const void *host);void qemu_ram_set_idstr (RAMBlock *block,const char *name,DeviceState *dev);void qemu_ram_unset_idstr (RAMBlock *block);const char *qemu_ram_get_idstr (RAMBlock *rb);
include/sysemu/xen-mapcache.h +2 -2
@@ -19,7 +19,7 @@ void xen_map_cache_init(phys_offset_to_gaddr_t f, void *opaque);uint8_t *xen_map_cache (hwaddr phys_addr,hwaddr size,uint8_t lock,bool dma); -ram_addr_t xen_ram_addr_from_mapcache (void *ptr); +ram_addr_t xen_ram_addr_from_mapcache (const void *ptr);void xen_invalidate_map_cache_entry (uint8_t *buffer);void xen_invalidate_map_cache (void ); uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr,
@@ -40,7 +40,7 @@ static inline uint8_t *xen_map_cache(hwaddr phys_addr,abort (); } -static inline ram_addr_t xen_ram_addr_from_mapcache (void *ptr) +static inline ram_addr_t xen_ram_addr_from_mapcache (const void *ptr) {abort (); }
exec.c +4 -4
@@ -2614,7 +2614,7 @@ static void *qemu_ram_ptr_length(RAMBlock *ram_block, ram_addr_t addr, }/* Return the offset of a hostpointer within a ramblock */ -ram_addr_t qemu_ram_block_host_offset (RAMBlock *rb,void *host) +ram_addr_t qemu_ram_block_host_offset (RAMBlock *rb,const void *host) {ram_addr_t res = (uint8_t *)host - (uint8_t *)rb->host;assert ((uintptr_t )host >= (uintptr_t )rb->host);
@@ -2640,11 +2640,11 @@ ram_addr_t qemu_ram_block_host_offset(RAMBlock *rb, void *host)* pointer, such as a reference to the region that includes the incoming * ram_addr_t. */ -RAMBlock *qemu_ram_block_from_host (void *ptr,bool round_offset, +RAMBlock *qemu_ram_block_from_host (const void *ptr,bool round_offset,ram_addr_t *offset) {RAMBlock *block; -uint8_t *host = ptr; +const uint8_t *host = ptr;if (xen_enabled ()) {ram_addr_t ram_addr;
@@ -2705,7 +2705,7 @@ RAMBlock *qemu_ram_block_by_name(const char *name)/* Some of the softmmu routines need to translate from a host pointer (typically a TLB entry) back to a ram offset. */ -ram_addr_t qemu_ram_addr_from_host (void *ptr) +ram_addr_t qemu_ram_addr_from_host (const void *ptr) {RAMBlock *block;ram_addr_t offset;
hw/i386/xen/xen-mapcache.c +1 -1
@@ -363,7 +363,7 @@ uint8_t *xen_map_cache(hwaddr phys_addr, hwaddr size,return p; } -ram_addr_t xen_ram_addr_from_mapcache (void *ptr) +ram_addr_t xen_ram_addr_from_mapcache (const void *ptr) {MapCacheEntry *entry =NULL ;MapCacheRev *reventry;
Signature · 1 line
2.21.1
Paolo Bonzini
maintainerRe: [PATCH v3 03/20] exec: Let qemu_ram_*() functions take a const pointer argument
Quoted 13 lines · Philippe Mathieu-Daudé
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/exec/cpu-common.h | 6 +++--- include/sysemu/xen-mapcache.h | 4 ++-- exec.c | 8 ++++---- hw/i386/xen/xen-mapcache.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-)include/exec/cpu-common.h +0
-0
include/exec/cpu-common.h typedef uint32_t CPUReadMemoryFunc(void *opaque, hwaddr addr); · line 51
Quoted 5 lines
include/exec/cpu-common.h +1
-1@@ -48,11 +48,11 @@ typedef uint32_t CPUReadMemoryFunc(void *opaque, hwaddr addr);void qemu_ram_remap (ram_addr_t addr,ram_addr_t length);/* This should not be used by devices. */ -ram_addr_t qemu_ram_addr_from_host (void *ptr); +ram_addr_t qemu_ram_addr_from_host (const void *ptr);
This is a bit ugly, because the pointer _can_ be modified via qemu_map_ram_ptr. Is this needed for the rest of the series to apply?
Paolo
Quoted 81 lines
include/exec/cpu-common.h +2
-2RAMBlock *qemu_ram_block_by_name (const char *name); -RAMBlock *qemu_ram_block_from_host (void *ptr,bool round_offset, +RAMBlock *qemu_ram_block_from_host (const void *ptr,bool round_offset,ram_addr_t *offset); -ram_addr_t qemu_ram_block_host_offset (RAMBlock *rb,void *host); +ram_addr_t qemu_ram_block_host_offset (RAMBlock *rb,const void *host);void qemu_ram_set_idstr (RAMBlock *block,const char *name,DeviceState *dev);void qemu_ram_unset_idstr (RAMBlock *block);const char *qemu_ram_get_idstr (RAMBlock *rb);include/sysemu/xen-mapcache.h +2
-2@@ -19,7 +19,7 @@ void xen_map_cache_init(phys_offset_to_gaddr_t f, void *opaque);uint8_t *xen_map_cache (hwaddr phys_addr,hwaddr size,uint8_t lock,bool dma); -ram_addr_t xen_ram_addr_from_mapcache (void *ptr); +ram_addr_t xen_ram_addr_from_mapcache (const void *ptr);void xen_invalidate_map_cache_entry (uint8_t *buffer);void xen_invalidate_map_cache (void ); uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr,@@ -40,7 +40,7 @@ static inline uint8_t *xen_map_cache(hwaddr phys_addr,abort (); } -static inline ram_addr_t xen_ram_addr_from_mapcache (void *ptr) +static inline ram_addr_t xen_ram_addr_from_mapcache (const void *ptr) {abort (); }exec.c +4
-4@@ -2614,7 +2614,7 @@ static void *qemu_ram_ptr_length(RAMBlock *ram_block, ram_addr_t addr, }/* Return the offset of a hostpointer within a ramblock */ -ram_addr_t qemu_ram_block_host_offset (RAMBlock *rb,void *host) +ram_addr_t qemu_ram_block_host_offset (RAMBlock *rb,const void *host) {ram_addr_t res = (uint8_t *)host - (uint8_t *)rb->host;assert ((uintptr_t )host >= (uintptr_t )rb->host);@@ -2640,11 +2640,11 @@ ram_addr_t qemu_ram_block_host_offset(RAMBlock *rb, void *host)* pointer, such as a reference to the region that includes the incoming * ram_addr_t. */ -RAMBlock *qemu_ram_block_from_host (void *ptr,bool round_offset, +RAMBlock *qemu_ram_block_from_host (const void *ptr,bool round_offset,ram_addr_t *offset) {RAMBlock *block; -uint8_t *host = ptr; +const uint8_t *host = ptr;if (xen_enabled ()) {ram_addr_t ram_addr;@@ -2705,7 +2705,7 @@ RAMBlock *qemu_ram_block_by_name(const char *name)/* Some of the softmmu routines need to translate from a host pointer (typically a TLB entry) back to a ram offset. */ -ram_addr_t qemu_ram_addr_from_host (void *ptr) +ram_addr_t qemu_ram_addr_from_host (const void *ptr) {RAMBlock *block;ram_addr_t offset;hw/i386/xen/xen-mapcache.c +1
-1@@ -363,7 +363,7 @@ uint8_t *xen_map_cache(hwaddr phys_addr, hwaddr size,return p; } -ram_addr_t xen_ram_addr_from_mapcache (void *ptr) +ram_addr_t xen_ram_addr_from_mapcache (const void *ptr) {MapCacheEntry *entry =NULL ;MapCacheRev *reventry;
Re: [PATCH v3 03/20] exec: Let qemu_ram_*() functions take a const pointer argument
Quoted 15 lines · Paolo Bonzini
Quoted 14 lines · Philippe Mathieu-Daudé
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/exec/cpu-common.h | 6 +++--- include/sysemu/xen-mapcache.h | 4 ++-- exec.c | 8 ++++---- hw/i386/xen/xen-mapcache.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-)include/exec/cpu-common.h +0
-0@@ -48,11 +48,11 @@ typedef uint32_t CPUReadMemoryFunc(void *opaque, hwaddr addr);
Quoted 7 lines
include/exec/cpu-common.h typedef uint32_t CPUReadMemoryFunc(void *opaque, hwaddr addr); · line 51
Quoted 4 lines
include/exec/cpu-common.h +1
-1void qemu_ram_remap (ram_addr_t addr,ram_addr_t length);/* This should not be used by devices. */ -ram_addr_t qemu_ram_addr_from_host (void *ptr); +ram_addr_t qemu_ram_addr_from_host (const void *ptr);This is a bit ugly, because the pointer _can_ be modified via
qemu_map_ram_ptr.
OK.
Quoted 1 line
Is this needed for the rest of the series to apply?
No!
Quoted 84 lines
Paolo
Quoted 81 lines
include/exec/cpu-common.h +2
-2RAMBlock *qemu_ram_block_by_name (const char *name); -RAMBlock *qemu_ram_block_from_host (void *ptr,bool round_offset, +RAMBlock *qemu_ram_block_from_host (const void *ptr,bool round_offset,ram_addr_t *offset); -ram_addr_t qemu_ram_block_host_offset (RAMBlock *rb,void *host); +ram_addr_t qemu_ram_block_host_offset (RAMBlock *rb,const void *host);void qemu_ram_set_idstr (RAMBlock *block,const char *name,DeviceState *dev);void qemu_ram_unset_idstr (RAMBlock *block);const char *qemu_ram_get_idstr (RAMBlock *rb);include/sysemu/xen-mapcache.h +2
-2@@ -19,7 +19,7 @@ void xen_map_cache_init(phys_offset_to_gaddr_t f, void *opaque);uint8_t *xen_map_cache (hwaddr phys_addr,hwaddr size,uint8_t lock,bool dma); -ram_addr_t xen_ram_addr_from_mapcache (void *ptr); +ram_addr_t xen_ram_addr_from_mapcache (const void *ptr);void xen_invalidate_map_cache_entry (uint8_t *buffer);void xen_invalidate_map_cache (void ); uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr,@@ -40,7 +40,7 @@ static inline uint8_t *xen_map_cache(hwaddr phys_addr,abort (); } -static inline ram_addr_t xen_ram_addr_from_mapcache (void *ptr) +static inline ram_addr_t xen_ram_addr_from_mapcache (const void *ptr) {abort (); }exec.c +4
-4@@ -2614,7 +2614,7 @@ static void *qemu_ram_ptr_length(RAMBlock *ram_block, ram_addr_t addr, }/* Return the offset of a hostpointer within a ramblock */ -ram_addr_t qemu_ram_block_host_offset (RAMBlock *rb,void *host) +ram_addr_t qemu_ram_block_host_offset (RAMBlock *rb,const void *host) {ram_addr_t res = (uint8_t *)host - (uint8_t *)rb->host;assert ((uintptr_t )host >= (uintptr_t )rb->host);@@ -2640,11 +2640,11 @@ ram_addr_t qemu_ram_block_host_offset(RAMBlock *rb, void *host)* pointer, such as a reference to the region that includes the incoming * ram_addr_t. */ -RAMBlock *qemu_ram_block_from_host (void *ptr,bool round_offset, +RAMBlock *qemu_ram_block_from_host (const void *ptr,bool round_offset,ram_addr_t *offset) {RAMBlock *block; -uint8_t *host = ptr; +const uint8_t *host = ptr;if (xen_enabled ()) {ram_addr_t ram_addr;@@ -2705,7 +2705,7 @@ RAMBlock *qemu_ram_block_by_name(const char *name)/* Some of the softmmu routines need to translate from a host pointer (typically a TLB entry) back to a ram offset. */ -ram_addr_t qemu_ram_addr_from_host (void *ptr) +ram_addr_t qemu_ram_addr_from_host (const void *ptr) {RAMBlock *block;ram_addr_t offset;hw/i386/xen/xen-mapcache.c +1
-1@@ -363,7 +363,7 @@ uint8_t *xen_map_cache(hwaddr phys_addr, hwaddr size,return p; } -ram_addr_t xen_ram_addr_from_mapcache (void *ptr) +ram_addr_t xen_ram_addr_from_mapcache (const void *ptr) {MapCacheEntry *entry =NULL ;MapCacheRev *reventry;
RE: [Xen-devel] [PATCH v3 03/20] exec: Let qemu_ram_*() functions take a const pointer argument
In reply to Philippe Mathieu-DaudéQuoted 30 lines
-----Original Message-----
From: Xen-devel <[email protected]> On Behalf Of Philippe Mathieu-Daudé
Sent: 20 February 2020 13:06
To: Peter Maydell <[email protected]>; [email protected]
Cc: Fam Zheng <[email protected]>; Dmitry Fleytman <[email protected]>; [email protected]; Michael S. Tsirkin <[email protected]>; Jason Wang <[email protected]>; Gerd Hoffmann <[email protected]>; Edgar E. Iglesias <[email protected]>; Stefano Stabellini <[email protected]>; Matthew Rosato <[email protected]>; [email protected]; David Hildenbrand <[email protected]>; Halil Pasic <[email protected]>; Christian Borntraeger <[email protected]>; Hervé Poussineau <[email protected]>; Marcel Apfelbaum <[email protected]>; Anthony Perard <[email protected]>; xen- [email protected]; Aleksandar Rikalo <aleksandar.rikalo@rt- rk.com>; Richard Henderson <[email protected]>; Philippe Mathieu-Daudé <[email protected]>; Laurent Vivier <[email protected]>; Thomas Huth <[email protected]>; Eduardo Habkost <[email protected]>; Stefan Weil <[email protected]>; Alistair Francis <[email protected]>; Richard Henderson <[email protected]>; Paul Durrant <[email protected]>; Eric Auger <[email protected]>; [email protected]; qemu- [email protected]; Cédric Le Goater <[email protected]>; John Snow <[email protected]>; David Gibson <[email protected]>; Igor Mitsyanko <[email protected]>; Cornelia Huck <[email protected]>; Michael Walle <[email protected]>; [email protected]; Paolo Bonzini <[email protected]>
Subject: [Xen-devel] [PATCH v3 03/20] exec: Let qemu_ram_*() functions take a const pointer argument
Quoted 1 line
Signed-off-by Philippe Mathieu-Daudé <[email protected]>
PATCH v3 4/20 exec: Rename ram_ptr variable
In reply to Philippe Mathieu-DaudéAs we are going to use a different 'ptr' variable, rename the 'ram pointer' variable.
--- exec.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
exec.c +10 -10
@@ -3151,7 +3151,7 @@ static MemTxResult flatview_write_continue(FlatView *fv, hwaddr addr, hwaddr len, hwaddr addr1, hwaddr l, MemoryRegion *mr) { - uint8_t *ptr; + uint8_t *ram_ptr;uint64_t val;MemTxResult result =MEMTX_OK ;bool release_lock = false;
@@ -3167,8 +3167,8 @@ static MemTxResult flatview_write_continue(FlatView *fv, hwaddr addr, size_memop(l), attrs); }else {/* RAM case */ - ptr =qemu_ram_ptr_length (mr->ram_block, addr1, &l, false); -memcpy (ptr, buf, l); + ram_ptr =qemu_ram_ptr_length (mr->ram_block, addr1, &l, false); +memcpy (ram_ptr, buf, l);invalidate_and_set_dirty (mr, addr1, l); }
@@ -3215,7 +3215,7 @@ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr, hwaddr len, hwaddr addr1, hwaddr l, MemoryRegion *mr) { - uint8_t *ptr; + uint8_t *ram_ptr;uint64_t val;MemTxResult result =MEMTX_OK ;bool release_lock = false;
@@ -3230,8 +3230,8 @@ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr,stn_he_p (buf, l, val); }else {/* RAM case */ - ptr =qemu_ram_ptr_length (mr->ram_block, addr1, &l, false); -memcpy (buf, ptr, l); + ram_ptr =qemu_ram_ptr_length (mr->ram_block, addr1, &l, false); +memcpy (buf, ram_ptr, l); }if (release_lock) {
@@ -3329,7 +3329,7 @@ static inline MemTxResult address_space_write_rom_internal(AddressSpace *as, enum write_rom_type type) {hwaddr l; -uint8_t *ptr; +uint8_t *ram_ptr;hwaddr addr1;MemoryRegion *mr;
@@ -3343,14 +3343,14 @@ static inline MemTxResult address_space_write_rom_internal(AddressSpace *as, l =memory_access_size (mr, l, addr1); }else {/* ROM/RAM case */ - ptr =qemu_map_ram_ptr (mr->ram_block, addr1); + ram_ptr =qemu_map_ram_ptr (mr->ram_block, addr1);switch (type) {case WRITE_DATA : -memcpy (ptr, buf, l); +memcpy (ram_ptr, buf, l);invalidate_and_set_dirty (mr, addr1, l);break ;case FLUSH_CACHE : -flush_icache_range ((uintptr_t )ptr, (uintptr_t )ptr + l); +flush_icache_range ((uintptr_t )ram_ptr, (uintptr_t )ram_ptr + l);break ; } }
Signature · 1 line
2.21.1
PATCH v3 5/20 exec: Let flatview API take void pointer arguments
In reply to Philippe Mathieu-DaudéOnly flatview_[read/write]_continue use a byte pointer to increment an offset. For the users, we are only dealing with a blob buffer. Use a void pointer argument. This will let us simplify the address_space API in the next commit.
--- include/exec/memory.h | 2 +- exec.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-)
include/exec/memory.h +1 -1
@@ -2336,7 +2336,7 @@ void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len,MemTxResult address_space_read_full (AddressSpace *as,hwaddr addr,MemTxAttrs attrs,uint8_t *buf,hwaddr len);MemTxResult flatview_read_continue (FlatView *fv,hwaddr addr, -MemTxAttrs attrs,uint8_t *buf, +MemTxAttrs attrs,void *buf,hwaddr len,hwaddr addr1,hwaddr l,MemoryRegion *mr);void *qemu_map_ram_ptr (RAMBlock *ram_block,ram_addr_t addr);
exec.c +8 -6
@@ -2780,9 +2780,9 @@ void cpu_check_watchpoint(CPUState *cpu, vaddr addr, vaddr len, }static MemTxResult flatview_read (FlatView *fv,hwaddr addr, -MemTxAttrs attrs,uint8_t *buf,hwaddr len); +MemTxAttrs attrs,void *buf,hwaddr len);static MemTxResult flatview_write (FlatView *fv,hwaddr addr,MemTxAttrs attrs, -const uint8_t *buf,hwaddr len); +const void *buf,hwaddr len);static bool flatview_access_valid (FlatView *fv,hwaddr addr,hwaddr len,bool is_write,MemTxAttrs attrs);
@@ -3147,7 +3147,7 @@ static bool prepare_mmio_access(MemoryRegion *mr)/* Called within RCU critical section. */ static MemTxResult flatview_write_continue (FlatView *fv,hwaddr addr,MemTxAttrs attrs, -const uint8_t *buf, +const void *ptr,hwaddr len,hwaddr addr1,hwaddr l,MemoryRegion *mr) {
@@ -3155,6 +3155,7 @@ static MemTxResult flatview_write_continue(FlatView *fv, hwaddr addr,uint64_t val;MemTxResult result =MEMTX_OK ;bool release_lock = false; +const uint8_t *buf = ptr;for (;;) {if (!memory_access_is_direct (mr, true)) {
@@ -3194,7 +3195,7 @@ static MemTxResult flatview_write_continue(FlatView *fv, hwaddr addr,/* Called from RCU critical section. */ static MemTxResult flatview_write (FlatView *fv,hwaddr addr,MemTxAttrs attrs, -const uint8_t *buf,hwaddr len) +const void *buf,hwaddr len) {hwaddr l;hwaddr addr1;
@@ -3211,7 +3212,7 @@ static MemTxResult flatview_write(FlatView *fv, hwaddr addr, MemTxAttrs attrs,/* Called within RCU critical section. */ MemTxResult flatview_read_continue (FlatView *fv,hwaddr addr, -MemTxAttrs attrs,uint8_t *buf, +MemTxAttrs attrs,void *ptr,hwaddr len,hwaddr addr1,hwaddr l,MemoryRegion *mr) {
@@ -3219,6 +3220,7 @@ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr,uint64_t val;MemTxResult result =MEMTX_OK ;bool release_lock = false; +uint8_t *buf = ptr;for (;;) {if (!memory_access_is_direct (mr, false)) {
@@ -3256,7 +3258,7 @@ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr,/* Called from RCU critical section. */ static MemTxResult flatview_read (FlatView *fv,hwaddr addr, -MemTxAttrs attrs,uint8_t *buf,hwaddr len) +MemTxAttrs attrs,void *buf,hwaddr len) {hwaddr l;hwaddr addr1;
Signature · 1 line
2.21.1
PATCH v3 6/20 exec: Let the address_space API use void pointer arguments
In reply to Philippe Mathieu-DaudéAs we are only dealing with a blob buffer, use a void pointer argument. This will let us simplify other APIs.
--- include/exec/memory.h | 12 ++++++------ exec.c | 11 ++++++----- 2 files changed, 12 insertions(+), 11 deletions(-)
include/exec/memory.h +6 -6
@@ -2052,7 +2052,7 @@ void address_space_remove_listeners(AddressSpace *as);* @is_write: indicates the transfer direction */ MemTxResult address_space_rw (AddressSpace *as,hwaddr addr, -MemTxAttrs attrs,uint8_t *buf, +MemTxAttrs attrs,void *buf,hwaddr len,bool is_write);/**
@@ -2070,7 +2070,7 @@ MemTxResult address_space_rw(AddressSpace *as, hwaddr addr,*/ MemTxResult address_space_write (AddressSpace *as,hwaddr addr,MemTxAttrs attrs, -const uint8_t *buf,hwaddr len); +const void *buf,hwaddr len);/** * address_space_write_rom: write to address space, including ROM.
@@ -2096,7 +2096,7 @@ MemTxResult address_space_write(AddressSpace *as, hwaddr addr,*/ MemTxResult address_space_write_rom (AddressSpace *as,hwaddr addr,MemTxAttrs attrs, -const uint8_t *buf,hwaddr len); +const void *buf,hwaddr len);/* address_space_ld*: load from an address space * address_space_st*: store to an address space
@@ -2334,7 +2334,7 @@ void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len,/* Internal functions, part of the implementation of address_space_read. */ MemTxResult address_space_read_full (AddressSpace *as,hwaddr addr, -MemTxAttrs attrs,uint8_t *buf,hwaddr len); +MemTxAttrs attrs,void *buf,hwaddr len); MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr, MemTxAttrs attrs, void *buf, hwaddr len, hwaddr addr1, hwaddr l,
@@ -2374,7 +2374,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, +MemTxAttrs attrs,void *buf,hwaddr len) {MemTxResult result =MEMTX_OK ;
@@ -2433,7 +2433,7 @@ address_space_read_cached(MemoryRegionCache *cache, hwaddr addr,*/ static inline void address_space_write_cached (MemoryRegionCache *cache,hwaddr addr, -void *buf,hwaddr len) +const void *buf,hwaddr len) {assert (addr < cache->len && len <= cache->len - addr);if (likely (cache->ptr)) {
exec.c +6 -5
@@ -3271,7 +3271,7 @@ static MemTxResult flatview_read(FlatView *fv, hwaddr addr, }MemTxResult address_space_read_full (AddressSpace *as,hwaddr addr, -MemTxAttrs attrs,uint8_t *buf,hwaddr len) +MemTxAttrs attrs,void *buf,hwaddr len) {MemTxResult result =MEMTX_OK ;FlatView *fv;
@@ -3287,7 +3287,7 @@ MemTxResult address_space_read_full(AddressSpace *as, hwaddr addr,MemTxResult address_space_write (AddressSpace *as,hwaddr addr,MemTxAttrs attrs, -const uint8_t *buf,hwaddr len) +const void *buf,hwaddr len) {MemTxResult result =MEMTX_OK ;FlatView *fv;
@@ -3302,7 +3302,7 @@ MemTxResult address_space_write(AddressSpace *as, hwaddr addr, }MemTxResult address_space_rw (AddressSpace *as,hwaddr addr,MemTxAttrs attrs, -uint8_t *buf,hwaddr len,bool is_write) +void *buf,hwaddr len,bool is_write) {if (is_write) {return address_space_write (as, addr, attrs, buf, len);
@@ -3326,7 +3326,7 @@ enum write_rom_type {static inline MemTxResult address_space_write_rom_internal (AddressSpace *as,hwaddr addr,MemTxAttrs attrs, -const uint8_t *buf, +const void *ptr,hwaddr len,enum write_rom_type type) {
@@ -3334,6 +3334,7 @@ static inline MemTxResult address_space_write_rom_internal(AddressSpace *as,uint8_t *ram_ptr;hwaddr addr1;MemoryRegion *mr; +const uint8_t *buf = ptr;RCU_READ_LOCK_GUARD ();while (len >0 ) {
@@ -3366,7 +3367,7 @@ static inline MemTxResult address_space_write_rom_internal(AddressSpace *as,/* used for ROM loading : can write in RAM and ROM */ MemTxResult address_space_write_rom (AddressSpace *as,hwaddr addr,MemTxAttrs attrs, -const uint8_t *buf,hwaddr len) +const void *buf,hwaddr len) {return address_space_write_rom_internal (as, addr, attrs, buf, len,WRITE_DATA );
Signature · 1 line
2.21.1
PATCH v3 7/20 hw/net: Avoid casting non-const pointer, use address_space_write()
In reply to Philippe Mathieu-DaudéThe NetReceive prototype gets a const buffer:
typedef ssize_t (NetReceive)(NetClientState *, const uint8_t *, size_t);
We already have the address_space_write() method to write a const buffer to an address space. Use it to avoid:
hw/net/i82596.c: In function ‘i82596_receive’:
hw/net/i82596.c:644:54: error: passing argument 4 of ‘address_space_rw’ discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
This commit was produced with the included Coccinelle script scripts/coccinelle/exec_rw_const.
--- scripts/coccinelle/exec_rw_const.cocci | 14 ++++++++++++++ hw/net/dp8393x.c | 3 +-- hw/net/i82596.c | 4 ++-- 3 files changed, 17 insertions(+), 4 deletions(-)
scripts/coccinelle/exec_rw_const.cocci +14 -0
@@ -1,6 +1,20 @@ // Usage: // spatch --sp-file scripts/coccinelle/exec_rw_const.cocci --dir . --in-place +// Use address_space_write instead of casting to non-const +@@ +type T; +const T *V; +expression E1, E2, E3, E4; +@@ +( +- address_space_rw(E1, E2, E3, (T *)V, E4, 1) ++ address_space_write(E1, E2, E3, V, E4) +| +- address_space_rw(E1, E2, E3, (void *)V, E4, 1) ++ address_space_write(E1, E2, E3, V, E4) +) + // Remove useless cast @@ expression E1, E2, E3, E4;
hw/net/dp8393x.c +1 -2
@@ -787,8 +787,7 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf,/* Put packet into RBA */ DPRINTF ("Receive packet at %08x\n" ,dp8393x_crba (s)); address =dp8393x_crba (s); -address_space_rw (&s->as, address, -MEMTXATTRS_UNSPECIFIED , (uint8_t *)buf, rx_len,1 ); +address_space_write (&s->as, address,MEMTXATTRS_UNSPECIFIED , buf, rx_len); address += rx_len;address_space_rw (&s->as, address,MEMTXATTRS_UNSPECIFIED , (uint8_t *)&checksum,4 ,1 );
hw/net/i82596.c +2 -2
@@ -640,8 +640,8 @@ ssize_t i82596_receive(NetClientState *nc, const uint8_t *buf, size_t sz) } rba =get_uint32 (rbd +8 );/* printf("rba is 0x%x\n", rba); */ -address_space_rw (&address_space_memory, rba, -MEMTXATTRS_UNSPECIFIED , (void *)buf, num,1 ); +address_space_write (&address_space_memory, rba, +MEMTXATTRS_UNSPECIFIED , buf, num); rba += num; buf += num; len -= num;
Signature · 1 line
2.21.1
PATCH v3 8/20 Remove unnecessary cast when using the address_space API
In reply to Philippe Mathieu-DaudéThis commit was produced with the included Coccinelle script scripts/coccinelle/exec_rw_const.
Two lines in hw/net/dp8393x.c that Coccinelle produced that were over 80 characters were re-wrapped by hand.
--- scripts/coccinelle/exec_rw_const.cocci | 15 +++++++++++++- target/i386/hvf/vmx.h | 2 +- hw/arm/boot.c | 6 ++---- hw/dma/rc4030.c | 4 ++-- hw/dma/xlnx-zdma.c | 2 +- hw/net/cadence_gem.c | 21 +++++++++---------- hw/net/dp8393x.c | 28 +++++++++++++------------- hw/s390x/css.c | 4 ++-- qtest.c | 12 +++++------ target/i386/hvf/x86_mmu.c | 2 +- target/i386/whpx-all.c | 2 +- target/s390x/mmu_helper.c | 2 +- 12 files changed, 54 insertions(+), 46 deletions(-)
scripts/coccinelle/exec_rw_const.cocci +14 -1
@@ -17,10 +17,23 @@ expression E1, E2, E3, E4; // Remove useless cast @@ -expression E1, E2, E3, E4; +expression E1, E2, E3, E4, E5, E6; type T; @@ ( +- address_space_rw(E1, E2, E3, (T *)E4, E5, E6) ++ address_space_rw(E1, E2, E3, E4, E5, E6) +| +- address_space_read(E1, E2, E3, (T *)E4, E5) ++ address_space_read(E1, E2, E3, E4, E5) +| +- address_space_write(E1, E2, E3, (T *)E4, E5) ++ address_space_write(E1, E2, E3, E4, E5) +| +- address_space_write_rom(E1, E2, E3, (T *)E4, E5) ++ address_space_write_rom(E1, E2, E3, E4, E5) +| + - dma_memory_read(E1, E2, (T *)E3, E4) + dma_memory_read(E1, E2, E3, E4) |
target/i386/hvf/vmx.h +1 -1
@@ -128,7 +128,7 @@ static inline void macvm_set_cr0(hv_vcpuid_t vcpu, uint64_t cr0)address_space_rw (&address_space_memory,rvmcs (vcpu,VMCS_GUEST_CR3 ) & ~0x1f ,MEMTXATTRS_UNSPECIFIED , - (uint8_t *)pdpte,32 ,0 ); + pdpte,32 ,0 );/* Only set PDPTE when appropriate. */ for (i =0 ; i <4 ; i++) {wvmcs (vcpu,VMCS_GUEST_PDPTE0 + i *2 , pdpte[i]);
hw/arm/boot.c +2 -4
@@ -327,8 +327,7 @@ static void set_kernel_args(const struct arm_boot_info *info, AddressSpace *as) cmdline_size =strlen (info->kernel_cmdline);address_space_write (as, p +8 ,MEMTXATTRS_UNSPECIFIED , - (const uint8_t *)info->kernel_cmdline, - cmdline_size +1 ); + info->kernel_cmdline, cmdline_size +1 ); cmdline_size = (cmdline_size >>2 ) +1 ;WRITE_WORD (p, cmdline_size +2 );WRITE_WORD (p,0x54410009 );
@@ -420,8 +419,7 @@ static void set_kernel_args_old(const struct arm_boot_info *info, } s = info->kernel_cmdline;if (s) { -address_space_write (as, p,MEMTXATTRS_UNSPECIFIED , - (const uint8_t *)s,strlen (s) +1 ); +address_space_write (as, p,MEMTXATTRS_UNSPECIFIED , s,strlen (s) +1 ); }else {WRITE_WORD (p,0 ); }
hw/dma/rc4030.c +2 -2
@@ -513,8 +513,8 @@ static IOMMUTLBEntry rc4030_dma_translate(IOMMUMemoryRegion *iommu, hwaddr addr,if (i < s->dma_tl_limit /sizeof (entry)) { entry_address = (s->dma_tl_base &0x7fffffff ) + i *sizeof (entry);if (address_space_read (ret.target_as, entry_address, -MEMTXATTRS_UNSPECIFIED , (unsigned char *)&entry, -sizeof (entry)) ==MEMTX_OK ) { +MEMTXATTRS_UNSPECIFIED , &entry,sizeof (entry)) + ==MEMTX_OK ) { ret.translated_addr = entry.frame & ~(DMA_PAGESIZE -1 ); ret.perm =IOMMU_RW ; }
hw/dma/xlnx-zdma.c +1 -1
@@ -364,7 +364,7 @@ static uint64_t zdma_update_descr_addr(XlnxZDMA *s, bool type, }else { addr =zdma_get_regaddr64 (s, basereg); addr +=sizeof (s->dsc_dst); -address_space_rw (s->dma_as, addr, s->attr, (void *) &next,8 , false); +address_space_rw (s->dma_as, addr, s->attr, &next,8 , false);zdma_put_regaddr64 (s, basereg, next); }return next;
hw/net/cadence_gem.c +9 -12
@@ -871,7 +871,7 @@ static void gem_get_rx_desc(CadenceGEMState *s, int q)/* read current descriptor */ address_space_read (&s->dma_as, desc_addr,MEMTXATTRS_UNSPECIFIED , - (uint8_t *)s->rx_desc[q], + s->rx_desc[q],sizeof (uint32_t ) *gem_get_desc_len (s, true));/* Descriptor owned by software ? */
@@ -1029,9 +1029,8 @@ static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size)/* Descriptor write-back. */ desc_addr =gem_get_rx_desc_addr (s, q); -address_space_write (&s->dma_as, desc_addr, -MEMTXATTRS_UNSPECIFIED , - (uint8_t *)s->rx_desc[q], +address_space_write (&s->dma_as, desc_addr,MEMTXATTRS_UNSPECIFIED , + s->rx_desc[q],sizeof (uint32_t ) *gem_get_desc_len (s, true));/* Next descriptor */
@@ -1137,7 +1136,7 @@ static void gem_transmit(CadenceGEMState *s)DB_PRINT ("read descriptor 0x%" HWADDR_PRIx"\n" , packet_desc_addr);address_space_read (&s->dma_as, packet_desc_addr, -MEMTXATTRS_UNSPECIFIED , (uint8_t *)desc, +MEMTXATTRS_UNSPECIFIED , desc,sizeof (uint32_t ) *gem_get_desc_len (s, false));/* Handle all descriptors owned by hardware */ while (tx_desc_get_used (desc) ==0 ) {
@@ -1185,14 +1184,12 @@ static void gem_transmit(CadenceGEMState *s)* the processor. */ address_space_read (&s->dma_as, desc_addr, -MEMTXATTRS_UNSPECIFIED , - (uint8_t *)desc_first, +MEMTXATTRS_UNSPECIFIED , desc_first,sizeof (desc_first));tx_desc_set_used (desc_first);address_space_write (&s->dma_as, desc_addr, -MEMTXATTRS_UNSPECIFIED , - (uint8_t *)desc_first, -sizeof (desc_first)); +MEMTXATTRS_UNSPECIFIED , desc_first, +sizeof (desc_first));/* Advance the hardware current descriptor past this packet */ if (tx_desc_get_wrap (desc)) { s->tx_desc_addr[q] = s->regs[GEM_TXQBASE ];
@@ -1246,8 +1243,8 @@ static void gem_transmit(CadenceGEMState *s) }DB_PRINT ("read descriptor 0x%" HWADDR_PRIx"\n" , packet_desc_addr);address_space_read (&s->dma_as, packet_desc_addr, -MEMTXATTRS_UNSPECIFIED , (uint8_t *)desc, -sizeof (uint32_t ) *gem_get_desc_len (s, false)); +MEMTXATTRS_UNSPECIFIED , desc, +sizeof (uint32_t ) *gem_get_desc_len (s, false)); }if (tx_desc_get_used (desc)) {
hw/net/dp8393x.c +14 -14
@@ -276,7 +276,7 @@ static void dp8393x_do_load_cam(dp8393xState *s)while (s->regs[SONIC_CDC ] &0x1f ) {/* Fill current entry */ address_space_rw (&s->as,dp8393x_cdp (s), -MEMTXATTRS_UNSPECIFIED , (uint8_t *)s->data, size,0 ); +MEMTXATTRS_UNSPECIFIED , s->data, size,0 ); s->cam[index][0 ] =dp8393x_get (s, width,1 ) &0xff ; s->cam[index][1 ] =dp8393x_get (s, width,1 ) >>8 ; s->cam[index][2 ] =dp8393x_get (s, width,2 ) &0xff ;
@@ -294,7 +294,7 @@ static void dp8393x_do_load_cam(dp8393xState *s)/* Read CAM enable */ address_space_rw (&s->as,dp8393x_cdp (s), -MEMTXATTRS_UNSPECIFIED , (uint8_t *)s->data, size,0 ); +MEMTXATTRS_UNSPECIFIED , s->data, size,0 ); s->regs[SONIC_CE ] =dp8393x_get (s, width,0 );DPRINTF ("load cam done. cam enable mask 0x%04x\n" , s->regs[SONIC_CE ]);
@@ -312,7 +312,7 @@ static void dp8393x_do_read_rra(dp8393xState *s) width = (s->regs[SONIC_DCR ] &SONIC_DCR_DW ) ?2 :1 ; size =sizeof (uint16_t ) *4 * width;address_space_rw (&s->as,dp8393x_rrp (s), -MEMTXATTRS_UNSPECIFIED , (uint8_t *)s->data, size,0 ); +MEMTXATTRS_UNSPECIFIED , s->data, size,0 );/* Update SONIC registers */ s->regs[SONIC_CRBA0 ] =dp8393x_get (s, width,0 );
@@ -427,7 +427,7 @@ static void dp8393x_do_transmit_packets(dp8393xState *s) s->regs[SONIC_TTDA ] = s->regs[SONIC_CTDA ];DPRINTF ("Transmit packet at %08x\n" ,dp8393x_ttda (s));address_space_rw (&s->as,dp8393x_ttda (s) +sizeof (uint16_t ) * width, -MEMTXATTRS_UNSPECIFIED , (uint8_t *)s->data, size,0 ); +MEMTXATTRS_UNSPECIFIED , s->data, size,0 ); tx_len =0 ;/* Update registers */
@@ -461,7 +461,7 @@ static void dp8393x_do_transmit_packets(dp8393xState *s) size =sizeof (uint16_t ) *3 * width;address_space_rw (&s->as,dp8393x_ttda (s) +sizeof (uint16_t ) * (4 +3 * i) * width, -MEMTXATTRS_UNSPECIFIED , (uint8_t *)s->data, size,0 ); +MEMTXATTRS_UNSPECIFIED , s->data, size,0 ); s->regs[SONIC_TSA0 ] =dp8393x_get (s, width,0 ); s->regs[SONIC_TSA1 ] =dp8393x_get (s, width,1 ); s->regs[SONIC_TFS ] =dp8393x_get (s, width,2 );
@@ -495,17 +495,17 @@ static void dp8393x_do_transmit_packets(dp8393xState *s) s->regs[SONIC_TCR] & 0x0fff); /* status */ size =sizeof (uint16_t ) * width;address_space_rw (&s->as, -dp8393x_ttda (s), -MEMTXATTRS_UNSPECIFIED , (uint8_t *)s->data, size,1 ); +dp8393x_ttda (s), +MEMTXATTRS_UNSPECIFIED , s->data, size,1 );if (!(s->regs[SONIC_CR ] &SONIC_CR_HTX )) {/* Read footer of packet */ size =sizeof (uint16_t ) * width;address_space_rw (&s->as, -dp8393x_ttda (s) + +dp8393x_ttda (s) +sizeof (uint16_t ) * (4 +3 * s->regs[SONIC_TFC ]) * width, -MEMTXATTRS_UNSPECIFIED , (uint8_t *)s->data, size,0 ); +MEMTXATTRS_UNSPECIFIED , s->data, size,0 ); s->regs[SONIC_CTDA ] =dp8393x_get (s, width,0 ) & ~0x1 ;if (dp8393x_get (s, width,0 ) &0x1 ) {/* EOL detected */
@@ -768,7 +768,7 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf, size =sizeof (uint16_t ) *1 * width; address =dp8393x_crda (s) +sizeof (uint16_t ) *5 * width;address_space_rw (&s->as, address,MEMTXATTRS_UNSPECIFIED , - (uint8_t *)s->data, size,0 ); + s->data, size,0 );if (dp8393x_get (s, width,0 ) &0x1 ) {/* Still EOL ; stop reception */ return -1 ;
@@ -790,7 +790,7 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf,address_space_write (&s->as, address,MEMTXATTRS_UNSPECIFIED , buf, rx_len); address += rx_len;address_space_rw (&s->as, address, -MEMTXATTRS_UNSPECIFIED , (uint8_t *)&checksum,4 ,1 ); +MEMTXATTRS_UNSPECIFIED , &checksum,4 ,1 ); rx_len +=4 ; s->regs[SONIC_CRBA1 ] = address >>16 ; s->regs[SONIC_CRBA0 ] = address &0xffff ;
@@ -819,12 +819,12 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf,dp8393x_put (s, width,4 , s->regs[SONIC_RSC ]);/* seq_no */ size =sizeof (uint16_t ) *5 * width;address_space_rw (&s->as,dp8393x_crda (s), -MEMTXATTRS_UNSPECIFIED , (uint8_t *)s->data, size,1 ); +MEMTXATTRS_UNSPECIFIED , s->data, size,1 );/* Move to next descriptor */ size =sizeof (uint16_t ) * width;address_space_rw (&s->as,dp8393x_crda (s) +sizeof (uint16_t ) *5 * width, -MEMTXATTRS_UNSPECIFIED , (uint8_t *)s->data, size,0 ); +MEMTXATTRS_UNSPECIFIED , s->data, size,0 ); s->regs[SONIC_LLFA ] =dp8393x_get (s, width,0 );if (s->regs[SONIC_LLFA ] &0x1 ) {/* EOL detected */
@@ -838,7 +838,7 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf, } s->data[0 ] =0 ;address_space_rw (&s->as, offset,MEMTXATTRS_UNSPECIFIED , - (uint8_t *)s->data,sizeof (uint16_t ),1 ); + s->data,sizeof (uint16_t ),1 ); s->regs[SONIC_CRDA ] = s->regs[SONIC_LLFA ]; s->regs[SONIC_ISR ] |=SONIC_ISR_PKTRX ; s->regs[SONIC_RSC ] = (s->regs[SONIC_RSC ] &0xff00 ) | (((s->regs[SONIC_RSC ] &0x00ff ) +1 ) &0x00ff );
hw/s390x/css.c +2 -2
@@ -875,7 +875,7 @@ static inline int ida_read_next_idaw(CcwDataStream *cds)return -EINVAL ;/* channel program check */ } ret =address_space_rw (&address_space_memory, idaw_addr, -MEMTXATTRS_UNSPECIFIED , (void *) &idaw.fmt2, +MEMTXATTRS_UNSPECIFIED , &idaw.fmt2,sizeof (idaw.fmt2), false); cds->cda =be64_to_cpu (idaw.fmt2); }else {
@@ -884,7 +884,7 @@ static inline int ida_read_next_idaw(CcwDataStream *cds)return -EINVAL ;/* channel program check */ } ret =address_space_rw (&address_space_memory, idaw_addr, -MEMTXATTRS_UNSPECIFIED , (void *) &idaw.fmt1, +MEMTXATTRS_UNSPECIFIED , &idaw.fmt1,sizeof (idaw.fmt1), false); cds->cda =be64_to_cpu (idaw.fmt1);if (cds->cda &0x80000000 ) {
qtest.c +6 -6
@@ -435,17 +435,17 @@ static void qtest_process_command(CharBackend *chr, gchar **words)uint16_t data = value;tswap16s (&data);address_space_rw (first_cpu->as, addr,MEMTXATTRS_UNSPECIFIED , - (uint8_t *) &data,2 , true); + &data,2 , true); }else if (words[0 ][5 ] =='l' ) {uint32_t data = value;tswap32s (&data);address_space_rw (first_cpu->as, addr,MEMTXATTRS_UNSPECIFIED , - (uint8_t *) &data,4 , true); + &data,4 , true); }else if (words[0 ][5 ] =='q' ) {uint64_t data = value;tswap64s (&data);address_space_rw (first_cpu->as, addr,MEMTXATTRS_UNSPECIFIED , - (uint8_t *) &data,8 , true); + &data,8 , true); }qtest_send_prefix (chr);qtest_send (chr,"OK\n" );
@@ -469,16 +469,16 @@ static void qtest_process_command(CharBackend *chr, gchar **words) }else if (words[0 ][4 ] =='w' ) {uint16_t data;address_space_rw (first_cpu->as, addr,MEMTXATTRS_UNSPECIFIED , - (uint8_t *) &data,2 , false); + &data,2 , false); value =tswap16 (data); }else if (words[0 ][4 ] =='l' ) {uint32_t data;address_space_rw (first_cpu->as, addr,MEMTXATTRS_UNSPECIFIED , - (uint8_t *) &data,4 , false); + &data,4 , false); value =tswap32 (data); }else if (words[0 ][4 ] =='q' ) {address_space_rw (first_cpu->as, addr,MEMTXATTRS_UNSPECIFIED , - (uint8_t *) &value,8 , false); + &value,8 , false);tswap64s (&value); }qtest_send_prefix (chr);
target/i386/hvf/x86_mmu.c +1 -1
@@ -89,7 +89,7 @@ static bool get_pt_entry(struct CPUState *cpu, struct gpt_translation *pt, index =gpt_entry (pt->gva, level, pae);address_space_rw (&address_space_memory, gpa + index *pte_size (pae), -MEMTXATTRS_UNSPECIFIED , (uint8_t *)&pte,pte_size (pae),0 ); +MEMTXATTRS_UNSPECIFIED , &pte,pte_size (pae),0 ); pt->pte[level -1 ] = pte;
target/i386/whpx-all.c +1 -1
@@ -540,7 +540,7 @@ static HRESULT CALLBACK whpx_emu_ioport_callback( {MemTxAttrs attrs = {0 };address_space_rw (&address_space_io, IoAccess->Port, attrs, - (uint8_t *)&IoAccess->Data, IoAccess->AccessSize, + &IoAccess->Data, IoAccess->AccessSize, IoAccess->Direction);return S_OK ; }
target/s390x/mmu_helper.c +1 -1
@@ -106,7 +106,7 @@ static inline bool read_table_entry(CPUS390XState *env, hwaddr gaddr,* We treat them as absolute addresses and don't wrap them. */ if (unlikely (address_space_read (cs->as, gaddr,MEMTXATTRS_UNSPECIFIED , - (uint8_t *)entry,sizeof (*entry)) != + entry,sizeof (*entry)) !=MEMTX_OK )) {return false; }
Signature · 1 line
2.21.1
Re: [PATCH v3 08/20] Remove unnecessary cast when using the address_space API
Quoted 52 lines · On Thu, 20 Feb 2020 14:05:36 +0100 Philippe Mathieu-Daudé <[email protected]>…
This commit was produced with the included Coccinelle script
scripts/coccinelle/exec_rw_const.Two lines in
hw/net/dp8393x.cthat Coccinelle produced that were over 80 characters were re-wrapped by hand.Suggested-by Stefan Weil <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- scripts/coccinelle/exec_rw_const.cocci | 15 +++++++++++++- target/i386/hvf/vmx.h | 2 +- hw/arm/boot.c | 6 ++---- hw/dma/rc4030.c | 4 ++-- hw/dma/xlnx-zdma.c | 2 +- hw/net/cadence_gem.c | 21 +++++++++---------- hw/net/dp8393x.c | 28 +++++++++++++------------- hw/s390x/css.c | 4 ++-- qtest.c | 12 +++++------ target/i386/hvf/x86_mmu.c | 2 +- target/i386/whpx-all.c | 2 +- target/s390x/mmu_helper.c | 2 +- 12 files changed, 54 insertions(+), 46 deletions(-)hw/s390x/css.c +2
-2@@ -875,7 +875,7 @@ static inline int ida_read_next_idaw(CcwDataStream *cds)return -EINVAL ;/* channel program check */ } ret =address_space_rw (&address_space_memory, idaw_addr, -MEMTXATTRS_UNSPECIFIED , (void *) &idaw.fmt2, +MEMTXATTRS_UNSPECIFIED , &idaw.fmt2,sizeof (idaw.fmt2), false); cds->cda =be64_to_cpu (idaw.fmt2); }else {@@ -884,7 +884,7 @@ static inline int ida_read_next_idaw(CcwDataStream *cds)return -EINVAL ;/* channel program check */ } ret =address_space_rw (&address_space_memory, idaw_addr, -MEMTXATTRS_UNSPECIFIED , (void *) &idaw.fmt1, +MEMTXATTRS_UNSPECIFIED , &idaw.fmt1,sizeof (idaw.fmt1), false); cds->cda =be64_to_cpu (idaw.fmt1);if (cds->cda &0x80000000 ) {target/s390x/mmu_helper.c +0
-0
target/s390x/mmu_helper.c static inline bool read_table_entry(CPUS390XState *env, hwaddr gaddr, · line 112
Quoted 8 lines
target/s390x/mmu_helper.c +1
-1@@ -106,7 +106,7 @@ static inline bool read_table_entry(CPUS390XState *env, hwaddr gaddr,* We treat them as absolute addresses and don't wrap them. */ if (unlikely (address_space_read (cs->as, gaddr,MEMTXATTRS_UNSPECIFIED , - (uint8_t *)entry,sizeof (*entry)) != + entry,sizeof (*entry)) !=MEMTX_OK )) {return false; }
s390 parts
PATCH v3 9/20 exec: Let the cpu_[physical]_memory API use void pointer arguments
In reply to Philippe Mathieu-DaudéAs we are only dealing with a blob buffer, use a void pointer argument. This will let us simplify other APIs.
--- include/exec/cpu-all.h | 2 +- include/exec/cpu-common.h | 2 +- exec.c | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-)
include/exec/cpu-all.h +1 -1
@@ -388,7 +388,7 @@ void dump_opcount_info(void);#endif /* !CONFIG_USER_ONLY */ int cpu_memory_rw_debug (CPUState *cpu,target_ulong addr, -uint8_t *buf,target_ulong len,int is_write); +void *ptr,target_ulong len,int is_write);int cpu_exec (CPUState *cpu);
include/exec/cpu-common.h +1 -1
@@ -69,7 +69,7 @@ void qemu_ram_unset_migratable(RAMBlock *rb);size_t qemu_ram_pagesize (RAMBlock *block);size_t qemu_ram_pagesize_largest (void ); -void cpu_physical_memory_rw (hwaddr addr,uint8_t *buf, +void cpu_physical_memory_rw (hwaddr addr,void *buf,hwaddr len,int is_write);static inline void cpu_physical_memory_read (hwaddr addr,void *buf,hwaddr len)
exec.c +5 -3
@@ -3019,11 +3019,12 @@ 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,target_ulong len,int is_write) +void *ptr,target_ulong len,int is_write) {int flags;target_ulong l, page;void * p; +uint8_t *buf = ptr;while (len >0 ) { page = addr &TARGET_PAGE_MASK ;
@@ -3311,7 +3312,7 @@ MemTxResult address_space_rw(AddressSpace *as, hwaddr addr, MemTxAttrs attrs, } } -void cpu_physical_memory_rw (hwaddr addr,uint8_t *buf, +void cpu_physical_memory_rw (hwaddr addr,void *buf,hwaddr len,int is_write) { address_space_rw(&address_space_memory, addr, MEMTXATTRS_UNSPECIFIED,
@@ -3789,10 +3790,11 @@ address_space_write_cached_slow(MemoryRegionCache *cache, hwaddr addr,/* virtual memory access for debug (includes writing to ROM) */ int cpu_memory_rw_debug (CPUState *cpu,target_ulong addr, -uint8_t *buf,target_ulong len,int is_write) +void *ptr,target_ulong len,int is_write) {hwaddr phys_addr;target_ulong l, page; +uint8_t *buf = ptr;cpu_synchronize_state (cpu);while (len >0 ) {
Signature · 1 line
2.21.1
PATCH v3 10/20 Remove unnecessary cast when using the cpu_[physical]_memory API
In reply to Philippe Mathieu-DaudéThis commit was produced with the included Coccinelle script scripts/coccinelle/exec_rw_const.
--- scripts/coccinelle/exec_rw_const.cocci | 10 ++++++++++ hw/display/omap_lcdc.c | 10 +++++----- hw/dma/etraxfs_dma.c | 25 ++++++++++--------------- hw/scsi/vmw_pvscsi.c | 8 +++----- target/i386/hax-all.c | 6 +++--- 5 files changed, 31 insertions(+), 28 deletions(-)
scripts/coccinelle/exec_rw_const.cocci +10 -0
@@ -34,6 +34,16 @@ type T; + address_space_write_rom(E1, E2, E3, E4, E5) | +- cpu_physical_memory_rw(E1, (T *)E2, E3, E4) ++ cpu_physical_memory_rw(E1, E2, E3, E4) +| +- cpu_physical_memory_read(E1, (T *)E2, E3) ++ cpu_physical_memory_read(E1, E2, E3) +| +- cpu_physical_memory_write(E1, (T *)E2, E3) ++ cpu_physical_memory_write(E1, E2, E3) +| + - dma_memory_read(E1, E2, (T *)E3, E4) + dma_memory_read(E1, E2, E3, E4) |
hw/display/omap_lcdc.c +5 -5
@@ -91,9 +91,9 @@ static void omap_update_display(void *opaque) frame_offset =0 ;if (omap_lcd->plm !=2 ) { -cpu_physical_memory_read (omap_lcd->dma->phys_framebuffer[ - omap_lcd->dma->current_frame], - (void *)omap_lcd->palette,0x200 ); +cpu_physical_memory_read ( + omap_lcd->dma->phys_framebuffer[omap_lcd->dma->current_frame], + omap_lcd->palette,0x200 );switch (omap_lcd->palette[0 ] >>12 &7 ) { case 3 ... 7: frame_offset +=0x200 ;
@@ -244,8 +244,8 @@ static void omap_lcd_update(struct omap_lcd_panel_s *s) {if (s->plm !=2 && !s->palette_done) {cpu_physical_memory_read ( - s->dma->phys_framebuffer[s->dma->current_frame], - (void *)s->palette,0x200 ); + s->dma->phys_framebuffer[s->dma->current_frame], + s->palette,0x200 ); s->palette_done =1 ;omap_lcd_interrupts (s); }
hw/dma/etraxfs_dma.c +10 -15
@@ -225,9 +225,8 @@ static void channel_load_g(struct fs_dma_ctrl *ctrl, int c)hwaddr addr =channel_reg (ctrl, c,RW_GROUP );/* Load and decode. FIXME: handle endianness. */ -cpu_physical_memory_read (addr, - (void *) &ctrl->channels[c].current_g, -sizeof ctrl->channels[c].current_g); +cpu_physical_memory_read (addr, &ctrl->channels[c].current_g, +sizeof (ctrl->channels[c].current_g)); }static void dump_c (int ch,struct dma_descr_context *c)
@@ -257,9 +256,8 @@ static void channel_load_c(struct fs_dma_ctrl *ctrl, int c)hwaddr addr =channel_reg (ctrl, c,RW_GROUP_DOWN );/* Load and decode. FIXME: handle endianness. */ -cpu_physical_memory_read (addr, - (void *) &ctrl->channels[c].current_c, -sizeof ctrl->channels[c].current_c); +cpu_physical_memory_read (addr, &ctrl->channels[c].current_c, +sizeof (ctrl->channels[c].current_c));D (dump_c (c, &ctrl->channels[c].current_c));/* I guess this should update the current pos. */
@@ -275,9 +273,8 @@ static void channel_load_d(struct fs_dma_ctrl *ctrl, int c)/* Load and decode. FIXME: handle endianness. */ D (printf ("%s ch=%d addr=" TARGET_FMT_plx"\n" , __func__, c, addr)); -cpu_physical_memory_read (addr, - (void *) &ctrl->channels[c].current_d, -sizeof ctrl->channels[c].current_d); +cpu_physical_memory_read (addr, &ctrl->channels[c].current_d, +sizeof (ctrl->channels[c].current_d));D (dump_d (c, &ctrl->channels[c].current_d)); ctrl->channels[c].regs[RW_DATA ] = addr;
@@ -290,9 +287,8 @@ static void channel_store_c(struct fs_dma_ctrl *ctrl, int c)/* Encode and store. FIXME: handle endianness. */ D (printf ("%s ch=%d addr=" TARGET_FMT_plx"\n" , __func__, c, addr));D (dump_d (c, &ctrl->channels[c].current_d)); -cpu_physical_memory_write (addr, - (void *) &ctrl->channels[c].current_c, -sizeof ctrl->channels[c].current_c); +cpu_physical_memory_write (addr, &ctrl->channels[c].current_c, +sizeof (ctrl->channels[c].current_c)); }static void channel_store_d (struct fs_dma_ctrl *ctrl,int c)
@@ -301,9 +297,8 @@ static void channel_store_d(struct fs_dma_ctrl *ctrl, int c)/* Encode and store. FIXME: handle endianness. */ D (printf ("%s ch=%d addr=" TARGET_FMT_plx"\n" , __func__, c, addr)); -cpu_physical_memory_write (addr, - (void *) &ctrl->channels[c].current_d, -sizeof ctrl->channels[c].current_d); +cpu_physical_memory_write (addr, &ctrl->channels[c].current_d, +sizeof (ctrl->channels[c].current_d)); }static inline void channel_stop (struct fs_dma_ctrl *ctrl,int c)
hw/scsi/vmw_pvscsi.c +3 -5
@@ -404,8 +404,7 @@ pvscsi_cmp_ring_put(PVSCSIState *s, struct PVSCSIRingCmpDesc *cmp_desc) cmp_descr_pa =pvscsi_ring_pop_cmp_descr (&s->rings);trace_pvscsi_cmp_ring_put (cmp_descr_pa); -cpu_physical_memory_write (cmp_descr_pa, (void *)cmp_desc, -sizeof (*cmp_desc)); +cpu_physical_memory_write (cmp_descr_pa, cmp_desc,sizeof (*cmp_desc)); } static void
@@ -415,8 +414,7 @@ pvscsi_msg_ring_put(PVSCSIState *s, struct PVSCSIRingMsgDesc *msg_desc) msg_descr_pa =pvscsi_ring_pop_msg_descr (&s->rings);trace_pvscsi_msg_ring_put (msg_descr_pa); -cpu_physical_memory_write (msg_descr_pa, (void *)msg_desc, -sizeof (*msg_desc)); +cpu_physical_memory_write (msg_descr_pa, msg_desc,sizeof (*msg_desc)); } static void
@@ -491,7 +489,7 @@ pvscsi_get_next_sg_elem(PVSCSISGState *sg) {struct PVSCSISGElement elem; -cpu_physical_memory_read (sg->elemAddr, (void *)&elem,sizeof (elem)); +cpu_physical_memory_read (sg->elemAddr, &elem,sizeof (elem));if ((elem.flags & ~PVSCSI_KNOWN_FLAGS ) !=0 ) {/* * There is PVSCSI_SGE_FLAG_CHAIN_ELEMENT flag described in
target/i386/hax-all.c +3 -3
@@ -367,7 +367,7 @@ static int hax_accel_init(MachineState *ms)static int hax_handle_fastmmio (CPUArchState *env,struct hax_fastmmio *hft) {if (hft->direction <2 ) { -cpu_physical_memory_rw (hft->gpa, (uint8_t *) &hft->value, hft->size, +cpu_physical_memory_rw (hft->gpa, &hft->value, hft->size, hft->direction); }else {/*
@@ -376,8 +376,8 @@ static int hax_handle_fastmmio(CPUArchState *env, struct hax_fastmmio *hft)* hft->direction == 2: gpa ==> gpa2 */ uint64_t value; -cpu_physical_memory_rw (hft->gpa, (uint8_t *) &value, hft->size,0 ); -cpu_physical_memory_rw (hft->gpa2, (uint8_t *) &value, hft->size,1 ); +cpu_physical_memory_rw (hft->gpa, &value, hft->size,0 ); +cpu_physical_memory_rw (hft->gpa2, &value, hft->size,1 ); }return 0 ;
Signature · 1 line
2.21.1
PATCH v3 11/20 hw/ide/internal: Remove unused DMARestartFunc typedef
In reply to Philippe Mathieu-DaudéThe IDE DMA restart callback has been removed in commit fe09c7c9f0.
--- include/hw/ide/internal.h | 1 - 1 file changed, 1 deletion(-)
include/hw/ide/internal.h +0 -1
@@ -326,7 +326,6 @@ typedef int DMAIntFunc(IDEDMA *, int);typedef int32_t DMAInt32Func (IDEDMA *,int32_t len);typedef void DMAu32Func (IDEDMA *,uint32_t );typedef void DMAStopFunc (IDEDMA *,bool ); -typedef void DMARestartFunc (void *,int ,RunState );struct unreported_events {bool eject_request;
Signature · 1 line
2.21.1
Re: [PATCH v3 11/20] hw/ide/internal: Remove unused DMARestartFunc typedef
Quoted 14 lines · Philippe Mathieu-Daudé
The IDE DMA restart callback has been removed in commit
fe09c7c9f0.Fixes fe09c7c9f0Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/hw/ide/internal.h | 1 - 1 file changed, 1 deletion(-)include/hw/ide/internal.h +0
-0
include/hw/ide/internal.h typedef int DMAIntFunc(IDEDMA *, int); · line 331
Quoted 7 lines
include/hw/ide/internal.h +0
-1@@ -326,7 +326,6 @@ typedef int DMAIntFunc(IDEDMA *, int);typedef int32_t DMAInt32Func (IDEDMA *,int32_t len);typedef void DMAu32Func (IDEDMA *,uint32_t );typedef void DMAStopFunc (IDEDMA *,bool ); -typedef void DMARestartFunc (void *,int ,RunState );struct unreported_events {bool eject_request;
PATCH v3 12/20 hw/ide: Let the DMAIntFunc prototype use a boolean 'is_write' argument
In reply to Philippe Mathieu-DaudéThe 'is_write' argument is either 0 or 1.
Convert it to a boolean type.
--- include/hw/ide/internal.h | 2 +- hw/dma/rc4030.c | 6 +++--- hw/ide/ahci.c | 2 +- hw/ide/core.c | 2 +- hw/ide/macio.c | 2 +- hw/ide/pci.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)
include/hw/ide/internal.h +1 -1
@@ -322,7 +322,7 @@ typedef void EndTransferFunc(IDEState *);typedef void DMAStartFunc (IDEDMA *,IDEState *,BlockCompletionFunc *);typedef void DMAVoidFunc (IDEDMA *); -typedef int DMAIntFunc (IDEDMA *,int ); +typedef int DMAIntFunc (IDEDMA *,bool );typedef int32_t DMAInt32Func (IDEDMA *,int32_t len);typedef void DMAu32Func (IDEDMA *,uint32_t );typedef void DMAStopFunc (IDEDMA *,bool );
hw/dma/rc4030.c +3 -3
@@ -590,7 +590,7 @@ static const VMStateDescription vmstate_rc4030 = { };static void rc4030_do_dma (void *opaque,int n,uint8_t *buf, -int len,int is_write) +int len,bool is_write) {rc4030State *s = opaque;hwaddr dma_addr;
@@ -630,13 +630,13 @@ struct rc4030DMAState {void rc4030_dma_read (void *dma,uint8_t *buf,int len) {rc4030_dma s = dma; -rc4030_do_dma (s->opaque, s->n, buf, len,0 ); +rc4030_do_dma (s->opaque, s->n, buf, len, false); }void rc4030_dma_write (void *dma,uint8_t *buf,int len) {rc4030_dma s = dma; -rc4030_do_dma (s->opaque, s->n, buf, len,1 ); +rc4030_do_dma (s->opaque, s->n, buf, len, true); }static rc4030_dma *rc4030_allocate_dmas (void *opaque,int n)
hw/ide/ahci.c +1 -1
@@ -1461,7 +1461,7 @@ static void ahci_commit_buf(IDEDMA *dma, uint32_t tx_bytes) ad->cur_cmd->status =cpu_to_le32 (tx_bytes); } -static int ahci_dma_rw_buf (IDEDMA *dma,int is_write) +static int ahci_dma_rw_buf (IDEDMA *dma,bool is_write) {AHCIDevice *ad =DO_UPCAST (AHCIDevice, dma, dma);IDEState *s = &ad->port.ifs[0 ];
hw/ide/core.c +1 -1
@@ -2570,7 +2570,7 @@ static void ide_init1(IDEBus *bus, int unit) ide_sector_write_timer_cb, s); } -static int ide_nop_int (IDEDMA *dma,int x) +static int ide_nop_int (IDEDMA *dma,bool is_write) {return 0 ; }
hw/ide/macio.c +1 -1
@@ -376,7 +376,7 @@ static void macio_ide_reset(DeviceState *dev)ide_bus_reset (&d->bus); } -static int ide_nop_int (IDEDMA *dma,int x) +static int ide_nop_int (IDEDMA *dma,bool is_write) {return 0 ; }
hw/ide/pci.c +1 -1
@@ -181,7 +181,7 @@ static int32_t bmdma_prepare_buf(IDEDMA *dma, int32_t limit) }/* return 0 if buffer completed */ -static int bmdma_rw_buf (IDEDMA *dma,int is_write) +static int bmdma_rw_buf (IDEDMA *dma,bool is_write) {BMDMAState *bm =DO_UPCAST (BMDMAState, dma, dma);IDEState *s =bmdma_active_if (bm);
Signature · 1 line
2.21.1
Re: [PATCH v3 12/20] hw/ide: Let the DMAIntFunc prototype use a boolean 'is_write' argument
Quoted 4 lines · Philippe Mathieu-Daudé
The '
is_write' argument is either 0 or 1.
Convert it to a boolean type.Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 8 lines
--- include/hw/ide/internal.h | 2 +- hw/dma/rc4030.c | 6 +++--- hw/ide/ahci.c | 2 +- hw/ide/core.c | 2 +- hw/ide/macio.c | 2 +- hw/ide/pci.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)
PATCH v3 13/20 hw/virtio: Let virtqueue_map_iovec() use a boolean 'is_write' argument
In reply to Philippe Mathieu-DaudéThe 'is_write' argument is either 0 or 1.
Convert it to a boolean type.
--- hw/virtio/virtio.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
hw/virtio/virtio.c +4 -3
@@ -1293,7 +1293,7 @@ static void virtqueue_undo_map_desc(unsigned int out_num, unsigned int in_num,static void virtqueue_map_iovec (VirtIODevice *vdev,struct iovec *sg,hwaddr *addr,unsigned int num_sg, -int is_write) +bool is_write) {unsigned int i;hwaddr len;
@@ -1317,8 +1317,9 @@ static void virtqueue_map_iovec(VirtIODevice *vdev, struct iovec *sg,void virtqueue_map (VirtIODevice *vdev,VirtQueueElement *elem) { -virtqueue_map_iovec (vdev, elem->in_sg, elem->in_addr, elem->in_num,1 ); -virtqueue_map_iovec (vdev, elem->out_sg, elem->out_addr, elem->out_num,0 ); +virtqueue_map_iovec (vdev, elem->in_sg, elem->in_addr, elem->in_num, true); +virtqueue_map_iovec (vdev, elem->out_sg, elem->out_addr, elem->out_num, + false); }static void *virtqueue_alloc_element (size_t sz,unsigned out_num,unsigned in_num)
Signature · 1 line
2.21.1
PATCH v3 14/20 hw/virtio: Let vhost_memory_map() use a boolean 'is_write' argument
In reply to Philippe Mathieu-DaudéThe 'is_write' argument is either 0 or 1.
Convert it to a boolean type.
--- hw/virtio/vhost.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
hw/virtio/vhost.c +4 -4
@@ -294,7 +294,7 @@ static int vhost_dev_has_iommu(struct vhost_dev *dev) }static void *vhost_memory_map (struct vhost_dev *dev,hwaddr addr, -hwaddr *plen,int is_write) +hwaddr *plen,bool is_write) {if (!vhost_dev_has_iommu (dev)) {return cpu_physical_memory_map (addr, plen, is_write);
@@ -1012,21 +1012,21 @@ static int vhost_virtqueue_start(struct vhost_dev *dev, vq->desc_size = s = l =virtio_queue_get_desc_size (vdev, idx); vq->desc_phys = a; - vq->desc =vhost_memory_map (dev, a, &l,0 ); + vq->desc =vhost_memory_map (dev, a, &l, false);if (!vq->desc || l != s) { r = -ENOMEM ; goto fail_alloc_desc; } vq->avail_size = s = l =virtio_queue_get_avail_size (vdev, idx); vq->avail_phys = a =virtio_queue_get_avail_addr (vdev, idx); - vq->avail =vhost_memory_map (dev, a, &l,0 ); + vq->avail =vhost_memory_map (dev, a, &l, false);if (!vq->avail || l != s) { r = -ENOMEM ; goto fail_alloc_avail; } vq->used_size = s = l =virtio_queue_get_used_size (vdev, idx); vq->used_phys = a =virtio_queue_get_used_addr (vdev, idx); - vq->used =vhost_memory_map (dev, a, &l,1 ); + vq->used =vhost_memory_map (dev, a, &l, true);if (!vq->used || l != s) { r = -ENOMEM ; goto fail_alloc_used;
Signature · 1 line
2.21.1
PATCH v3 15/20 exec: Let address_space_unmap() use a boolean 'is_write' argument
In reply to Philippe Mathieu-DaudéThe 'is_write' argument is either 0 or 1.
Convert it to a boolean type.
--- include/exec/memory.h | 2 +- exec.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
include/exec/memory.h +1 -1
@@ -2329,7 +2329,7 @@ void *address_space_map(AddressSpace *as, hwaddr addr,* @is_write: indicates the transfer direction */ void address_space_unmap (AddressSpace *as,void *buffer,hwaddr len, -int is_write,hwaddr access_len); +bool is_write,hwaddr access_len);/* Internal functions, part of the implementation of address_space_read. */
exec.c +2 -2
@@ -3598,11 +3598,11 @@ void *address_space_map(AddressSpace *as, }/* Unmaps a memory region previously mapped by address_space_map(). -* Will also mark the memory as dirty if is_write == 1. access_len gives +* Will also mark the memory as dirty if is_write is true. access_len gives * the amount of memory that was actually read or written by the caller. */ void address_space_unmap (AddressSpace *as,void *buffer,hwaddr len, -int is_write,hwaddr access_len) +bool is_write,hwaddr access_len) {if (buffer != bounce.buffer) {MemoryRegion *mr;
Signature · 1 line
2.21.1
PATCH v3 16/20 Let address_space_rw() calls pass a boolean 'is_write' argument
In reply to Philippe Mathieu-DaudéSince its introduction in commit ac1970fbe8, address_space_rw() takes a boolean 'is_write' argument. Fix the codebase by using an explicit boolean type.
This commit was produced with the included Coccinelle script scripts/coccinelle/exec_rw_const.
--- scripts/coccinelle/exec_rw_const.cocci | 12 ++++++++++++ target/i386/hvf/vmx.h | 2 +- exec.c | 4 ++-- hw/net/dp8393x.c | 27 +++++++++++++------------- hw/net/i82596.c | 11 ++++++----- hw/net/lasi_i82596.c | 4 ++-- target/i386/hvf/x86_mmu.c | 8 ++++---- 7 files changed, 41 insertions(+), 27 deletions(-)
scripts/coccinelle/exec_rw_const.cocci +12 -0
@@ -1,6 +1,18 @@ // Usage: // spatch --sp-file scripts/coccinelle/exec_rw_const.cocci --dir . --in-place +// Convert to boolean +@@ +expression E1, E2, E3, E4, E5; +@@ +( +- address_space_rw(E1, E2, E3, E4, E5, 0) ++ address_space_rw(E1, E2, E3, E4, E5, false) +| +- address_space_rw(E1, E2, E3, E4, E5, 1) ++ address_space_rw(E1, E2, E3, E4, E5, true) +) + // Use address_space_write instead of casting to non-const @@ type T;
target/i386/hvf/vmx.h +1 -1
@@ -128,7 +128,7 @@ static inline void macvm_set_cr0(hv_vcpuid_t vcpu, uint64_t cr0)address_space_rw (&address_space_memory,rvmcs (vcpu,VMCS_GUEST_CR3 ) & ~0x1f ,MEMTXATTRS_UNSPECIFIED , - pdpte,32 ,0 ); + pdpte,32 , false);/* Only set PDPTE when appropriate. */ for (i =0 ; i <4 ; i++) {wvmcs (vcpu,VMCS_GUEST_PDPTE0 + i *2 , pdpte[i]);
exec.c +2 -2
@@ -3815,8 +3815,8 @@ int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr,address_space_write_rom (cpu->cpu_ases[asidx].as, phys_addr, attrs, buf, l); }else { -address_space_rw (cpu->cpu_ases[asidx].as, phys_addr, - attrs, buf, l,0 ); +address_space_rw (cpu->cpu_ases[asidx].as, phys_addr, attrs, buf, + l, false); } len -= l; buf += l;
hw/net/dp8393x.c +14 -13
@@ -276,7 +276,7 @@ static void dp8393x_do_load_cam(dp8393xState *s)while (s->regs[SONIC_CDC ] &0x1f ) {/* Fill current entry */ address_space_rw (&s->as,dp8393x_cdp (s), -MEMTXATTRS_UNSPECIFIED , s->data, size,0 ); +MEMTXATTRS_UNSPECIFIED , s->data, size, false); s->cam[index][0 ] =dp8393x_get (s, width,1 ) &0xff ; s->cam[index][1 ] =dp8393x_get (s, width,1 ) >>8 ; s->cam[index][2 ] =dp8393x_get (s, width,2 ) &0xff ;
@@ -294,7 +294,7 @@ static void dp8393x_do_load_cam(dp8393xState *s)/* Read CAM enable */ address_space_rw (&s->as,dp8393x_cdp (s), -MEMTXATTRS_UNSPECIFIED , s->data, size,0 ); +MEMTXATTRS_UNSPECIFIED , s->data, size, false); s->regs[SONIC_CE ] =dp8393x_get (s, width,0 );DPRINTF ("load cam done. cam enable mask 0x%04x\n" , s->regs[SONIC_CE ]);
@@ -312,7 +312,7 @@ static void dp8393x_do_read_rra(dp8393xState *s) width = (s->regs[SONIC_DCR ] &SONIC_DCR_DW ) ?2 :1 ; size =sizeof (uint16_t ) *4 * width;address_space_rw (&s->as,dp8393x_rrp (s), -MEMTXATTRS_UNSPECIFIED , s->data, size,0 ); +MEMTXATTRS_UNSPECIFIED , s->data, size, false);/* Update SONIC registers */ s->regs[SONIC_CRBA0 ] =dp8393x_get (s, width,0 );
@@ -427,7 +427,7 @@ static void dp8393x_do_transmit_packets(dp8393xState *s) s->regs[SONIC_TTDA ] = s->regs[SONIC_CTDA ];DPRINTF ("Transmit packet at %08x\n" ,dp8393x_ttda (s));address_space_rw (&s->as,dp8393x_ttda (s) +sizeof (uint16_t ) * width, -MEMTXATTRS_UNSPECIFIED , s->data, size,0 ); +MEMTXATTRS_UNSPECIFIED , s->data, size, false); tx_len =0 ;/* Update registers */
@@ -452,7 +452,8 @@ static void dp8393x_do_transmit_packets(dp8393xState *s) len =sizeof (s->tx_buffer) - tx_len; }address_space_rw (&s->as,dp8393x_tsa (s), -MEMTXATTRS_UNSPECIFIED , &s->tx_buffer[tx_len], len,0 ); +MEMTXATTRS_UNSPECIFIED , + &s->tx_buffer[tx_len], len, false); tx_len += len; i++;
@@ -461,7 +462,7 @@ static void dp8393x_do_transmit_packets(dp8393xState *s) size =sizeof (uint16_t ) *3 * width;address_space_rw (&s->as,dp8393x_ttda (s) +sizeof (uint16_t ) * (4 +3 * i) * width, -MEMTXATTRS_UNSPECIFIED , s->data, size,0 ); +MEMTXATTRS_UNSPECIFIED , s->data, size, false); s->regs[SONIC_TSA0 ] =dp8393x_get (s, width,0 ); s->regs[SONIC_TSA1 ] =dp8393x_get (s, width,1 ); s->regs[SONIC_TFS ] =dp8393x_get (s, width,2 );
@@ -496,7 +497,7 @@ static void dp8393x_do_transmit_packets(dp8393xState *s) size =sizeof (uint16_t ) * width;address_space_rw (&s->as,dp8393x_ttda (s), -MEMTXATTRS_UNSPECIFIED , s->data, size,1 ); +MEMTXATTRS_UNSPECIFIED , s->data, size, true);if (!(s->regs[SONIC_CR ] &SONIC_CR_HTX )) {/* Read footer of packet */
@@ -505,7 +506,7 @@ static void dp8393x_do_transmit_packets(dp8393xState *s)dp8393x_ttda (s) +sizeof (uint16_t ) * (4 +3 * s->regs[SONIC_TFC ]) * width, - MEMTXATTRS_UNSPECIFIED, s->data, size, 0); + MEMTXATTRS_UNSPECIFIED, s->data, size, false); s->regs[SONIC_CTDA ] =dp8393x_get (s, width,0 ) & ~0x1 ;if (dp8393x_get (s, width,0 ) &0x1 ) {/* EOL detected */
@@ -768,7 +769,7 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf, size =sizeof (uint16_t ) *1 * width; address =dp8393x_crda (s) +sizeof (uint16_t ) *5 * width;address_space_rw (&s->as, address,MEMTXATTRS_UNSPECIFIED , - s->data, size,0 ); + s->data, size, false);if (dp8393x_get (s, width,0 ) &0x1 ) {/* Still EOL ; stop reception */ return -1 ;
@@ -790,7 +791,7 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf,address_space_write (&s->as, address,MEMTXATTRS_UNSPECIFIED , buf, rx_len); address += rx_len;address_space_rw (&s->as, address, -MEMTXATTRS_UNSPECIFIED , &checksum,4 ,1 ); +MEMTXATTRS_UNSPECIFIED , &checksum,4 , true); rx_len +=4 ; s->regs[SONIC_CRBA1 ] = address >>16 ; s->regs[SONIC_CRBA0 ] = address &0xffff ;
@@ -819,12 +820,12 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf,dp8393x_put (s, width,4 , s->regs[SONIC_RSC ]);/* seq_no */ size =sizeof (uint16_t ) *5 * width;address_space_rw (&s->as,dp8393x_crda (s), -MEMTXATTRS_UNSPECIFIED , s->data, size,1 ); +MEMTXATTRS_UNSPECIFIED , s->data, size, true);/* Move to next descriptor */ size =sizeof (uint16_t ) * width;address_space_rw (&s->as,dp8393x_crda (s) +sizeof (uint16_t ) *5 * width, -MEMTXATTRS_UNSPECIFIED , s->data, size,0 ); +MEMTXATTRS_UNSPECIFIED , s->data, size, false); s->regs[SONIC_LLFA ] =dp8393x_get (s, width,0 );if (s->regs[SONIC_LLFA ] &0x1 ) {/* EOL detected */
@@ -838,7 +839,7 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf, } s->data[0 ] =0 ;address_space_rw (&s->as, offset,MEMTXATTRS_UNSPECIFIED , - s->data,sizeof (uint16_t ),1 ); + s->data,sizeof (uint16_t ), true); s->regs[SONIC_CRDA ] = s->regs[SONIC_LLFA ]; s->regs[SONIC_ISR ] |=SONIC_ISR_PKTRX ; s->regs[SONIC_RSC ] = (s->regs[SONIC_RSC ] &0xff00 ) | (((s->regs[SONIC_RSC ] &0x00ff ) +1 ) &0x00ff );
hw/net/i82596.c +6 -5
@@ -149,7 +149,7 @@ static void i82596_transmit(I82596State *s, uint32_t addr)if (s->nic && len) {assert (len <=sizeof (s->tx_buffer));address_space_rw (&address_space_memory, tba, -MEMTXATTRS_UNSPECIFIED , s->tx_buffer, len,0 ); +MEMTXATTRS_UNSPECIFIED , s->tx_buffer, len, false);DBG (PRINT_PKTHDR ("Send" , &s->tx_buffer));DBG (printf ("Sending %d bytes\n" , len));qemu_send_packet (qemu_get_queue (s->nic), s->tx_buffer, len);
@@ -173,7 +173,7 @@ static void set_individual_address(I82596State *s, uint32_t addr) nc =qemu_get_queue (s->nic); m = s->conf.macaddr.a;address_space_rw (&address_space_memory, addr +8 , -MEMTXATTRS_UNSPECIFIED , m,ETH_ALEN ,0 ); +MEMTXATTRS_UNSPECIFIED , m,ETH_ALEN , false);qemu_format_nic_info_str (nc, m);trace_i82596_new_mac (nc->info_str); }
@@ -192,7 +192,7 @@ static void set_multicast_list(I82596State *s, uint32_t addr)uint8_t multicast_addr[ETH_ALEN ];address_space_rw (&address_space_memory, addr + i *ETH_ALEN ,MEMTXATTRS_UNSPECIFIED , - multicast_addr,ETH_ALEN ,0 ); + multicast_addr,ETH_ALEN , false);DBG (printf ("Add multicast entry " MAC_FMT "\n" ,MAC_ARG (multicast_addr))); unsigned mcast_idx = (net_crc32(multicast_addr, ETH_ALEN) &
@@ -261,7 +261,8 @@ static void command_loop(I82596State *s) byte_cnt =MIN (byte_cnt,sizeof (s->config));/* copy byte_cnt max. */ address_space_rw (&address_space_memory, s->cmd_p +8 , -MEMTXATTRS_UNSPECIFIED , s->config, byte_cnt,0 ); +MEMTXATTRS_UNSPECIFIED , s->config, byte_cnt, + false);/* config byte according to page 35ff */ s->config[2 ] &=0x82 ;/* mask valid bits */ s->config[2 ] |=0x40 ;
@@ -647,7 +648,7 @@ ssize_t i82596_receive(NetClientState *nc, const uint8_t *buf, size_t sz) len -= num;if (len ==0 ) {/* copy crc */ address_space_rw (&address_space_memory, rba -4 , -MEMTXATTRS_UNSPECIFIED , crc_ptr,4 ,1 ); +MEMTXATTRS_UNSPECIFIED , crc_ptr,4 , true); } num |=0x4000 ;/* set F BIT */
hw/net/lasi_i82596.c +2 -2
@@ -55,8 +55,8 @@ static void lasi_82596_mem_write(void *opaque, hwaddr addr,* Provided for SeaBIOS only. Write MAC of Network card to addr @val. * Needed for the PDC_LAN_STATION_ID_READ PDC call. */ -address_space_rw (&address_space_memory, val, -MEMTXATTRS_UNSPECIFIED , d->state.conf.macaddr.a,ETH_ALEN ,1 ); +address_space_rw (&address_space_memory, val,MEMTXATTRS_UNSPECIFIED , + d->state.conf.macaddr.a,ETH_ALEN , true);break ; } }
target/i386/hvf/x86_mmu.c +4 -4
@@ -89,7 +89,7 @@ static bool get_pt_entry(struct CPUState *cpu, struct gpt_translation *pt, index =gpt_entry (pt->gva, level, pae);address_space_rw (&address_space_memory, gpa + index *pte_size (pae), -MEMTXATTRS_UNSPECIFIED , &pte,pte_size (pae),0 ); +MEMTXATTRS_UNSPECIFIED , &pte,pte_size (pae), false); pt->pte[level -1 ] = pte;
@@ -238,8 +238,8 @@ void vmx_write_mem(struct CPUState *cpu, target_ulong gva, void *data, int bytesif (!mmu_gva_to_gpa (cpu, gva, &gpa)) {VM_PANIC_EX ("%s: mmu_gva_to_gpa %llx failed\n" , __func__, gva); }else { -address_space_rw (&address_space_memory, gpa,MEMTXATTRS_UNSPECIFIED , - data, copy,1 ); +address_space_rw (&address_space_memory, gpa, +MEMTXATTRS_UNSPECIFIED , data, copy, true); } bytes -= copy;
@@ -260,7 +260,7 @@ void vmx_read_mem(struct CPUState *cpu, void *data, target_ulong gva, int bytes)VM_PANIC_EX ("%s: mmu_gva_to_gpa %llx failed\n" , __func__, gva); }address_space_rw (&address_space_memory, gpa,MEMTXATTRS_UNSPECIFIED , - data, copy,0 ); + data, copy, false); bytes -= copy; gva += copy;
Signature · 1 line
2.21.1
PATCH v3 17/20 Avoid address_space_rw() with a constant is_write argument
In reply to Philippe Mathieu-DaudéFrom: Peter Maydell <[email protected]>
The address_space_rw() function allows either reads or writes depending on the is_write argument passed to it; this is useful when the direction of the access is determined programmatically (as for instance when handling the KVM_EXIT_MMIO exit reason). Under the hood it just calls either address_space_write() or address_space_read_full().
We also use it a lot with a constant is_write argument, though, which has two issues:
* when reading "address_space_rw(..., 1)" this is less immediately clear to the reader as being a write than "address_space_write(...)"
* calling address_space_rw() bypasses the optimization in address_space_read() that fast-paths reads of a fixed length
This commit was produced with the included Coccinelle script scripts/coccinelle/exec_rw_const.cocci.
Message-Id: <[email protected]>
--- scripts/coccinelle/exec_rw_const.cocci | 13 +++++ target/i386/hvf/vmx.h | 7 ++- accel/kvm/kvm-all.c | 6 +-- dma-helpers.c | 4 +- exec.c | 4 +- hw/dma/xlnx-zdma.c | 11 ++-- hw/net/dp8393x.c | 70 ++++++++++++++------------ hw/net/i82596.c | 22 ++++---- hw/net/lasi_i82596.c | 5 +- hw/ppc/pnv_lpc.c | 8 +-- hw/s390x/css.c | 12 ++--- qtest.c | 52 +++++++++---------- target/i386/hvf/x86_mmu.c | 12 ++--- 13 files changed, 119 insertions(+), 107 deletions(-)
scripts/coccinelle/exec_rw_const.cocci +13 -0
@@ -27,6 +27,19 @@ expression E1, E2, E3, E4; + address_space_write(E1, E2, E3, V, E4) ) +// Avoid uses of address_space_rw() with a constant is_write argument. +@@ +expression E1, E2, E3, E4, E5; +symbol true, false; +@@ +( +- address_space_rw(E1, E2, E3, E4, E5, false) ++ address_space_read(E1, E2, E3, E4, E5) +| +- address_space_rw(E1, E2, E3, E4, E5, true) ++ address_space_write(E1, E2, E3, E4, E5) +) + // Remove useless cast @@ expression E1, E2, E3, E4, E5, E6;
target/i386/hvf/vmx.h +3 -4
@@ -125,10 +125,9 @@ static inline void macvm_set_cr0(hv_vcpuid_t vcpu, uint64_t cr0)if ((cr0 &CR0_PG ) && (rvmcs (vcpu,VMCS_GUEST_CR4 ) &CR4_PAE ) && !(efer &MSR_EFER_LME )) { -address_space_rw (&address_space_memory, -rvmcs (vcpu,VMCS_GUEST_CR3 ) & ~0x1f , -MEMTXATTRS_UNSPECIFIED , - pdpte,32 , false); +address_space_read (&address_space_memory, +rvmcs (vcpu,VMCS_GUEST_CR3 ) & ~0x1f , +MEMTXATTRS_UNSPECIFIED , pdpte,32 );/* Only set PDPTE when appropriate. */ for (i =0 ; i <4 ; i++) {wvmcs (vcpu,VMCS_GUEST_PDPTE0 + i *2 , pdpte[i]);
accel/kvm/kvm-all.c +3 -3
@@ -2178,9 +2178,9 @@ void kvm_flush_coalesced_mmio_buffer(void) ent = &ring->coalesced_mmio[ring->first];if (ent->pio ==1 ) { -address_space_rw (&address_space_io, ent->phys_addr, -MEMTXATTRS_UNSPECIFIED , ent->data, - ent->len, true); +address_space_write (&address_space_io, ent->phys_addr, +MEMTXATTRS_UNSPECIFIED , ent->data, + ent->len); }else {cpu_physical_memory_write (ent->phys_addr, ent->data, ent->len); }
dma-helpers.c +2 -2
@@ -28,8 +28,8 @@ int dma_memory_set(AddressSpace *as, dma_addr_t addr, uint8_t c, dma_addr_t len)memset (fillbuf, c,FILLBUF_SIZE );while (len >0 ) { l = len <FILLBUF_SIZE ? len :FILLBUF_SIZE ; - error |=address_space_rw (as, addr,MEMTXATTRS_UNSPECIFIED , - fillbuf, l, true); + error |=address_space_write (as, addr,MEMTXATTRS_UNSPECIFIED , + fillbuf, l); len -= l; addr += l; }
exec.c +2 -2
@@ -3815,8 +3815,8 @@ int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr,address_space_write_rom (cpu->cpu_ases[asidx].as, phys_addr, attrs, buf, l); }else { -address_space_rw (cpu->cpu_ases[asidx].as, phys_addr, attrs, buf, - l, false); +address_space_read (cpu->cpu_ases[asidx].as, phys_addr, attrs, buf, + l); } len -= l; buf += l;
hw/dma/xlnx-zdma.c +4 -7
@@ -311,8 +311,7 @@ static bool zdma_load_descriptor(XlnxZDMA *s, uint64_t addr, void *buf)return false; } -address_space_rw (s->dma_as, addr, s->attr, - buf,sizeof (XlnxZDMADescr), false); +address_space_read (s->dma_as, addr, s->attr, buf,sizeof (XlnxZDMADescr));return true; }
@@ -364,7 +363,7 @@ static uint64_t zdma_update_descr_addr(XlnxZDMA *s, bool type, }else { addr =zdma_get_regaddr64 (s, basereg); addr +=sizeof (s->dsc_dst); -address_space_rw (s->dma_as, addr, s->attr, &next,8 , false); +address_space_read (s->dma_as, addr, s->attr, &next,8 );zdma_put_regaddr64 (s, basereg, next); }return next;
@@ -416,8 +415,7 @@ static void zdma_write_dst(XlnxZDMA *s, uint8_t *buf, uint32_t len) } } -address_space_rw (s->dma_as, s->dsc_dst.addr, s->attr, buf, dlen, - true); +address_space_write (s->dma_as, s->dsc_dst.addr, s->attr, buf, dlen);if (burst_type ==AXI_BURST_INCR ) { s->dsc_dst.addr += dlen; }
@@ -493,8 +491,7 @@ static void zdma_process_descr(XlnxZDMA *s) len = s->cfg.bus_width /8 ; } }else { -address_space_rw (s->dma_as, src_addr, s->attr, s->buf, len, - false); +address_space_read (s->dma_as, src_addr, s->attr, s->buf, len);if (burst_type ==AXI_BURST_INCR ) { src_addr += len; }
hw/net/dp8393x.c +37 -33
144 lines not on this page · raw message
hw/net/i82596.c +10 -12
@@ -148,8 +148,8 @@ static void i82596_transmit(I82596State *s, uint32_t addr)if (s->nic && len) {assert (len <=sizeof (s->tx_buffer)); -address_space_rw (&address_space_memory, tba, -MEMTXATTRS_UNSPECIFIED , s->tx_buffer, len, false); +address_space_read (&address_space_memory, tba, +MEMTXATTRS_UNSPECIFIED , s->tx_buffer, len);DBG (PRINT_PKTHDR ("Send" , &s->tx_buffer));DBG (printf ("Sending %d bytes\n" , len));qemu_send_packet (qemu_get_queue (s->nic), s->tx_buffer, len);
@@ -172,8 +172,8 @@ static void set_individual_address(I82596State *s, uint32_t addr) nc =qemu_get_queue (s->nic); m = s->conf.macaddr.a; -address_space_rw (&address_space_memory, addr +8 , -MEMTXATTRS_UNSPECIFIED , m,ETH_ALEN , false); +address_space_read (&address_space_memory, addr +8 , +MEMTXATTRS_UNSPECIFIED , m,ETH_ALEN );qemu_format_nic_info_str (nc, m);trace_i82596_new_mac (nc->info_str); }
@@ -190,9 +190,8 @@ static void set_multicast_list(I82596State *s, uint32_t addr) }for (i =0 ; i < mc_count; i++) {uint8_t multicast_addr[ETH_ALEN ]; -address_space_rw (&address_space_memory, - addr + i *ETH_ALEN ,MEMTXATTRS_UNSPECIFIED , - multicast_addr,ETH_ALEN , false); +address_space_read (&address_space_memory, addr + i *ETH_ALEN , +MEMTXATTRS_UNSPECIFIED , multicast_addr,ETH_ALEN );DBG (printf ("Add multicast entry " MAC_FMT "\n" ,MAC_ARG (multicast_addr))); unsigned mcast_idx = (net_crc32(multicast_addr, ETH_ALEN) &
@@ -260,9 +259,8 @@ static void command_loop(I82596State *s) byte_cnt =MAX (byte_cnt,4 ); byte_cnt =MIN (byte_cnt,sizeof (s->config));/* copy byte_cnt max. */ -address_space_rw (&address_space_memory, s->cmd_p +8 , -MEMTXATTRS_UNSPECIFIED , s->config, byte_cnt, - false); +address_space_read (&address_space_memory, s->cmd_p +8 , +MEMTXATTRS_UNSPECIFIED , s->config, byte_cnt);/* config byte according to page 35ff */ s->config[2 ] &=0x82 ;/* mask valid bits */ s->config[2 ] |=0x40 ;
@@ -647,8 +645,8 @@ ssize_t i82596_receive(NetClientState *nc, const uint8_t *buf, size_t sz) buf += num; len -= num;if (len ==0 ) {/* copy crc */ -address_space_rw (&address_space_memory, rba -4 , -MEMTXATTRS_UNSPECIFIED , crc_ptr,4 , true); +address_space_write (&address_space_memory, rba -4 , +MEMTXATTRS_UNSPECIFIED , crc_ptr,4 ); } num |=0x4000 ;/* set F BIT */
hw/net/lasi_i82596.c +3 -2
@@ -55,8 +55,9 @@ static void lasi_82596_mem_write(void *opaque, hwaddr addr,* Provided for SeaBIOS only. Write MAC of Network card to addr @val. * Needed for the PDC_LAN_STATION_ID_READ PDC call. */ -address_space_rw (&address_space_memory, val,MEMTXATTRS_UNSPECIFIED , - d->state.conf.macaddr.a,ETH_ALEN , true); +address_space_write (&address_space_memory, val, +MEMTXATTRS_UNSPECIFIED , d->state.conf.macaddr.a, +ETH_ALEN );break ; } }
hw/ppc/pnv_lpc.c +4 -4
@@ -238,16 +238,16 @@ static bool opb_read(PnvLpcController *lpc, uint32_t addr, uint8_t *data, int sz) {/* XXX Handle access size limits and FW read caching here */ -return !address_space_rw (&lpc->opb_as, addr,MEMTXATTRS_UNSPECIFIED , - data, sz, false); +return !address_space_read (&lpc->opb_as, addr,MEMTXATTRS_UNSPECIFIED , + data, sz); }static bool opb_write (PnvLpcController *lpc,uint32_t addr,uint8_t *data,int sz) {/* XXX Handle access size limits here */ -return !address_space_rw (&lpc->opb_as, addr,MEMTXATTRS_UNSPECIFIED , - data, sz, true); +return !address_space_write (&lpc->opb_as, addr,MEMTXATTRS_UNSPECIFIED , + data, sz); }#define ECCB_CTL_READ PPC_BIT(15)
hw/s390x/css.c +6 -6
@@ -874,18 +874,18 @@ static inline int ida_read_next_idaw(CcwDataStream *cds)if (idaw_addr &0x07 || !cds_ccw_addrs_ok (idaw_addr,0 , ccw_fmt1)) {return -EINVAL ;/* channel program check */ } - ret =address_space_rw (&address_space_memory, idaw_addr, -MEMTXATTRS_UNSPECIFIED , &idaw.fmt2, -sizeof (idaw.fmt2), false); + ret =address_space_read (&address_space_memory, idaw_addr, +MEMTXATTRS_UNSPECIFIED , &idaw.fmt2, +sizeof (idaw.fmt2)); cds->cda =be64_to_cpu (idaw.fmt2); }else { idaw_addr = cds->cda_orig +sizeof (idaw.fmt1) * cds->at_idaw;if (idaw_addr &0x03 || !cds_ccw_addrs_ok (idaw_addr,0 , ccw_fmt1)) {return -EINVAL ;/* channel program check */ } - ret =address_space_rw (&address_space_memory, idaw_addr, -MEMTXATTRS_UNSPECIFIED , &idaw.fmt1, -sizeof (idaw.fmt1), false); + ret =address_space_read (&address_space_memory, idaw_addr, +MEMTXATTRS_UNSPECIFIED , &idaw.fmt1, +sizeof (idaw.fmt1)); cds->cda =be64_to_cpu (idaw.fmt1);if (cds->cda &0x80000000 ) {return -EINVAL ;/* channel program check */
qtest.c +26 -26
111 lines not on this page · raw message
target/i386/hvf/x86_mmu.c +6 -6
@@ -88,8 +88,8 @@ static bool get_pt_entry(struct CPUState *cpu, struct gpt_translation *pt, } index =gpt_entry (pt->gva, level, pae); -address_space_rw (&address_space_memory, gpa + index *pte_size (pae), -MEMTXATTRS_UNSPECIFIED , &pte,pte_size (pae), false); +address_space_read (&address_space_memory, gpa + index *pte_size (pae), +MEMTXATTRS_UNSPECIFIED , &pte,pte_size (pae)); pt->pte[level -1 ] = pte;
@@ -238,8 +238,8 @@ void vmx_write_mem(struct CPUState *cpu, target_ulong gva, void *data, int bytesif (!mmu_gva_to_gpa (cpu, gva, &gpa)) {VM_PANIC_EX ("%s: mmu_gva_to_gpa %llx failed\n" , __func__, gva); }else { -address_space_rw (&address_space_memory, gpa, -MEMTXATTRS_UNSPECIFIED , data, copy, true); +address_space_write (&address_space_memory, gpa, +MEMTXATTRS_UNSPECIFIED , data, copy); } bytes -= copy;
@@ -259,8 +259,8 @@ void vmx_read_mem(struct CPUState *cpu, void *data, target_ulong gva, int bytes)if (!mmu_gva_to_gpa (cpu, gva, &gpa)) {VM_PANIC_EX ("%s: mmu_gva_to_gpa %llx failed\n" , __func__, gva); } -address_space_rw (&address_space_memory, gpa,MEMTXATTRS_UNSPECIFIED , - data, copy, false); +address_space_read (&address_space_memory, gpa,MEMTXATTRS_UNSPECIFIED , + data, copy); bytes -= copy; gva += copy;
Signature · 1 line
2.21.1
PATCH v3 18/20 exec: Let cpu_[physical]_memory API use a boolean 'is_write' argument
In reply to Philippe Mathieu-DaudéThe 'is_write' argument is either 0 or 1.
Convert it to a boolean type.
--- include/exec/cpu-all.h | 2 +- include/exec/cpu-common.h | 6 +++--- exec.c | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-)
include/exec/cpu-all.h +1 -1
@@ -388,7 +388,7 @@ void dump_opcount_info(void);#endif /* !CONFIG_USER_ONLY */ int cpu_memory_rw_debug (CPUState *cpu,target_ulong addr, -void *ptr,target_ulong len,int is_write); +void *ptr,target_ulong len,bool is_write);int cpu_exec (CPUState *cpu);
include/exec/cpu-common.h +3 -3
@@ -70,7 +70,7 @@ size_t qemu_ram_pagesize(RAMBlock *block);size_t qemu_ram_pagesize_largest (void );void cpu_physical_memory_rw (hwaddr addr,void *buf, -hwaddr len,int is_write); +hwaddr len,bool is_write);static inline void cpu_physical_memory_read (hwaddr addr,void *buf,hwaddr len) {
@@ -83,9 +83,9 @@ static inline void cpu_physical_memory_write(hwaddr addr, }void *cpu_physical_memory_map (hwaddr addr,hwaddr *plen, -int is_write); +bool is_write);void cpu_physical_memory_unmap (void *buffer,hwaddr len, -int is_write,hwaddr access_len); +bool is_write,hwaddr access_len);void cpu_register_map_client (QEMUBH *bh);void cpu_unregister_map_client (QEMUBH *bh);
exec.c +5 -5
@@ -3019,7 +3019,7 @@ 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, -void *ptr,target_ulong len,int is_write) +void *ptr,target_ulong len,bool is_write) {int flags;target_ulong l, page;
@@ -3313,7 +3313,7 @@ MemTxResult address_space_rw(AddressSpace *as, hwaddr addr, MemTxAttrs attrs, }void cpu_physical_memory_rw (hwaddr addr,void *buf, -hwaddr len,int is_write) +hwaddr len,bool is_write) {address_space_rw (&address_space_memory, addr,MEMTXATTRS_UNSPECIFIED , buf, len, is_write);
@@ -3632,14 +3632,14 @@ void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len,void *cpu_physical_memory_map (hwaddr addr,hwaddr *plen, -int is_write) +bool is_write) {return address_space_map (&address_space_memory, addr, plen, is_write,MEMTXATTRS_UNSPECIFIED ); }void cpu_physical_memory_unmap (void *buffer,hwaddr len, -int is_write,hwaddr access_len) +bool is_write,hwaddr access_len) {return address_space_unmap (&address_space_memory, buffer, len, is_write, access_len); }
@@ -3790,7 +3790,7 @@ address_space_write_cached_slow(MemoryRegionCache *cache, hwaddr addr,/* virtual memory access for debug (includes writing to ROM) */ int cpu_memory_rw_debug (CPUState *cpu,target_ulong addr, -void *ptr,target_ulong len,int is_write) +void *ptr,target_ulong len,bool is_write) {hwaddr phys_addr;target_ulong l, page;
Signature · 1 line
2.21.1
PATCH v3 19/20 Let cpu_[physical]_memory() calls pass a boolean 'is_write' argument
In reply to Philippe Mathieu-DaudéUse an explicit boolean type.
This commit was produced with the included Coccinelle script scripts/coccinelle/exec_rw_const.
--- scripts/coccinelle/exec_rw_const.cocci | 14 ++++++++++++++ include/exec/cpu-common.h | 4 ++-- hw/display/exynos4210_fimd.c | 3 ++- hw/display/milkymist-tmu2.c | 8 ++++---- hw/display/omap_dss.c | 2 +- hw/display/ramfb.c | 2 +- hw/misc/pc-testdev.c | 2 +- hw/nvram/spapr_nvram.c | 4 ++-- hw/ppc/ppc440_uc.c | 6 ++++-- hw/ppc/spapr_hcall.c | 4 ++-- hw/s390x/ipl.c | 2 +- hw/s390x/s390-pci-bus.c | 2 +- hw/s390x/virtio-ccw.c | 2 +- hw/xen/xen_pt_graphics.c | 2 +- target/i386/hax-all.c | 4 ++-- target/s390x/excp_helper.c | 2 +- target/s390x/helper.c | 6 +++--- 17 files changed, 43 insertions(+), 26 deletions(-)
scripts/coccinelle/exec_rw_const.cocci +14 -0
@@ -11,6 +11,20 @@ expression E1, E2, E3, E4, E5; | - address_space_rw(E1, E2, E3, E4, E5, 1) + address_space_rw(E1, E2, E3, E4, E5, true) +| + +- cpu_physical_memory_rw(E1, E2, E3, 0) ++ cpu_physical_memory_rw(E1, E2, E3, false) +| +- cpu_physical_memory_rw(E1, E2, E3, 1) ++ cpu_physical_memory_rw(E1, E2, E3, true) +| + +- cpu_physical_memory_map(E1, E2, 0) ++ cpu_physical_memory_map(E1, E2, false) +| +- cpu_physical_memory_map(E1, E2, 1) ++ cpu_physical_memory_map(E1, E2, true) ) // Use address_space_write instead of casting to non-const
include/exec/cpu-common.h +2 -2
@@ -74,12 +74,12 @@ void cpu_physical_memory_rw(hwaddr addr, void *buf,static inline void cpu_physical_memory_read (hwaddr addr,void *buf,hwaddr len) { -cpu_physical_memory_rw (addr, buf, len,0 ); +cpu_physical_memory_rw (addr, buf, len, false); }static inline void cpu_physical_memory_write (hwaddr addr,const void *buf,hwaddr len) { -cpu_physical_memory_rw (addr, (void *)buf, len,1 ); +cpu_physical_memory_rw (addr, (void *)buf, len, true); } void *cpu_physical_memory_map(hwaddr addr, hwaddr *plen,
hw/display/exynos4210_fimd.c +2 -1
@@ -1164,7 +1164,8 @@ static void fimd_update_memory_section(Exynos4210fimdState *s, unsigned win) goto error_return; } - w->host_fb_addr =cpu_physical_memory_map (fb_start_addr, &fb_mapped_len,0 ); + w->host_fb_addr =cpu_physical_memory_map (fb_start_addr, &fb_mapped_len, + false);if (!w->host_fb_addr) {DPRINT_ERROR ("Failed to map window %u framebuffer\n" , win); goto error_return;
hw/display/milkymist-tmu2.c +4 -4
@@ -218,7 +218,7 @@ static void tmu2_start(MilkymistTMU2State *s)glGenTextures (1 , &texture);glBindTexture (GL_TEXTURE_2D , texture); fb_len =2ULL * s->regs[R_TEXHRES ] * s->regs[R_TEXVRES ]; - fb =cpu_physical_memory_map (s->regs[R_TEXFBUF ], &fb_len,0 ); + fb =cpu_physical_memory_map (s->regs[R_TEXFBUF ], &fb_len, false);if (fb ==NULL ) {glDeleteTextures (1 , &texture);glXMakeContextCurrent (s->dpy, None, None,NULL );
@@ -262,7 +262,7 @@ static void tmu2_start(MilkymistTMU2State *s)/* Read the QEMU dest. framebuffer into the OpenGL framebuffer */ fb_len =2ULL * s->regs[R_DSTHRES ] * s->regs[R_DSTVRES ]; - fb =cpu_physical_memory_map (s->regs[R_DSTFBUF ], &fb_len,0 ); + fb =cpu_physical_memory_map (s->regs[R_DSTFBUF ], &fb_len, false);if (fb ==NULL ) {glDeleteTextures (1 , &texture);glXMakeContextCurrent (s->dpy, None, None,NULL );
@@ -281,7 +281,7 @@ static void tmu2_start(MilkymistTMU2State *s)/* Map the texture */ mesh_len =MESH_MAXSIZE *MESH_MAXSIZE *sizeof (struct vertex ); - mesh =cpu_physical_memory_map (s->regs[R_VERTICESADDR ], &mesh_len,0 ); + mesh =cpu_physical_memory_map (s->regs[R_VERTICESADDR ], &mesh_len, false);if (mesh ==NULL ) {glDeleteTextures (1 , &texture);glXMakeContextCurrent (s->dpy, None, None,NULL );
@@ -298,7 +298,7 @@ static void tmu2_start(MilkymistTMU2State *s)/* Write back the OpenGL framebuffer to the QEMU framebuffer */ fb_len =2ULL * s->regs[R_DSTHRES ] * s->regs[R_DSTVRES ]; - fb =cpu_physical_memory_map (s->regs[R_DSTFBUF ], &fb_len,1 ); + fb =cpu_physical_memory_map (s->regs[R_DSTFBUF ], &fb_len, true);if (fb ==NULL ) {glDeleteTextures (1 , &texture);glXMakeContextCurrent (s->dpy, None, None,NULL );
hw/display/omap_dss.c +1 -1
@@ -632,7 +632,7 @@ static void omap_rfbi_transfer_start(struct omap_dss_s *s) len = s->rfbi.pixels *2 ; data_addr = s->dispc.l[0 ].addr[0 ]; - data =cpu_physical_memory_map (data_addr, &len,0 ); + data =cpu_physical_memory_map (data_addr, &len, false);if (data && len != s->rfbi.pixels *2 ) {cpu_physical_memory_unmap (data, len,0 ,0 ); data =NULL ;
hw/display/ramfb.c +1 -1
@@ -57,7 +57,7 @@ static DisplaySurface *ramfb_create_display_surface(int width, int height, } size = (hwaddr )linesize * height; - data =cpu_physical_memory_map (addr, &size,0 ); + data =cpu_physical_memory_map (addr, &size, false);if (size != (hwaddr )linesize * height) {cpu_physical_memory_unmap (data, size,0 ,0 );return NULL ;
hw/misc/pc-testdev.c +1 -1
@@ -125,7 +125,7 @@ static void test_flush_page_write(void *opaque, hwaddr addr, uint64_t data, unsigned len) {hwaddr page =4096 ; -void *a =cpu_physical_memory_map (data & ~0xffful , &page,0 ); +void *a =cpu_physical_memory_map (data & ~0xffful , &page, false);/* We might not be able to get the full page, only mprotect what we actually have mapped */
hw/nvram/spapr_nvram.c +2 -2
@@ -89,7 +89,7 @@ static void rtas_nvram_fetch(PowerPCCPU *cpu, SpaprMachineState *spapr,assert (nvram->buf); - membuf =cpu_physical_memory_map (buffer, &len,1 ); + membuf =cpu_physical_memory_map (buffer, &len, true);memcpy (membuf, nvram->buf + offset, len);cpu_physical_memory_unmap (membuf, len,1 , len);
@@ -127,7 +127,7 @@ static void rtas_nvram_store(PowerPCCPU *cpu, SpaprMachineState *spapr,return ; } - membuf =cpu_physical_memory_map (buffer, &len,0 ); + membuf =cpu_physical_memory_map (buffer, &len, false); alen = len;if (nvram->blk) {
hw/ppc/ppc440_uc.c +4 -2
@@ -909,8 +909,10 @@ static void dcr_write_dma(void *opaque, int dcrn, uint32_t val) sidx = didx =0 ; width =1 << ((val &DMA0_CR_PW ) >>25 ); - rptr =cpu_physical_memory_map (dma->ch[chnl].sa, &rlen,0 ); - wptr =cpu_physical_memory_map (dma->ch[chnl].da, &wlen,1 ); + rptr =cpu_physical_memory_map (dma->ch[chnl].sa, &rlen, + false); + wptr =cpu_physical_memory_map (dma->ch[chnl].da, &wlen, + true);if (rptr && wptr) {if (!(val &DMA0_CR_DEC ) && val &DMA0_CR_SAI && val &DMA0_CR_DAI ) {
hw/ppc/spapr_hcall.c +2 -2
@@ -832,7 +832,7 @@ static target_ulong h_page_init(PowerPCCPU *cpu, SpaprMachineState *spapr,if (!is_ram_address (spapr, dst) || (dst & ~TARGET_PAGE_MASK ) !=0 ) {return H_PARAMETER ; } - pdst =cpu_physical_memory_map (dst, &len,1 ); + pdst =cpu_physical_memory_map (dst, &len, true);if (!pdst || len !=TARGET_PAGE_SIZE ) {return H_PARAMETER ; }
@@ -843,7 +843,7 @@ static target_ulong h_page_init(PowerPCCPU *cpu, SpaprMachineState *spapr, ret =H_PARAMETER ; goto unmap_out; } - psrc =cpu_physical_memory_map (src, &len,0 ); + psrc =cpu_physical_memory_map (src, &len, false);if (!psrc || len !=TARGET_PAGE_SIZE ) { ret =H_PARAMETER ; goto unmap_out;
hw/s390x/ipl.c +1 -1
@@ -626,7 +626,7 @@ static void s390_ipl_prepare_qipl(S390CPU *cpu)uint8_t *addr;uint64_t len =4096 ; - addr =cpu_physical_memory_map (cpu->env.psa, &len,1 ); + addr =cpu_physical_memory_map (cpu->env.psa, &len, true);if (!addr || len <QIPL_ADDRESS +sizeof (QemuIplParameters)) {error_report ("Cannot set QEMU IPL parameters" );return ;
hw/s390x/s390-pci-bus.c +1 -1
@@ -641,7 +641,7 @@ static uint8_t set_ind_atomic(uint64_t ind_loc, uint8_t to_be_set)hwaddr len =1 ;uint8_t *ind_addr; - ind_addr =cpu_physical_memory_map (ind_loc, &len,1 ); + ind_addr =cpu_physical_memory_map (ind_loc, &len, true);if (!ind_addr) {s390_pci_generate_error_event (ERR_EVENT_AIRERR ,0 ,0 ,0 ,0 );return -1 ;
hw/s390x/virtio-ccw.c +1 -1
@@ -790,7 +790,7 @@ static uint8_t virtio_set_ind_atomic(SubchDev *sch, uint64_t ind_loc,hwaddr len =1 ;uint8_t *ind_addr; - ind_addr =cpu_physical_memory_map (ind_loc, &len,1 ); + ind_addr =cpu_physical_memory_map (ind_loc, &len, true);if (!ind_addr) {error_report ("%s(%x.%x.%04x): unable to access indicator" , __func__, sch->cssid, sch->ssid, sch->schid);
hw/xen/xen_pt_graphics.c +1 -1
@@ -222,7 +222,7 @@ void xen_pt_setup_vga(XenPCIPassthroughState *s, XenHostPCIDevice *dev, }/* Currently we fixed this address as a primary for legacy BIOS. */ -cpu_physical_memory_rw (0xc0000 , bios, bios_size,1 ); +cpu_physical_memory_rw (0xc0000 , bios, bios_size, true); }uint32_t igd_read_opregion (XenPCIPassthroughState *s)
target/i386/hax-all.c +2 -2
@@ -376,8 +376,8 @@ static int hax_handle_fastmmio(CPUArchState *env, struct hax_fastmmio *hft)* hft->direction == 2: gpa ==> gpa2 */ uint64_t value; -cpu_physical_memory_rw (hft->gpa, &value, hft->size,0 ); -cpu_physical_memory_rw (hft->gpa2, &value, hft->size,1 ); +cpu_physical_memory_rw (hft->gpa, &value, hft->size, false); +cpu_physical_memory_rw (hft->gpa2, &value, hft->size, true); }return 0 ;
target/s390x/excp_helper.c +1 -1
@@ -393,7 +393,7 @@ static int mchk_store_vregs(CPUS390XState *env, uint64_t mcesao)MchkExtSaveArea *sa;int i; - sa =cpu_physical_memory_map (mcesao, &len,1 ); + sa =cpu_physical_memory_map (mcesao, &len, true);if (!sa) {return -EFAULT ; }
target/s390x/helper.c +3 -3
@@ -151,7 +151,7 @@ LowCore *cpu_map_lowcore(CPUS390XState *env)LowCore *lowcore;hwaddr len =sizeof (LowCore); - lowcore =cpu_physical_memory_map (env->psa, &len,1 ); + lowcore =cpu_physical_memory_map (env->psa, &len, true);if (len <sizeof (LowCore)) {cpu_abort (env_cpu (env),"Could not map lowcore\n" );
@@ -246,7 +246,7 @@ int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch)hwaddr len =sizeof (*sa);int i; - sa =cpu_physical_memory_map (addr, &len,1 ); + sa =cpu_physical_memory_map (addr, &len, true);if (!sa) {return -EFAULT ; }
@@ -298,7 +298,7 @@ int s390_store_adtl_status(S390CPU *cpu, hwaddr addr, hwaddr len)hwaddr save = len;int i; - sa =cpu_physical_memory_map (addr, &save,1 ); + sa =cpu_physical_memory_map (addr, &save, true);if (!sa) {return -EFAULT ; }
Signature · 1 line
2.21.1
RE: [Xen-devel] [PATCH v3 19/20] Let cpu_[physical]_memory() calls pass a boolean 'is_write' argument
Quoted 30 lines
-----Original Message-----
From: Xen-devel <[email protected]> On Behalf Of Philippe Mathieu-Daudé
Sent: 20 February 2020 13:06
To: Peter Maydell <[email protected]>; [email protected]
Cc: Fam Zheng <[email protected]>; Dmitry Fleytman <[email protected]>; [email protected]; Michael S. Tsirkin <[email protected]>; Jason Wang <[email protected]>; Gerd Hoffmann <[email protected]>; Edgar E. Iglesias <[email protected]>; Stefano Stabellini <[email protected]>; Matthew Rosato <[email protected]>; [email protected]; David Hildenbrand <[email protected]>; Halil Pasic <[email protected]>; Christian Borntraeger <[email protected]>; Hervé Poussineau <[email protected]>; Marcel Apfelbaum <[email protected]>; Anthony Perard <[email protected]>; xen- [email protected]; Aleksandar Rikalo <aleksandar.rikalo@rt- rk.com>; Richard Henderson <[email protected]>; Philippe Mathieu-Daudé <[email protected]>; Laurent Vivier <[email protected]>; Thomas Huth <[email protected]>; Eduardo Habkost <[email protected]>; Stefan Weil <[email protected]>; Alistair Francis <[email protected]>; Richard Henderson <[email protected]>; Paul Durrant <[email protected]>; Eric Auger <[email protected]>; [email protected]; qemu- [email protected]; Cédric Le Goater <[email protected]>; John Snow <[email protected]>; David Gibson <[email protected]>; Igor Mitsyanko <[email protected]>; Cornelia Huck <[email protected]>; Michael Walle <[email protected]>; [email protected]; Paolo Bonzini <[email protected]>
Subject: [Xen-devel] [PATCH v3 19/20] Let cpu_[physical]_memory() calls pass a boolean 'is_write' argument
Quoted 6 lines
Use an explicit boolean type.
This commit was produced with the included Coccinelle script
scripts/coccinelle/exec_rw_const.Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Re: [PATCH v3 19/20] Let cpu_[physical]_memory() calls pass a boolean 'is_write' argument
In reply to Philippe Mathieu-DaudéQuoted 6 lines · Philippe Mathieu-Daudé
Use an explicit boolean type.
This commit was produced with the included Coccinelle script
scripts/coccinelle/exec_rw_const.Signed-off-by Philippe Mathieu-Daudé <[email protected]>
ppc parts
Quoted 329 lines
--- scripts/coccinelle/exec_rw_const.cocci | 14 ++++++++++++++ include/exec/cpu-common.h | 4 ++-- hw/display/exynos4210_fimd.c | 3 ++- hw/display/milkymist-tmu2.c | 8 ++++---- hw/display/omap_dss.c | 2 +- hw/display/ramfb.c | 2 +- hw/misc/pc-testdev.c | 2 +- hw/nvram/spapr_nvram.c | 4 ++-- hw/ppc/ppc440_uc.c | 6 ++++-- hw/ppc/spapr_hcall.c | 4 ++-- hw/s390x/ipl.c | 2 +- hw/s390x/s390-pci-bus.c | 2 +- hw/s390x/virtio-ccw.c | 2 +- hw/xen/xen_pt_graphics.c | 2 +- target/i386/hax-all.c | 4 ++-- target/s390x/excp_helper.c | 2 +- target/s390x/helper.c | 6 +++--- 17 files changed, 43 insertions(+), 26 deletions(-)scripts/coccinelle/exec_rw_const.cocci +14
-0@@ -11,6 +11,20 @@ expression E1, E2, E3, E4, E5; | - address_space_rw(E1, E2, E3, E4, E5, 1) + address_space_rw(E1, E2, E3, E4, E5, true) +| + +- cpu_physical_memory_rw(E1, E2, E3, 0) ++ cpu_physical_memory_rw(E1, E2, E3, false) +| +- cpu_physical_memory_rw(E1, E2, E3, 1) ++ cpu_physical_memory_rw(E1, E2, E3, true) +| + +- cpu_physical_memory_map(E1, E2, 0) ++ cpu_physical_memory_map(E1, E2, false) +| +- cpu_physical_memory_map(E1, E2, 1) ++ cpu_physical_memory_map(E1, E2, true) ) // Use address_space_write instead of casting to non-constinclude/exec/cpu-common.h +2
-2@@ -74,12 +74,12 @@ void cpu_physical_memory_rw(hwaddr addr, void *buf,static inline void cpu_physical_memory_read (hwaddr addr,void *buf,hwaddr len) { -cpu_physical_memory_rw (addr, buf, len,0 ); +cpu_physical_memory_rw (addr, buf, len, false); }static inline void cpu_physical_memory_write (hwaddr addr,const void *buf,hwaddr len) { -cpu_physical_memory_rw (addr, (void *)buf, len,1 ); +cpu_physical_memory_rw (addr, (void *)buf, len, true); } void *cpu_physical_memory_map(hwaddr addr, hwaddr *plen,hw/display/exynos4210_fimd.c +2
-1@@ -1164,7 +1164,8 @@ static void fimd_update_memory_section(Exynos4210fimdState *s, unsigned win) goto error_return; } - w->host_fb_addr =cpu_physical_memory_map (fb_start_addr, &fb_mapped_len,0 ); + w->host_fb_addr =cpu_physical_memory_map (fb_start_addr, &fb_mapped_len, + false);if (!w->host_fb_addr) {DPRINT_ERROR ("Failed to map window %u framebuffer\n" , win); goto error_return;hw/display/milkymist-tmu2.c +4
-4@@ -218,7 +218,7 @@ static void tmu2_start(MilkymistTMU2State *s)glGenTextures (1 , &texture);glBindTexture (GL_TEXTURE_2D , texture); fb_len =2ULL * s->regs[R_TEXHRES ] * s->regs[R_TEXVRES ]; - fb =cpu_physical_memory_map (s->regs[R_TEXFBUF ], &fb_len,0 ); + fb =cpu_physical_memory_map (s->regs[R_TEXFBUF ], &fb_len, false);if (fb ==NULL ) {glDeleteTextures (1 , &texture);glXMakeContextCurrent (s->dpy, None, None,NULL );@@ -262,7 +262,7 @@ static void tmu2_start(MilkymistTMU2State *s)/* Read the QEMU dest. framebuffer into the OpenGL framebuffer */ fb_len =2ULL * s->regs[R_DSTHRES ] * s->regs[R_DSTVRES ]; - fb =cpu_physical_memory_map (s->regs[R_DSTFBUF ], &fb_len,0 ); + fb =cpu_physical_memory_map (s->regs[R_DSTFBUF ], &fb_len, false);if (fb ==NULL ) {glDeleteTextures (1 , &texture);glXMakeContextCurrent (s->dpy, None, None,NULL );@@ -281,7 +281,7 @@ static void tmu2_start(MilkymistTMU2State *s)/* Map the texture */ mesh_len =MESH_MAXSIZE *MESH_MAXSIZE *sizeof (struct vertex ); - mesh =cpu_physical_memory_map (s->regs[R_VERTICESADDR ], &mesh_len,0 ); + mesh =cpu_physical_memory_map (s->regs[R_VERTICESADDR ], &mesh_len, false);if (mesh ==NULL ) {glDeleteTextures (1 , &texture);glXMakeContextCurrent (s->dpy, None, None,NULL );@@ -298,7 +298,7 @@ static void tmu2_start(MilkymistTMU2State *s)/* Write back the OpenGL framebuffer to the QEMU framebuffer */ fb_len =2ULL * s->regs[R_DSTHRES ] * s->regs[R_DSTVRES ]; - fb =cpu_physical_memory_map (s->regs[R_DSTFBUF ], &fb_len,1 ); + fb =cpu_physical_memory_map (s->regs[R_DSTFBUF ], &fb_len, true);if (fb ==NULL ) {glDeleteTextures (1 , &texture);glXMakeContextCurrent (s->dpy, None, None,NULL );hw/display/omap_dss.c +1
-1@@ -632,7 +632,7 @@ static void omap_rfbi_transfer_start(struct omap_dss_s *s) len = s->rfbi.pixels *2 ; data_addr = s->dispc.l[0 ].addr[0 ]; - data =cpu_physical_memory_map (data_addr, &len,0 ); + data =cpu_physical_memory_map (data_addr, &len, false);if (data && len != s->rfbi.pixels *2 ) {cpu_physical_memory_unmap (data, len,0 ,0 ); data =NULL ;hw/display/ramfb.c +1
-1@@ -57,7 +57,7 @@ static DisplaySurface *ramfb_create_display_surface(int width, int height, } size = (hwaddr )linesize * height; - data =cpu_physical_memory_map (addr, &size,0 ); + data =cpu_physical_memory_map (addr, &size, false);if (size != (hwaddr )linesize * height) {cpu_physical_memory_unmap (data, size,0 ,0 );return NULL ;hw/misc/pc-testdev.c +1
-1@@ -125,7 +125,7 @@ static void test_flush_page_write(void *opaque, hwaddr addr, uint64_t data, unsigned len) {hwaddr page =4096 ; -void *a =cpu_physical_memory_map (data & ~0xffful , &page,0 ); +void *a =cpu_physical_memory_map (data & ~0xffful , &page, false);/* We might not be able to get the full page, only mprotect what we actually have mapped */ hw/nvram/spapr_nvram.c +2
-2@@ -89,7 +89,7 @@ static void rtas_nvram_fetch(PowerPCCPU *cpu, SpaprMachineState *spapr,assert (nvram->buf); - membuf =cpu_physical_memory_map (buffer, &len,1 ); + membuf =cpu_physical_memory_map (buffer, &len, true);memcpy (membuf, nvram->buf + offset, len);cpu_physical_memory_unmap (membuf, len,1 , len);@@ -127,7 +127,7 @@ static void rtas_nvram_store(PowerPCCPU *cpu, SpaprMachineState *spapr,return ; } - membuf =cpu_physical_memory_map (buffer, &len,0 ); + membuf =cpu_physical_memory_map (buffer, &len, false); alen = len;if (nvram->blk) {hw/ppc/ppc440_uc.c +4
-2@@ -909,8 +909,10 @@ static void dcr_write_dma(void *opaque, int dcrn, uint32_t val) sidx = didx =0 ; width =1 << ((val &DMA0_CR_PW ) >>25 ); - rptr =cpu_physical_memory_map (dma->ch[chnl].sa, &rlen,0 ); - wptr =cpu_physical_memory_map (dma->ch[chnl].da, &wlen,1 ); + rptr =cpu_physical_memory_map (dma->ch[chnl].sa, &rlen, + false); + wptr =cpu_physical_memory_map (dma->ch[chnl].da, &wlen, + true);if (rptr && wptr) {if (!(val &DMA0_CR_DEC ) && val &DMA0_CR_SAI && val &DMA0_CR_DAI ) {hw/ppc/spapr_hcall.c +2
-2@@ -832,7 +832,7 @@ static target_ulong h_page_init(PowerPCCPU *cpu, SpaprMachineState *spapr,if (!is_ram_address (spapr, dst) || (dst & ~TARGET_PAGE_MASK ) !=0 ) {return H_PARAMETER ; } - pdst =cpu_physical_memory_map (dst, &len,1 ); + pdst =cpu_physical_memory_map (dst, &len, true);if (!pdst || len !=TARGET_PAGE_SIZE ) {return H_PARAMETER ; }@@ -843,7 +843,7 @@ static target_ulong h_page_init(PowerPCCPU *cpu, SpaprMachineState *spapr, ret =H_PARAMETER ; goto unmap_out; } - psrc =cpu_physical_memory_map (src, &len,0 ); + psrc =cpu_physical_memory_map (src, &len, false);if (!psrc || len !=TARGET_PAGE_SIZE ) { ret =H_PARAMETER ; goto unmap_out;hw/s390x/ipl.c +1
-1@@ -626,7 +626,7 @@ static void s390_ipl_prepare_qipl(S390CPU *cpu)uint8_t *addr;uint64_t len =4096 ; - addr =cpu_physical_memory_map (cpu->env.psa, &len,1 ); + addr =cpu_physical_memory_map (cpu->env.psa, &len, true);if (!addr || len <QIPL_ADDRESS +sizeof (QemuIplParameters)) {error_report ("Cannot set QEMU IPL parameters" );return ;hw/s390x/s390-pci-bus.c +1
-1@@ -641,7 +641,7 @@ static uint8_t set_ind_atomic(uint64_t ind_loc, uint8_t to_be_set)hwaddr len =1 ;uint8_t *ind_addr; - ind_addr =cpu_physical_memory_map (ind_loc, &len,1 ); + ind_addr =cpu_physical_memory_map (ind_loc, &len, true);if (!ind_addr) {s390_pci_generate_error_event (ERR_EVENT_AIRERR ,0 ,0 ,0 ,0 );return -1 ;hw/s390x/virtio-ccw.c +1
-1@@ -790,7 +790,7 @@ static uint8_t virtio_set_ind_atomic(SubchDev *sch, uint64_t ind_loc,hwaddr len =1 ;uint8_t *ind_addr; - ind_addr =cpu_physical_memory_map (ind_loc, &len,1 ); + ind_addr =cpu_physical_memory_map (ind_loc, &len, true);if (!ind_addr) {error_report ("%s(%x.%x.%04x): unable to access indicator" , __func__, sch->cssid, sch->ssid, sch->schid);hw/xen/xen_pt_graphics.c +1
-1@@ -222,7 +222,7 @@ void xen_pt_setup_vga(XenPCIPassthroughState *s, XenHostPCIDevice *dev, }/* Currently we fixed this address as a primary for legacy BIOS. */ -cpu_physical_memory_rw (0xc0000 , bios, bios_size,1 ); +cpu_physical_memory_rw (0xc0000 , bios, bios_size, true); }uint32_t igd_read_opregion (XenPCIPassthroughState *s)target/i386/hax-all.c +2
-2@@ -376,8 +376,8 @@ static int hax_handle_fastmmio(CPUArchState *env, struct hax_fastmmio *hft)* hft->direction == 2: gpa ==> gpa2 */ uint64_t value; -cpu_physical_memory_rw (hft->gpa, &value, hft->size,0 ); -cpu_physical_memory_rw (hft->gpa2, &value, hft->size,1 ); +cpu_physical_memory_rw (hft->gpa, &value, hft->size, false); +cpu_physical_memory_rw (hft->gpa2, &value, hft->size, true); }return 0 ;target/s390x/excp_helper.c +1
-1@@ -393,7 +393,7 @@ static int mchk_store_vregs(CPUS390XState *env, uint64_t mcesao)MchkExtSaveArea *sa;int i; - sa =cpu_physical_memory_map (mcesao, &len,1 ); + sa =cpu_physical_memory_map (mcesao, &len, true);if (!sa) {return -EFAULT ; }target/s390x/helper.c +3
-3@@ -151,7 +151,7 @@ LowCore *cpu_map_lowcore(CPUS390XState *env)LowCore *lowcore;hwaddr len =sizeof (LowCore); - lowcore =cpu_physical_memory_map (env->psa, &len,1 ); + lowcore =cpu_physical_memory_map (env->psa, &len, true);if (len <sizeof (LowCore)) {cpu_abort (env_cpu (env),"Could not map lowcore\n" );@@ -246,7 +246,7 @@ int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch)hwaddr len =sizeof (*sa);int i; - sa =cpu_physical_memory_map (addr, &len,1 ); + sa =cpu_physical_memory_map (addr, &len, true);if (!sa) {return -EFAULT ; }@@ -298,7 +298,7 @@ int s390_store_adtl_status(S390CPU *cpu, hwaddr addr, hwaddr len)hwaddr save = len;int i; - sa =cpu_physical_memory_map (addr, &save,1 ); + sa =cpu_physical_memory_map (addr, &save, true);if (!sa) {return -EFAULT ; }
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Re: [PATCH v3 19/20] Let cpu_[physical]_memory() calls pass a boolean 'is_write' argument
In reply to Philippe Mathieu-DaudéQuoted 103 lines · On Thu, 20 Feb 2020 14:05:47 +0100 Philippe Mathieu-Daudé <[email protected]>…
Use an explicit boolean type.
This commit was produced with the included Coccinelle script
scripts/coccinelle/exec_rw_const.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- scripts/coccinelle/exec_rw_const.cocci | 14 ++++++++++++++ include/exec/cpu-common.h | 4 ++-- hw/display/exynos4210_fimd.c | 3 ++- hw/display/milkymist-tmu2.c | 8 ++++---- hw/display/omap_dss.c | 2 +- hw/display/ramfb.c | 2 +- hw/misc/pc-testdev.c | 2 +- hw/nvram/spapr_nvram.c | 4 ++-- hw/ppc/ppc440_uc.c | 6 ++++-- hw/ppc/spapr_hcall.c | 4 ++-- hw/s390x/ipl.c | 2 +- hw/s390x/s390-pci-bus.c | 2 +- hw/s390x/virtio-ccw.c | 2 +- hw/xen/xen_pt_graphics.c | 2 +- target/i386/hax-all.c | 4 ++-- target/s390x/excp_helper.c | 2 +- target/s390x/helper.c | 6 +++--- 17 files changed, 43 insertions(+), 26 deletions(-)hw/s390x/ipl.c +1
-1@@ -626,7 +626,7 @@ static void s390_ipl_prepare_qipl(S390CPU *cpu)uint8_t *addr;uint64_t len =4096 ; - addr =cpu_physical_memory_map (cpu->env.psa, &len,1 ); + addr =cpu_physical_memory_map (cpu->env.psa, &len, true);if (!addr || len <QIPL_ADDRESS +sizeof (QemuIplParameters)) {error_report ("Cannot set QEMU IPL parameters" );return ;hw/s390x/s390-pci-bus.c +1
-1@@ -641,7 +641,7 @@ static uint8_t set_ind_atomic(uint64_t ind_loc, uint8_t to_be_set)hwaddr len =1 ;uint8_t *ind_addr; - ind_addr =cpu_physical_memory_map (ind_loc, &len,1 ); + ind_addr =cpu_physical_memory_map (ind_loc, &len, true);if (!ind_addr) {s390_pci_generate_error_event (ERR_EVENT_AIRERR ,0 ,0 ,0 ,0 );return -1 ;hw/s390x/virtio-ccw.c +1
-1@@ -790,7 +790,7 @@ static uint8_t virtio_set_ind_atomic(SubchDev *sch, uint64_t ind_loc,hwaddr len =1 ;uint8_t *ind_addr; - ind_addr =cpu_physical_memory_map (ind_loc, &len,1 ); + ind_addr =cpu_physical_memory_map (ind_loc, &len, true);if (!ind_addr) {error_report ("%s(%x.%x.%04x): unable to access indicator" , __func__, sch->cssid, sch->ssid, sch->schid);target/s390x/excp_helper.c +1
-1@@ -393,7 +393,7 @@ static int mchk_store_vregs(CPUS390XState *env, uint64_t mcesao)MchkExtSaveArea *sa;int i; - sa =cpu_physical_memory_map (mcesao, &len,1 ); + sa =cpu_physical_memory_map (mcesao, &len, true);if (!sa) {return -EFAULT ; }target/s390x/helper.c +2
-2@@ -151,7 +151,7 @@ LowCore *cpu_map_lowcore(CPUS390XState *env)LowCore *lowcore;hwaddr len =sizeof (LowCore); - lowcore =cpu_physical_memory_map (env->psa, &len,1 ); + lowcore =cpu_physical_memory_map (env->psa, &len, true);if (len <sizeof (LowCore)) {cpu_abort (env_cpu (env),"Could not map lowcore\n" );@@ -246,7 +246,7 @@ int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch)hwaddr len =sizeof (*sa);int i; - sa =cpu_physical_memory_map (addr, &len,1 ); + sa =cpu_physical_memory_map (addr, &len, true);if (!sa) {return -EFAULT ; }
target/s390x/helper.c int s390_store_adtl_status(S390CPU *cpu, hwaddr addr, hwaddr len) · line 304
Quoted 8 lines
target/s390x/helper.c +1
-1@@ -298,7 +298,7 @@ int s390_store_adtl_status(S390CPU *cpu, hwaddr addr, hwaddr len)hwaddr save = len;int i; - sa =cpu_physical_memory_map (addr, &save,1 ); + sa =cpu_physical_memory_map (addr, &save, true);if (!sa) {return -EFAULT ; }
s390 parts