Re: [Xen-devel] [PATCH v3 02/20] hw: Remove unnecessary cast when calling dma_memory_read()

[Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>]

On 2/20/20 2:16 PM, Eric Blake wrote:
> On 2/20/20 7:05 AM, Philippe Mathieu-Daudé wrote:
> > 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é <philmd@xxxxxxxxxx>
> > ---
> >   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
> >
> > diff --git a/scripts/coccinelle/exec_rw_const.cocci 
> > b/scripts/coccinelle/exec_rw_const.cocci
> > new file mode 100644
> > index 0000000000..a0054f009d
> > --- /dev/null
> > +++ b/scripts/coccinelle/exec_rw_const.cocci
> > @@ -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).
>
> > @@ -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.
Thanks Eric, patch updated. Peter are you OK if I change the cocci 
header using /* */ as:
-- >8 --
diff --git a/scripts/coccinelle/exec_rw_const.cocci 
b/scripts/coccinelle/exec_rw_const.cocci
index a0054f009d..7e42682240 100644
--- a/scripts/coccinelle/exec_rw_const.cocci
+++ b/scripts/coccinelle/exec_rw_const.cocci
@@ -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)
 )
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index d5abdaad41..de63ffb037 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -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;
---


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel