[Qemu-devel] [PATCH 0/8] Coccinelle cleanups

[Qemu-devel] [PATCH 0/8] Coccinelle cleanups

[Philippe Mathieu-Daudé]

Nothing exciting here, patches created mechanically
(common after soft freeze).

Philippe Mathieu-Daudé (8):
  qobject: Catch another straggler for use of qdict_put_str()
  error: Remove NULL checks on error_propagate() calls
  crypto: Remove useless casts
  xen: Remove useless casts
  tests/bios-tables-test: Remove useless casts
  ui/vnc: Remove useless parenthesis around DIV_ROUND_UP macro
  hw/pci-host: Remove useless parenthesis around DIV_ROUND_UP macro
  hw/intc/gicv3: Remove useless parenthesis around DIV_ROUND_UP macro

 include/hw/intc/arm_gicv3_common.h | 2 +-
 crypto/cipher-builtin.c            | 4 ++--
 hw/pci-host/piix.c                 | 2 +-
 hw/pci-host/q35.c                  | 2 +-
 hw/s390x/virtio-ccw.c              | 4 +---
 hw/xen/xen_pt_config_init.c        | 2 +-
 qobject/block-qdict.c              | 2 +-
 tests/bios-tables-test.c           | 2 +-
 ui/vnc-enc-tight.c                 | 2 +-
 ui/vnc.c                           | 3 ++-
 10 files changed, 12 insertions(+), 13 deletions(-)

-- 
2.18.0

[Qemu-devel] [PATCH 1/8] qobject: Catch another straggler for use of qdict_put_str()

[Philippe Mathieu-Daudé]

Patch created mechanically by rerunning:

  $  spatch --sp-file scripts/coccinelle/qobject.cocci \
            --macro-file scripts/cocci-macro-file.h \
            --dir . --in-place

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 qobject/block-qdict.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qobject/block-qdict.c b/qobject/block-qdict.c
index 80c653013f..ae363708ab 100644
--- a/qobject/block-qdict.c
+++ b/qobject/block-qdict.c
@@ -572,7 +572,7 @@ static QObject *qdict_crumple_for_keyval_qiv(QDict *src, Error **errp)
         if (!tmp) {
             tmp = qdict_clone_shallow(src);
         }
-        qdict_put(tmp, ent->key, qstring_from_str(s));
+        qdict_put_str(tmp, ent->key, s);
         g_free(buf);
     }
 
-- 
2.18.0

Re: [Qemu-devel] [PATCH 1/8] qobject: Catch another straggler for use of qdict_put_str()

[Markus Armbruster]

Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> Patch created mechanically by rerunning:
>
>   $  spatch --sp-file scripts/coccinelle/qobject.cocci \
>             --macro-file scripts/cocci-macro-file.h \
>             --dir . --in-place
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  qobject/block-qdict.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/qobject/block-qdict.c b/qobject/block-qdict.c
> index 80c653013f..ae363708ab 100644
> --- a/qobject/block-qdict.c
> +++ b/qobject/block-qdict.c
> @@ -572,7 +572,7 @@ static QObject *qdict_crumple_for_keyval_qiv(QDict *src, Error **errp)
>          if (!tmp) {
>              tmp = qdict_clone_shallow(src);
>          }
> -        qdict_put(tmp, ent->key, qstring_from_str(s));
> +        qdict_put_str(tmp, ent->key, s);
>          g_free(buf);
>      }

Reviewed-by: Markus Armbruster <armbru@redhat.com>

[Qemu-devel] [PATCH 2/8] error: Remove NULL checks on error_propagate() calls

[Philippe Mathieu-Daudé]

Patch created mechanically by rerunning:

  $  spatch --sp-file scripts/coccinelle/error_propagate_null.cocci \
            --macro-file scripts/cocci-macro-file.h \
            --dir . --in-place

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/s390x/virtio-ccw.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index b92a85d0b0..7ddb378d52 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -1836,11 +1836,9 @@ static void vhost_vsock_ccw_realize(VirtioCcwDevice *ccw_dev, Error **errp)
 {
     VHostVSockCCWState *dev = VHOST_VSOCK_CCW(ccw_dev);
     DeviceState *vdev = DEVICE(&dev->vdev);
-    Error *err = NULL;
 
     qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus));
-    object_property_set_bool(OBJECT(vdev), true, "realized", &err);
-    error_propagate(errp, err);
+    object_property_set_bool(OBJECT(vdev), true, "realized", errp);
 }
 
 static void vhost_vsock_ccw_class_init(ObjectClass *klass, void *data)
-- 
2.18.0

Re: [Qemu-devel] [PATCH 2/8] error: Remove NULL checks on error_propagate() calls

[Markus Armbruster]

Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> Patch created mechanically by rerunning:
>
>   $  spatch --sp-file scripts/coccinelle/error_propagate_null.cocci \
>             --macro-file scripts/cocci-macro-file.h \
>             --dir . --in-place
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/s390x/virtio-ccw.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
> index b92a85d0b0..7ddb378d52 100644
> --- a/hw/s390x/virtio-ccw.c
> +++ b/hw/s390x/virtio-ccw.c
> @@ -1836,11 +1836,9 @@ static void vhost_vsock_ccw_realize(VirtioCcwDevice *ccw_dev, Error **errp)
>  {
>      VHostVSockCCWState *dev = VHOST_VSOCK_CCW(ccw_dev);
>      DeviceState *vdev = DEVICE(&dev->vdev);
> -    Error *err = NULL;
>  
>      qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus));
> -    object_property_set_bool(OBJECT(vdev), true, "realized", &err);
> -    error_propagate(errp, err);
> +    object_property_set_bool(OBJECT(vdev), true, "realized", errp);
>  }
>  
>  static void vhost_vsock_ccw_class_init(ObjectClass *klass, void *data)

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Re: [Qemu-devel] [PATCH 2/8] error: Remove NULL checks on error_propagate() calls

[David Hildenbrand]

On 04.07.2018 17:39, Philippe Mathieu-Daudé wrote:
> Patch created mechanically by rerunning:
> 
>   $  spatch --sp-file scripts/coccinelle/error_propagate_null.cocci \
>             --macro-file scripts/cocci-macro-file.h \
>             --dir . --in-place
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/s390x/virtio-ccw.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
> index b92a85d0b0..7ddb378d52 100644
> --- a/hw/s390x/virtio-ccw.c
> +++ b/hw/s390x/virtio-ccw.c
> @@ -1836,11 +1836,9 @@ static void vhost_vsock_ccw_realize(VirtioCcwDevice *ccw_dev, Error **errp)
>  {
>      VHostVSockCCWState *dev = VHOST_VSOCK_CCW(ccw_dev);
>      DeviceState *vdev = DEVICE(&dev->vdev);
> -    Error *err = NULL;
>  
>      qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus));
> -    object_property_set_bool(OBJECT(vdev), true, "realized", &err);
> -    error_propagate(errp, err);
> +    object_property_set_bool(OBJECT(vdev), true, "realized", errp);
>  }
>  
>  static void vhost_vsock_ccw_class_init(ObjectClass *klass, void *data)
> 

Reviewed-by: David Hildenbrand <david@redhat.com>

-- 

Thanks,

David / dhildenb

[Qemu-devel] [PATCH 3/8] crypto: Remove useless casts

[Philippe Mathieu-Daudé]

Patch created mechanically by rerunning:

  $  spatch --sp-file scripts/coccinelle/typecast.cocci \
            --macro-file scripts/cocci-macro-file.h \
            --dir . --in-place

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 crypto/cipher-builtin.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/cipher-builtin.c b/crypto/cipher-builtin.c
index d8c811fd33..7eff760f0a 100644
--- a/crypto/cipher-builtin.c
+++ b/crypto/cipher-builtin.c
@@ -133,7 +133,7 @@ static void qcrypto_cipher_aes_xts_encrypt(const void *ctx,
 {
     const QCryptoCipherBuiltinAESContext *aesctx = ctx;
 
-    qcrypto_cipher_aes_ecb_encrypt((AES_KEY *)&aesctx->enc,
+    qcrypto_cipher_aes_ecb_encrypt(&aesctx->enc,
                                    src, dst, length);
 }
 
@@ -145,7 +145,7 @@ static void qcrypto_cipher_aes_xts_decrypt(const void *ctx,
 {
     const QCryptoCipherBuiltinAESContext *aesctx = ctx;
 
-    qcrypto_cipher_aes_ecb_decrypt((AES_KEY *)&aesctx->dec,
+    qcrypto_cipher_aes_ecb_decrypt(&aesctx->dec,
                                    src, dst, length);
 }
 
-- 
2.18.0

Re: [Qemu-devel] [PATCH 3/8] crypto: Remove useless casts

[Daniel P. Berrangé]

On Wed, Jul 04, 2018 at 12:39:14PM -0300, Philippe Mathieu-Daudé wrote:
> Patch created mechanically by rerunning:
> 
>   $  spatch --sp-file scripts/coccinelle/typecast.cocci \
>             --macro-file scripts/cocci-macro-file.h \
>             --dir . --in-place
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  crypto/cipher-builtin.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/crypto/cipher-builtin.c b/crypto/cipher-builtin.c
> index d8c811fd33..7eff760f0a 100644
> --- a/crypto/cipher-builtin.c
> +++ b/crypto/cipher-builtin.c
> @@ -133,7 +133,7 @@ static void qcrypto_cipher_aes_xts_encrypt(const void *ctx,
>  {
>      const QCryptoCipherBuiltinAESContext *aesctx = ctx;
>  
> -    qcrypto_cipher_aes_ecb_encrypt((AES_KEY *)&aesctx->enc,
> +    qcrypto_cipher_aes_ecb_encrypt(&aesctx->enc,
>                                     src, dst, length);

qcrypto_cipher_aes_ecb_encrypt expects a 'AES_KEY *' parameter, but
'&aesctx->enc, is a 'const AES_KEY *'. The cast is needed to discard
the const-ness.

> @@ -145,7 +145,7 @@ static void qcrypto_cipher_aes_xts_decrypt(const void *ctx,
>  {
>      const QCryptoCipherBuiltinAESContext *aesctx = ctx;
>  
> -    qcrypto_cipher_aes_ecb_decrypt((AES_KEY *)&aesctx->dec,
> +    qcrypto_cipher_aes_ecb_decrypt(&aesctx->dec,
>                                     src, dst, length);

Same here.


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH 3/8] crypto: Remove useless casts

[Philippe Mathieu-Daudé]

On 07/04/2018 12:51 PM, Daniel P. Berrangé wrote:
> On Wed, Jul 04, 2018 at 12:39:14PM -0300, Philippe Mathieu-Daudé wrote:
>> Patch created mechanically by rerunning:
>>
>>   $  spatch --sp-file scripts/coccinelle/typecast.cocci \
>>             --macro-file scripts/cocci-macro-file.h \
>>             --dir . --in-place
>>
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> ---
>>  crypto/cipher-builtin.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/crypto/cipher-builtin.c b/crypto/cipher-builtin.c
>> index d8c811fd33..7eff760f0a 100644
>> --- a/crypto/cipher-builtin.c
>> +++ b/crypto/cipher-builtin.c
>> @@ -133,7 +133,7 @@ static void qcrypto_cipher_aes_xts_encrypt(const void *ctx,
>>  {
>>      const QCryptoCipherBuiltinAESContext *aesctx = ctx;
>>  
>> -    qcrypto_cipher_aes_ecb_encrypt((AES_KEY *)&aesctx->enc,
>> +    qcrypto_cipher_aes_ecb_encrypt(&aesctx->enc,
>>                                     src, dst, length);
> 
> qcrypto_cipher_aes_ecb_encrypt expects a 'AES_KEY *' parameter, but
> '&aesctx->enc, is a 'const AES_KEY *'. The cast is needed to discard
> the const-ness.

Oh I didn't notice. I'll see if I can patch typecast.cocci to avoid this
noise.

Thanks!

> 
>> @@ -145,7 +145,7 @@ static void qcrypto_cipher_aes_xts_decrypt(const void *ctx,
>>  {
>>      const QCryptoCipherBuiltinAESContext *aesctx = ctx;
>>  
>> -    qcrypto_cipher_aes_ecb_decrypt((AES_KEY *)&aesctx->dec,
>> +    qcrypto_cipher_aes_ecb_decrypt(&aesctx->dec,
>>                                     src, dst, length);
> 
> Same here.
> 
> 
> Regards,
> Daniel
> 

[Qemu-devel] [PATCH 4/8] xen: Remove useless casts

[Philippe Mathieu-Daudé]

Patch created mechanically by rerunning:

  $  spatch --sp-file scripts/coccinelle/typecast.cocci \
            --macro-file scripts/cocci-macro-file.h \
            --dir . --in-place

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/xen/xen_pt_config_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c
index aee31c62bb..55a83333f2 100644
--- a/hw/xen/xen_pt_config_init.c
+++ b/hw/xen/xen_pt_config_init.c
@@ -543,7 +543,7 @@ static int xen_pt_exp_rom_bar_reg_write(XenPCIPassthroughState *s,
 {
     XenPTRegInfo *reg = cfg_entry->reg;
     XenPTRegion *base = NULL;
-    PCIDevice *d = (PCIDevice *)&s->dev;
+    PCIDevice *d = &s->dev;
     uint32_t writable_mask = 0;
     uint32_t throughable_mask = get_throughable_mask(s, reg, valid_mask);
     pcibus_t r_size = 0;
-- 
2.18.0

Re: [Qemu-devel] [PATCH 4/8] xen: Remove useless casts

[Markus Armbruster]

Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> Patch created mechanically by rerunning:
>
>   $  spatch --sp-file scripts/coccinelle/typecast.cocci \
>             --macro-file scripts/cocci-macro-file.h \
>             --dir . --in-place
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/xen/xen_pt_config_init.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c
> index aee31c62bb..55a83333f2 100644
> --- a/hw/xen/xen_pt_config_init.c
> +++ b/hw/xen/xen_pt_config_init.c
> @@ -543,7 +543,7 @@ static int xen_pt_exp_rom_bar_reg_write(XenPCIPassthroughState *s,
>  {
>      XenPTRegInfo *reg = cfg_entry->reg;
>      XenPTRegion *base = NULL;
> -    PCIDevice *d = (PCIDevice *)&s->dev;
> +    PCIDevice *d = &s->dev;
>      uint32_t writable_mask = 0;
>      uint32_t throughable_mask = get_throughable_mask(s, reg, valid_mask);
>      pcibus_t r_size = 0;

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Re: [Qemu-devel] [PATCH 4/8] xen: Remove useless casts

[Anthony PERARD]

On Wed, Jul 04, 2018 at 12:39:15PM -0300, Philippe Mathieu-Daudé wrote:
> Patch created mechanically by rerunning:
> 
>   $  spatch --sp-file scripts/coccinelle/typecast.cocci \
>             --macro-file scripts/cocci-macro-file.h \
>             --dir . --in-place
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Acked-by: Anthony PERARD <anthony.perard@citrix.com>

> ---
>  hw/xen/xen_pt_config_init.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c
> index aee31c62bb..55a83333f2 100644
> --- a/hw/xen/xen_pt_config_init.c
> +++ b/hw/xen/xen_pt_config_init.c
> @@ -543,7 +543,7 @@ static int xen_pt_exp_rom_bar_reg_write(XenPCIPassthroughState *s,
>  {
>      XenPTRegInfo *reg = cfg_entry->reg;
>      XenPTRegion *base = NULL;
> -    PCIDevice *d = (PCIDevice *)&s->dev;
> +    PCIDevice *d = &s->dev;
>      uint32_t writable_mask = 0;
>      uint32_t throughable_mask = get_throughable_mask(s, reg, valid_mask);
>      pcibus_t r_size = 0;

-- 
Anthony PERARD

Re: [Qemu-devel] [PATCH 4/8] xen: Remove useless casts

[Peter Maydell]

On 4 July 2018 at 16:39, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> Patch created mechanically by rerunning:
>
>   $  spatch --sp-file scripts/coccinelle/typecast.cocci \
>             --macro-file scripts/cocci-macro-file.h \
>             --dir . --in-place
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/xen/xen_pt_config_init.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c
> index aee31c62bb..55a83333f2 100644
> --- a/hw/xen/xen_pt_config_init.c
> +++ b/hw/xen/xen_pt_config_init.c
> @@ -543,7 +543,7 @@ static int xen_pt_exp_rom_bar_reg_write(XenPCIPassthroughState *s,
>  {
>      XenPTRegInfo *reg = cfg_entry->reg;
>      XenPTRegion *base = NULL;
> -    PCIDevice *d = (PCIDevice *)&s->dev;
> +    PCIDevice *d = &s->dev;

This line of code is odd even without the cast. XenPCIPassthroughState*
is a QOM object (TYPE_XEN_PT_DEVICE) which is a subclass of TYPE_PCI_DEVICE,
so the standard way to get the PCIDevice pointer for s would be
  PCIDevice *d = PCI_DEVICE(s);

thanks
-- PMM

Re: [Qemu-devel] [PATCH 4/8] xen: Remove useless casts

[Philippe Mathieu-Daudé]

On 07/05/2018 07:16 AM, Peter Maydell wrote:
> On 4 July 2018 at 16:39, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>> Patch created mechanically by rerunning:
>>
>>   $  spatch --sp-file scripts/coccinelle/typecast.cocci \
>>             --macro-file scripts/cocci-macro-file.h \
>>             --dir . --in-place
>>
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> ---
>>  hw/xen/xen_pt_config_init.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c
>> index aee31c62bb..55a83333f2 100644
>> --- a/hw/xen/xen_pt_config_init.c
>> +++ b/hw/xen/xen_pt_config_init.c
>> @@ -543,7 +543,7 @@ static int xen_pt_exp_rom_bar_reg_write(XenPCIPassthroughState *s,
>>  {
>>      XenPTRegInfo *reg = cfg_entry->reg;
>>      XenPTRegion *base = NULL;
>> -    PCIDevice *d = (PCIDevice *)&s->dev;
>> +    PCIDevice *d = &s->dev;
> 
> This line of code is odd even without the cast. XenPCIPassthroughState*
> is a QOM object (TYPE_XEN_PT_DEVICE) which is a subclass of TYPE_PCI_DEVICE,
> so the standard way to get the PCIDevice pointer for s would be
>   PCIDevice *d = PCI_DEVICE(s);

You have eagle eyes...

Thanks for your review :)

Phil.

[Qemu-devel] [PATCH 5/8] tests/bios-tables-test: Remove useless casts

[Philippe Mathieu-Daudé]

Patch created mechanically by rerunning:

  $  spatch --sp-file scripts/coccinelle/typecast.cocci \
            --macro-file scripts/cocci-macro-file.h \
            --dir . --in-place

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 tests/bios-tables-test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 4e24930c4b..c1ad1b3470 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -319,7 +319,7 @@ static bool load_asl(GArray *sdts, AcpiSdtTable *sdt)
     ret = g_spawn_command_line_sync(command_line->str, &out, &out_err, NULL, &error);
     g_assert_no_error(error);
     if (ret) {
-        ret = g_file_get_contents(sdt->asl_file, (gchar **)&sdt->asl,
+        ret = g_file_get_contents(sdt->asl_file, &sdt->asl,
                                   &sdt->asl_len, &error);
         g_assert(ret);
         g_assert_no_error(error);
-- 
2.18.0

Re: [Qemu-devel] [PATCH 5/8] tests/bios-tables-test: Remove useless casts

[Markus Armbruster]

Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> Patch created mechanically by rerunning:
>
>   $  spatch --sp-file scripts/coccinelle/typecast.cocci \
>             --macro-file scripts/cocci-macro-file.h \
>             --dir . --in-place
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  tests/bios-tables-test.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> index 4e24930c4b..c1ad1b3470 100644
> --- a/tests/bios-tables-test.c
> +++ b/tests/bios-tables-test.c
> @@ -319,7 +319,7 @@ static bool load_asl(GArray *sdts, AcpiSdtTable *sdt)
>      ret = g_spawn_command_line_sync(command_line->str, &out, &out_err, NULL, &error);
>      g_assert_no_error(error);
>      if (ret) {
> -        ret = g_file_get_contents(sdt->asl_file, (gchar **)&sdt->asl,
> +        ret = g_file_get_contents(sdt->asl_file, &sdt->asl,
>                                    &sdt->asl_len, &error);
>          g_assert(ret);
>          g_assert_no_error(error);

Reviewed-by: Markus Armbruster <armbru@redhat.com>

[Qemu-devel] [PATCH 6/8] ui/vnc: Remove useless parenthesis around DIV_ROUND_UP macro

[Philippe Mathieu-Daudé]

Patch created mechanically by rerunning:

  $  spatch --sp-file scripts/coccinelle/round.cocci \
            --macro-file scripts/cocci-macro-file.h \
            --dir . --in-place

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 ui/vnc-enc-tight.c | 2 +-
 ui/vnc.c           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
index f38aceb4da..0b4a5ac71f 100644
--- a/ui/vnc-enc-tight.c
+++ b/ui/vnc-enc-tight.c
@@ -979,7 +979,7 @@ static int send_mono_rect(VncState *vs, int x, int y,
     }
 #endif
 
-    bytes = (DIV_ROUND_UP(w, 8)) * h;
+    bytes = DIV_ROUND_UP(w, 8) * h;
 
     vnc_write_u8(vs, (stream | VNC_TIGHT_EXPLICIT_FILTER) << 4);
     vnc_write_u8(vs, VNC_TIGHT_FILTER_PALETTE);
diff --git a/ui/vnc.c b/ui/vnc.c
index 359693238b..3361432a51 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2967,7 +2967,8 @@ static int vnc_refresh_server_surface(VncDisplay *vd)
             PIXMAN_FORMAT_BPP(pixman_image_get_format(vd->guest.fb));
         guest_row0 = (uint8_t *)pixman_image_get_data(vd->guest.fb);
         guest_stride = pixman_image_get_stride(vd->guest.fb);
-        guest_ll = pixman_image_get_width(vd->guest.fb) * (DIV_ROUND_UP(guest_bpp, 8));
+        guest_ll = pixman_image_get_width(vd->guest.fb)
+                   * DIV_ROUND_UP(guest_bpp, 8);
     }
     line_bytes = MIN(server_stride, guest_ll);
 
-- 
2.18.0

Re: [Qemu-devel] [PATCH 6/8] ui/vnc: Remove useless parenthesis around DIV_ROUND_UP macro

[Markus Armbruster]

Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> Patch created mechanically by rerunning:
>
>   $  spatch --sp-file scripts/coccinelle/round.cocci \
>             --macro-file scripts/cocci-macro-file.h \
>             --dir . --in-place
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  ui/vnc-enc-tight.c | 2 +-
>  ui/vnc.c           | 3 ++-
>  2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
> index f38aceb4da..0b4a5ac71f 100644
> --- a/ui/vnc-enc-tight.c
> +++ b/ui/vnc-enc-tight.c
> @@ -979,7 +979,7 @@ static int send_mono_rect(VncState *vs, int x, int y,
>      }
>  #endif
>  
> -    bytes = (DIV_ROUND_UP(w, 8)) * h;
> +    bytes = DIV_ROUND_UP(w, 8) * h;
>  
>      vnc_write_u8(vs, (stream | VNC_TIGHT_EXPLICIT_FILTER) << 4);
>      vnc_write_u8(vs, VNC_TIGHT_FILTER_PALETTE);
> diff --git a/ui/vnc.c b/ui/vnc.c
> index 359693238b..3361432a51 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -2967,7 +2967,8 @@ static int vnc_refresh_server_surface(VncDisplay *vd)
>              PIXMAN_FORMAT_BPP(pixman_image_get_format(vd->guest.fb));
>          guest_row0 = (uint8_t *)pixman_image_get_data(vd->guest.fb);
>          guest_stride = pixman_image_get_stride(vd->guest.fb);
> -        guest_ll = pixman_image_get_width(vd->guest.fb) * (DIV_ROUND_UP(guest_bpp, 8));
> +        guest_ll = pixman_image_get_width(vd->guest.fb)
> +                   * DIV_ROUND_UP(guest_bpp, 8);
>      }
>      line_bytes = MIN(server_stride, guest_ll);

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Re: [Qemu-devel] [PATCH 6/8] ui/vnc: Remove useless parenthesis around DIV_ROUND_UP macro

[Gerd Hoffmann]

On Wed, Jul 04, 2018 at 12:39:17PM -0300, Philippe Mathieu-Daudé wrote:
> Patch created mechanically by rerunning:
> 
>   $  spatch --sp-file scripts/coccinelle/round.cocci \
>             --macro-file scripts/cocci-macro-file.h \
>             --dir . --in-place
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Added to ui queue.

thanks,
  Gerd

[Qemu-devel] [PATCH 7/8] hw/pci-host: Remove useless parenthesis around DIV_ROUND_UP macro

[Philippe Mathieu-Daudé]

Patch created mechanically by rerunning:

  $  spatch --sp-file scripts/coccinelle/round.cocci \
            --macro-file scripts/cocci-macro-file.h \
            --dir . --in-place

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/pci-host/piix.c | 2 +-
 hw/pci-host/q35.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
index 0e608347c1..317c0feca6 100644
--- a/hw/pci-host/piix.c
+++ b/hw/pci-host/piix.c
@@ -144,7 +144,7 @@ static void i440fx_update_memory_mappings(PCII440FXState *d)
     memory_region_transaction_begin();
     for (i = 0; i < 13; i++) {
         pam_update(&d->pam_regions[i], i,
-                   pd->config[I440FX_PAM + (DIV_ROUND_UP(i, 2))]);
+                   pd->config[I440FX_PAM + DIV_ROUND_UP(i, 2)]);
     }
     memory_region_set_enabled(&d->smram_region,
                               !(pd->config[I440FX_SMRAM] & SMRAM_D_OPEN));
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index 02f9576588..b3a5b3036d 100644
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -352,7 +352,7 @@ static void mch_update_pam(MCHPCIState *mch)
     memory_region_transaction_begin();
     for (i = 0; i < 13; i++) {
         pam_update(&mch->pam_regions[i], i,
-                   pd->config[MCH_HOST_BRIDGE_PAM0 + (DIV_ROUND_UP(i, 2))]);
+                   pd->config[MCH_HOST_BRIDGE_PAM0 + DIV_ROUND_UP(i, 2)]);
     }
     memory_region_transaction_commit();
 }
-- 
2.18.0

Re: [Qemu-devel] [PATCH 7/8] hw/pci-host: Remove useless parenthesis around DIV_ROUND_UP macro

[Markus Armbruster]

Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> Patch created mechanically by rerunning:
>
>   $  spatch --sp-file scripts/coccinelle/round.cocci \
>             --macro-file scripts/cocci-macro-file.h \
>             --dir . --in-place
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/pci-host/piix.c | 2 +-
>  hw/pci-host/q35.c  | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
> index 0e608347c1..317c0feca6 100644
> --- a/hw/pci-host/piix.c
> +++ b/hw/pci-host/piix.c
> @@ -144,7 +144,7 @@ static void i440fx_update_memory_mappings(PCII440FXState *d)
>      memory_region_transaction_begin();
>      for (i = 0; i < 13; i++) {
>          pam_update(&d->pam_regions[i], i,
> -                   pd->config[I440FX_PAM + (DIV_ROUND_UP(i, 2))]);
> +                   pd->config[I440FX_PAM + DIV_ROUND_UP(i, 2)]);
>      }
>      memory_region_set_enabled(&d->smram_region,
>                                !(pd->config[I440FX_SMRAM] & SMRAM_D_OPEN));
> diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
> index 02f9576588..b3a5b3036d 100644
> --- a/hw/pci-host/q35.c
> +++ b/hw/pci-host/q35.c
> @@ -352,7 +352,7 @@ static void mch_update_pam(MCHPCIState *mch)
>      memory_region_transaction_begin();
>      for (i = 0; i < 13; i++) {
>          pam_update(&mch->pam_regions[i], i,
> -                   pd->config[MCH_HOST_BRIDGE_PAM0 + (DIV_ROUND_UP(i, 2))]);
> +                   pd->config[MCH_HOST_BRIDGE_PAM0 + DIV_ROUND_UP(i, 2)]);
>      }
>      memory_region_transaction_commit();
>  }

Reviewed-by: Markus Armbruster <armbru@redhat.com>

[Qemu-devel] [PATCH 8/8] hw/intc/gicv3: Remove useless parenthesis around DIV_ROUND_UP macro

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 include/hw/intc/arm_gicv3_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/hw/intc/arm_gicv3_common.h b/include/hw/intc/arm_gicv3_common.h
index b798486ecf..31ec9a1ae4 100644
--- a/include/hw/intc/arm_gicv3_common.h
+++ b/include/hw/intc/arm_gicv3_common.h
@@ -62,7 +62,7 @@
  * avoids bugs where we forget to subtract GIC_INTERNAL from an
  * interrupt number.
  */
-#define GICV3_BMP_SIZE (DIV_ROUND_UP(GICV3_MAXIRQ, 32))
+#define GICV3_BMP_SIZE DIV_ROUND_UP(GICV3_MAXIRQ, 32)
 
 #define GIC_DECLARE_BITMAP(name) \
     uint32_t name[GICV3_BMP_SIZE]
-- 
2.18.0

Re: [Qemu-devel] [PATCH 0/8] Coccinelle cleanups

[Markus Armbruster]

Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> Nothing exciting here, patches created mechanically
> (common after soft freeze).

Cc: qemu-trivial

Re: [Qemu-devel] [PATCH 0/8] Coccinelle cleanups

[Michael S. Tsirkin]

On Wed, Jul 04, 2018 at 12:39:11PM -0300, Philippe Mathieu-Daudé wrote:
> Nothing exciting here, patches created mechanically
> (common after soft freeze).

Acked-by: Michael S. Tsirkin <mst@redhat.com>

> Philippe Mathieu-Daudé (8):
>   qobject: Catch another straggler for use of qdict_put_str()
>   error: Remove NULL checks on error_propagate() calls
>   crypto: Remove useless casts
>   xen: Remove useless casts
>   tests/bios-tables-test: Remove useless casts
>   ui/vnc: Remove useless parenthesis around DIV_ROUND_UP macro
>   hw/pci-host: Remove useless parenthesis around DIV_ROUND_UP macro
>   hw/intc/gicv3: Remove useless parenthesis around DIV_ROUND_UP macro
> 
>  include/hw/intc/arm_gicv3_common.h | 2 +-
>  crypto/cipher-builtin.c            | 4 ++--
>  hw/pci-host/piix.c                 | 2 +-
>  hw/pci-host/q35.c                  | 2 +-
>  hw/s390x/virtio-ccw.c              | 4 +---
>  hw/xen/xen_pt_config_init.c        | 2 +-
>  qobject/block-qdict.c              | 2 +-
>  tests/bios-tables-test.c           | 2 +-
>  ui/vnc-enc-tight.c                 | 2 +-
>  ui/vnc.c                           | 3 ++-
>  10 files changed, 12 insertions(+), 13 deletions(-)
> 
> -- 
> 2.18.0