[RFC,PATCH-for-5.2,5/5] hw/virtio: Simplify virtio_mem_set_requested_size()

Commit Message

Philippe Mathieu-Daudé July 15, 2020, 5:58 p.m. UTC

Simplify by directly using visit_type_size() return value.

Signed-off-by: Philippe Mathieu-Daudé <[e-mail]>
---
 hw/virtio/virtio-mem.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Markus Armbruster July 16, 2020, 9:14 a.m. UTC | #1

Philippe Mathieu-Daudé <[e-mail]> writes:

> Simplify by directly using visit_type_size() return value.
>
> Signed-off-by: Philippe Mathieu-Daudé <[e-mail]>
> ---
>  hw/virtio/virtio-mem.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
> index ddf09ed1bf..e407abc2d8 100644
> --- a/hw/virtio/virtio-mem.c
> +++ b/hw/virtio/virtio-mem.c
> @@ -687,12 +687,9 @@ static void virtio_mem_set_requested_size(Object *obj, Visitor *v,
>                                            Error **errp)
>  {
>      VirtIOMEM *vmem = VIRTIO_MEM(obj);
> -    Error *err = NULL;
>      uint64_t value;
>  
> -    visit_type_size(v, name, &value, &err);
> -    if (err) {
> -        error_propagate(errp, err);
> +    if (!visit_type_size(v, name, &value, errp)) {
>          return;
>      }

Crept in after I transformed the pattern in my "Less clumsy error
checking" series.  There are a few more instances.  I expected that to
happen, and intend to transform stragglers periodically until their
supply dries up.

Patch

diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index ddf09ed1bf..e407abc2d8 100644
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -687,12 +687,9 @@  static void virtio_mem_set_requested_size(Object *obj, Visitor *v,
                                           Error **errp)
 {
     VirtIOMEM *vmem = VIRTIO_MEM(obj);
-    Error *err = NULL;
     uint64_t value;
 
-    visit_type_size(v, name, &value, &err);
-    if (err) {
-        error_propagate(errp, err);
+    if (!visit_type_size(v, name, &value, errp)) {
         return;
     }