| Message ID | 20200220130548.29974-20-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | global exec/memory/dma APIs cleanup | expand |
> -----Original Message----- > From: Xen-devel <xen-devel-bounces@lists.xenproject.org> On Behalf Of > Philippe Mathieu-Daudé > Sent: 20 February 2020 13:06 > To: Peter Maydell <peter.maydell@linaro.org>; qemu-devel@nongnu.org > Cc: Fam Zheng <fam@euphon.net>; Dmitry Fleytman > <dmitry.fleytman@gmail.com>; kvm@vger.kernel.org; Michael S. Tsirkin > <mst@redhat.com>; Jason Wang <jasowang@redhat.com>; Gerd Hoffmann > <kraxel@redhat.com>; Edgar E. Iglesias <edgar.iglesias@gmail.com>; Stefano > Stabellini <sstabellini@kernel.org>; Matthew Rosato > <mjrosato@linux.ibm.com>; qemu-block@nongnu.org; David Hildenbrand > <david@redhat.com>; Halil Pasic <pasic@linux.ibm.com>; Christian > Borntraeger <borntraeger@de.ibm.com>; Hervé Poussineau > <hpoussin@reactos.org>; Marcel Apfelbaum <marcel.apfelbaum@gmail.com>; > Anthony Perard <anthony.perard@citrix.com>; xen- > devel@lists.xenproject.org; Aleksandar Rikalo <aleksandar.rikalo@rt- > rk.com>; Richard Henderson <rth@twiddle.net>; Philippe Mathieu-Daudé > <philmd@redhat.com>; Laurent Vivier <lvivier@redhat.com>; Thomas Huth > <thuth@redhat.com>; Eduardo Habkost <ehabkost@redhat.com>; Stefan Weil > <sw@weilnetz.de>; Alistair Francis <alistair@alistair23.me>; Richard > Henderson <richard.henderson@linaro.org>; Paul Durrant <paul@xen.org>; > Eric Auger <eric.auger@redhat.com>; qemu-s390x@nongnu.org; qemu- > arm@nongnu.org; Cédric Le Goater <clg@kaod.org>; John Snow > <jsnow@redhat.com>; David Gibson <david@gibson.dropbear.id.au>; Igor > Mitsyanko <i.mitsyanko@gmail.com>; Cornelia Huck <cohuck@redhat.com>; > Michael Walle <michael@walle.cc>; qemu-ppc@nongnu.org; Paolo Bonzini > <pbonzini@redhat.com> > Subject: [Xen-devel] [PATCH v3 19/20] Let cpu_[physical]_memory() calls > pass a boolean 'is_write' argument > > 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é <philmd@redhat.com> Reviewed-by: Paul Durrant <paul@xen.org>
On Thu, Feb 20, 2020 at 02:05:47PM +0100, Philippe Mathieu-Daudé wrote: > 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é <philmd@redhat.com> ppc parts Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > 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(-) > > diff --git a/scripts/coccinelle/exec_rw_const.cocci b/scripts/coccinelle/exec_rw_const.cocci > index ee98ce988e..54b1cab8cd 100644 > --- a/scripts/coccinelle/exec_rw_const.cocci > +++ b/scripts/coccinelle/exec_rw_const.cocci > @@ -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 > diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h > index 6bfe201779..e7fd5781ea 100644 > --- a/include/exec/cpu-common.h > +++ b/include/exec/cpu-common.h > @@ -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, > diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c > index c1071ecd46..ec6776680e 100644 > --- a/hw/display/exynos4210_fimd.c > +++ b/hw/display/exynos4210_fimd.c > @@ -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; > diff --git a/hw/display/milkymist-tmu2.c b/hw/display/milkymist-tmu2.c > index 199f1227e7..513c0d5bab 100644 > --- a/hw/display/milkymist-tmu2.c > +++ b/hw/display/milkymist-tmu2.c > @@ -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); > diff --git a/hw/display/omap_dss.c b/hw/display/omap_dss.c > index 637aae8d39..32dc0d6aa7 100644 > --- a/hw/display/omap_dss.c > +++ b/hw/display/omap_dss.c > @@ -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; > diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c > index cd94940223..7ba07c80f6 100644 > --- a/hw/display/ramfb.c > +++ b/hw/display/ramfb.c > @@ -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; > diff --git a/hw/misc/pc-testdev.c b/hw/misc/pc-testdev.c > index 0fb84ddc6b..8aa8e6549f 100644 > --- a/hw/misc/pc-testdev.c > +++ b/hw/misc/pc-testdev.c > @@ -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 */ > diff --git a/hw/nvram/spapr_nvram.c b/hw/nvram/spapr_nvram.c > index 877ddef7b9..15d08281d4 100644 > --- a/hw/nvram/spapr_nvram.c > +++ b/hw/nvram/spapr_nvram.c > @@ -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) { > diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c > index 1a6a8fac22..d5ea962249 100644 > --- a/hw/ppc/ppc440_uc.c > +++ b/hw/ppc/ppc440_uc.c > @@ -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) { > diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c > index b8bb66b5c0..caf55ab044 100644 > --- a/hw/ppc/spapr_hcall.c > +++ b/hw/ppc/spapr_hcall.c > @@ -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; > diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c > index 7773499d7f..0817874b48 100644 > --- a/hw/s390x/ipl.c > +++ b/hw/s390x/ipl.c > @@ -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; > diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c > index 7c6a2b3c63..ed8be124da 100644 > --- a/hw/s390x/s390-pci-bus.c > +++ b/hw/s390x/s390-pci-bus.c > @@ -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; > diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c > index 13f57e7b67..50cf95b781 100644 > --- a/hw/s390x/virtio-ccw.c > +++ b/hw/s390x/virtio-ccw.c > @@ -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); > diff --git a/hw/xen/xen_pt_graphics.c b/hw/xen/xen_pt_graphics.c > index b69732729b..b11e4e0546 100644 > --- a/hw/xen/xen_pt_graphics.c > +++ b/hw/xen/xen_pt_graphics.c > @@ -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) > diff --git a/target/i386/hax-all.c b/target/i386/hax-all.c > index a9cc51e6ce..38936d7af6 100644 > --- a/target/i386/hax-all.c > +++ b/target/i386/hax-all.c > @@ -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; > diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c > index 1e9d6f20c1..3b58d10df3 100644 > --- a/target/s390x/excp_helper.c > +++ b/target/s390x/excp_helper.c > @@ -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; > } > diff --git a/target/s390x/helper.c b/target/s390x/helper.c > index a3a49164e4..b810ad431e 100644 > --- a/target/s390x/helper.c > +++ b/target/s390x/helper.c > @@ -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; > }
On Thu, 20 Feb 2020 14:05:47 +0100 Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > 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é <philmd@redhat.com> > --- > 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(-) > > diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c > index 7773499d7f..0817874b48 100644 > --- a/hw/s390x/ipl.c > +++ b/hw/s390x/ipl.c > @@ -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; > diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c > index 7c6a2b3c63..ed8be124da 100644 > --- a/hw/s390x/s390-pci-bus.c > +++ b/hw/s390x/s390-pci-bus.c > @@ -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; > diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c > index 13f57e7b67..50cf95b781 100644 > --- a/hw/s390x/virtio-ccw.c > +++ b/hw/s390x/virtio-ccw.c > @@ -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); > diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c > index 1e9d6f20c1..3b58d10df3 100644 > --- a/target/s390x/excp_helper.c > +++ b/target/s390x/excp_helper.c > @@ -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; > } > diff --git a/target/s390x/helper.c b/target/s390x/helper.c > index a3a49164e4..b810ad431e 100644 > --- a/target/s390x/helper.c > +++ b/target/s390x/helper.c > @@ -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; > } s390 parts Acked-by: Cornelia Huck <cohuck@redhat.com>
diff --git a/scripts/coccinelle/exec_rw_const.cocci b/scripts/coccinelle/exec_rw_const.cocci index ee98ce988e..54b1cab8cd 100644 --- a/scripts/coccinelle/exec_rw_const.cocci +++ b/scripts/coccinelle/exec_rw_const.cocci @@ -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 diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 6bfe201779..e7fd5781ea 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -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, diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c index c1071ecd46..ec6776680e 100644 --- a/hw/display/exynos4210_fimd.c +++ b/hw/display/exynos4210_fimd.c @@ -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; diff --git a/hw/display/milkymist-tmu2.c b/hw/display/milkymist-tmu2.c index 199f1227e7..513c0d5bab 100644 --- a/hw/display/milkymist-tmu2.c +++ b/hw/display/milkymist-tmu2.c @@ -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); diff --git a/hw/display/omap_dss.c b/hw/display/omap_dss.c index 637aae8d39..32dc0d6aa7 100644 --- a/hw/display/omap_dss.c +++ b/hw/display/omap_dss.c @@ -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; diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c index cd94940223..7ba07c80f6 100644 --- a/hw/display/ramfb.c +++ b/hw/display/ramfb.c @@ -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; diff --git a/hw/misc/pc-testdev.c b/hw/misc/pc-testdev.c index 0fb84ddc6b..8aa8e6549f 100644 --- a/hw/misc/pc-testdev.c +++ b/hw/misc/pc-testdev.c @@ -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 */ diff --git a/hw/nvram/spapr_nvram.c b/hw/nvram/spapr_nvram.c index 877ddef7b9..15d08281d4 100644 --- a/hw/nvram/spapr_nvram.c +++ b/hw/nvram/spapr_nvram.c @@ -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) { diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c index 1a6a8fac22..d5ea962249 100644 --- a/hw/ppc/ppc440_uc.c +++ b/hw/ppc/ppc440_uc.c @@ -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) { diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index b8bb66b5c0..caf55ab044 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -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; diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 7773499d7f..0817874b48 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -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; diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 7c6a2b3c63..ed8be124da 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -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; diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 13f57e7b67..50cf95b781 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -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); diff --git a/hw/xen/xen_pt_graphics.c b/hw/xen/xen_pt_graphics.c index b69732729b..b11e4e0546 100644 --- a/hw/xen/xen_pt_graphics.c +++ b/hw/xen/xen_pt_graphics.c @@ -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) diff --git a/target/i386/hax-all.c b/target/i386/hax-all.c index a9cc51e6ce..38936d7af6 100644 --- a/target/i386/hax-all.c +++ b/target/i386/hax-all.c @@ -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; diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c index 1e9d6f20c1..3b58d10df3 100644 --- a/target/s390x/excp_helper.c +++ b/target/s390x/excp_helper.c @@ -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; } diff --git a/target/s390x/helper.c b/target/s390x/helper.c index a3a49164e4..b810ad431e 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -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; }
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é <philmd@redhat.com> --- 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(-)