Skip to contentSkip to conversation

Minor error handling cleanups

PATCH Applied Markus Armbruster 6 participants 21 messages Mar 13, 2020 – Mar 17, 2020 Block layer

lore
Share & tools
lore
#0 lore raw

cover Minor error handling cleanups

Markus Armbruster (3):
Use &error_abort instead of separate assert() hw/misc/ivshmem: Use one Error * variable instead of two
xen-block: Use one Error * variable instead of two

 block/monitor/block-hmp-cmds.c | 4 +---
 hw/block/xen-block.c           | 5 +----
 hw/misc/ivshmem.c              | 7 +++----
 target/arm/monitor.c           | 8 ++------
 tests/qtest/fuzz/qos_fuzz.c    | 6 ++----
 5 files changed, 9 insertions(+), 21 deletions(-)
Signature · 1 line
2.21.1
#1 lore raw

PATCH 1/3 Use &error_abort instead of separate assert()

---
 block/monitor/block-hmp-cmds.c | 4 +---
 target/arm/monitor.c           | 8 ++------
 tests/qtest/fuzz/qos_fuzz.c    | 6 ++----
 3 files changed, 5 insertions(+), 13 deletions(-)
block/monitor/block-hmp-cmds.c +1 -3
index c3a6368dfc..4c8c375172 100644
@@ -838,10 +838,8 @@ void hmp_info_blockstats(Monitor *mon, const QDict *qdict)
 void hmp_info_block_jobs(Monitor *mon, const QDict *qdict)
 {
     BlockJobInfoList *list;
-    Error *err = NULL;
 
-    list = qmp_query_block_jobs(&err);
-    assert(!err);
+    list = qmp_query_block_jobs(&error_abort);
 
     if (!list) {
         monitor_printf(mon, "No active jobs\n");
target/arm/monitor.c +2 -6
index c2dc7908de..ea6598c412 100644
@@ -206,9 +206,7 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type,
             return NULL;
         }
     } else {
-        Error *err = NULL;
-        arm_cpu_finalize_features(ARM_CPU(obj), &err);
-        assert(err == NULL);
+        arm_cpu_finalize_features(ARM_CPU(obj), &error_abort);
     }
 
     expansion_info = g_new0(CpuModelExpansionInfo, 1);
@@ -221,12 +219,10 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type,
     while ((name = cpu_model_advertised_features[i++]) != NULL) {
         ObjectProperty *prop = object_property_find(obj, name, NULL);
         if (prop) {
-            Error *err = NULL;
             QObject *value;
 
             assert(prop->get);
-            value = object_property_get_qobject(obj, name, &err);
-            assert(!err);
+            value = object_property_get_qobject(obj, name, &error_abort);
 
             qdict_put_obj(qdict_out, name, value);
         }
tests/qtest/fuzz/qos_fuzz.c +2 -4
index 1a99277d60..aa9eee6ebf 100644
@@ -57,8 +57,7 @@ static void qos_set_machines_devices_available(void)
     QList *lst;
     Error *err = NULL;
 
-    qmp_marshal_query_machines(NULL, &response, &err);
-    assert(!err);
+    qmp_marshal_query_machines(NULL, &response, &error_abort);
     lst = qobject_to(QList, response);
     apply_to_qlist(lst, true);
 
@@ -70,8 +69,7 @@ static void qos_set_machines_devices_available(void)
     qdict_put_bool(args, "abstract", true);
     qdict_put_obj(req, "arguments", (QObject *) args);
 
-    qmp_marshal_qom_list_types(args, &response, &err);
-    assert(!err);
+    qmp_marshal_qom_list_types(args, &response, &error_abort);
     lst = qobject_to(QList, response);
     apply_to_qlist(lst, false);
     qobject_unref(response);
Signature · 1 line
2.21.1
Acked-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] Use &error_abort instead of separate assert()

tests/qtest/fuzz/qos_fuzz.c static void qos_set_machines_devices_available(void) · line 58

Quoted 9 lines · Markus Armbruster

index 1a99277d60..aa9eee6ebf 100644

tests/qtest/fuzz/qos_fuzz.c +0 -0
@@ -57,8 +57,7 @@ static void qos_set_machines_devices_available(void)
     QList *lst;
     Error *err = NULL;

Can this err declaration be removed? Don't think it's used anywhere else.

Quoted 20 lines
tests/qtest/fuzz/qos_fuzz.c +2 -4
-    qmp_marshal_query_machines(NULL, &response, &err);
-    assert(!err);
+    qmp_marshal_query_machines(NULL, &response, &error_abort);
     lst = qobject_to(QList, response);
     apply_to_qlist(lst, true);
 
@@ -70,8 +69,7 @@ static void qos_set_machines_devices_available(void)
     qdict_put_bool(args, "abstract", true);
     qdict_put_obj(req, "arguments", (QObject *) args);
 
-    qmp_marshal_qom_list_types(args, &response, &err);
-    assert(!err);
+    qmp_marshal_qom_list_types(args, &response, &error_abort);
     lst = qobject_to(QList, response);
     apply_to_qlist(lst, false);
     qobject_unref(response);
Signature · 1 line
2.21.1

Thanks!

Reviewed-by
#3 lore raw

Re: [PATCH 1/3] Use &error_abort instead of separate assert()

Quoted 4 lines · Alexander Bulekov
Quoted 1 line · Markus Armbruster
Quoted 8 lines

tests/qtest/fuzz/qos_fuzz.c static void qos_set_machines_devices_available(void) · line 58

Quoted 6 lines

index 1a99277d60..aa9eee6ebf 100644

tests/qtest/fuzz/qos_fuzz.c +0 -0
@@ -57,8 +57,7 @@ static void qos_set_machines_devices_available(void)
      QList *lst;
      Error *err = NULL;

Can this err declaration be removed? Don't think it's used anywhere else.

Correct, it is not. With that additional line gone,

Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
#4 lore raw

Re: [PATCH 1/3] Use &error_abort instead of separate assert()

In reply to Alexander Bulekov
Quoted 4 lines · Alexander Bulekov
Quoted 1 line · Markus Armbruster
Quoted 8 lines

tests/qtest/fuzz/qos_fuzz.c static void qos_set_machines_devices_available(void) · line 58

Quoted 6 lines

index 1a99277d60..aa9eee6ebf 100644

tests/qtest/fuzz/qos_fuzz.c +0 -0
@@ -57,8 +57,7 @@ static void qos_set_machines_devices_available(void)
     QList *lst;
     Error *err = NULL;

Can this err declaration be removed? Don't think it's used anywhere else.

Will do.

Quoted 21 lines
Quoted 19 lines
tests/qtest/fuzz/qos_fuzz.c +2 -4
-    qmp_marshal_query_machines(NULL, &response, &err);
-    assert(!err);
+    qmp_marshal_query_machines(NULL, &response, &error_abort);
     lst = qobject_to(QList, response);
     apply_to_qlist(lst, true);
 
@@ -70,8 +69,7 @@ static void qos_set_machines_devices_available(void)
     qdict_put_bool(args, "abstract", true);
     qdict_put_obj(req, "arguments", (QObject *) args);
 
-    qmp_marshal_qom_list_types(args, &response, &err);
-    assert(!err);
+    qmp_marshal_qom_list_types(args, &response, &error_abort);
     lst = qobject_to(QList, response);
     apply_to_qlist(lst, false);
     qobject_unref(response);
Signature · 1 line
2.21.1

Thanks!

Quoted 1 line

Thanks!

#5 lore raw

Re: [PATCH 1/3] Use &error_abort instead of separate assert()

Quoted 15 lines · Markus Armbruster
Quoted 4 lines · Alexander Bulekov
Quoted 1 line · Markus Armbruster
Quoted 8 lines

tests/qtest/fuzz/qos_fuzz.c static void qos_set_machines_devices_available(void) · line 58

Quoted 6 lines

index 1a99277d60..aa9eee6ebf 100644

tests/qtest/fuzz/qos_fuzz.c +0 -0
@@ -57,8 +57,7 @@ static void qos_set_machines_devices_available(void)
      QList *lst;
      Error *err = NULL;

Can this err declaration be removed? Don't think it's used anywhere else.

Quoted 1 line

Will do.

with this:

Quoted 26 lines
Quoted 22 lines
Quoted 20 lines
tests/qtest/fuzz/qos_fuzz.c +2 -4
-    qmp_marshal_query_machines(NULL, &response, &err);
-    assert(!err);
+    qmp_marshal_query_machines(NULL, &response, &error_abort);
      lst = qobject_to(QList, response);
      apply_to_qlist(lst, true);
 
@@ -70,8 +69,7 @@ static void qos_set_machines_devices_available(void)
      qdict_put_bool(args, "abstract", true);
      qdict_put_obj(req, "arguments", (QObject *) args);
 
-    qmp_marshal_qom_list_types(args, &response, &err);
-    assert(!err);
+    qmp_marshal_qom_list_types(args, &response, &error_abort);
      lst = qobject_to(QList, response);
      apply_to_qlist(lst, false);
      qobject_unref(response);
Signature · 1 line
2.21.1

Thanks!

Quoted 1 line

Thanks!

Signature · 2 lines
Best regards,
Vladimir
#6 lore raw

PATCH 2/3 hw/misc/ivshmem: Use one Error * variable instead of two

In reply to Markus Armbruster

Commit fe44dc9180 "migration: disallow migrate_add_blocker during migration" accidentally added a second Error * variable. Use the first one instead.

---
 hw/misc/ivshmem.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
hw/misc/ivshmem.c +3 -4
index 1a0fad74e1..a8dc9b377d 100644
@@ -832,7 +832,6 @@ static void ivshmem_common_realize(PCIDevice *dev, Error **errp)
     IVShmemState *s = IVSHMEM_COMMON(dev);
     Error *err = NULL;
     uint8_t *pci_conf;
-    Error *local_err = NULL;
 
     /* IRQFD requires MSI */
     if (ivshmem_has_feature(s, IVSHMEM_IOEVENTFD) &&
@@ -899,9 +898,9 @@ static void ivshmem_common_realize(PCIDevice *dev, Error **errp)
     if (!ivshmem_is_master(s)) {
         error_setg(&s->migration_blocker,
                    "Migration is disabled when using feature 'peer mode' in device 'ivshmem'");
-        migrate_add_blocker(s->migration_blocker, &local_err);
-        if (local_err) {
-            error_propagate(errp, local_err);
+        migrate_add_blocker(s->migration_blocker, &err);
+        if (err) {
+            error_propagate(errp, err);
             error_free(s->migration_blocker);
             return;
         }
Signature · 1 line
2.21.1
Reviewed-by on v1 2/3
#7 lore raw

Re: [PATCH 2/3] hw/misc/ivshmem: Use one Error * variable instead of two

Quoted 8 lines · Markus Armbruster

Commit fe44dc9180 "migration: disallow migrate_add_blocker during migration" accidentally added a second Error * variable. Use the first one instead.

---
  hw/misc/ivshmem.c | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
Reviewed-by on v1 2/3
#8 lore raw

Re: [PATCH 2/3] hw/misc/ivshmem: Use one Error * variable instead of two

In reply to Markus Armbruster
Quoted 22 lines · Markus Armbruster

Commit fe44dc9180 "migration: disallow migrate_add_blocker during migration" accidentally added a second Error * variable. Use the first one instead.

---
  hw/misc/ivshmem.c | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
hw/misc/ivshmem.c +0 -1
index 1a0fad74e1..a8dc9b377d 100644
@@ -832,7 +832,6 @@ static void ivshmem_common_realize(PCIDevice *dev, Error **errp)
      IVShmemState *s = IVSHMEM_COMMON(dev);
      Error *err = NULL;
      uint8_t *pci_conf;
-    Error *local_err = NULL;
 
      /* IRQFD requires MSI */
      if (ivshmem_has_feature(s, IVSHMEM_IOEVENTFD) &&

hw/misc/ivshmem.c static void ivshmem_common_realize(PCIDevice *dev, Error **errp) · line 900

Quoted 3 lines
hw/misc/ivshmem.c +0 -0
@@ -899,9 +898,9 @@ static void ivshmem_common_realize(PCIDevice *dev, Error **errp)
      if (!ivshmem_is_master(s)) {
          error_setg(&s->migration_blocker,
                     "Migration is disabled when using feature 'peer mode' in device 'ivshmem'");

Hmm, if you want, you may fix this over-80 line while we are here.

hw/misc/ivshmem.c static void ivshmem_common_realize(PCIDevice *dev, Error **errp) · line 906

Quoted 10 lines
hw/misc/ivshmem.c +3 -3
-        migrate_add_blocker(s->migration_blocker, &local_err);
-        if (local_err) {
-            error_propagate(errp, local_err);
+        migrate_add_blocker(s->migration_blocker, &err);
+        if (err) {
+            error_propagate(errp, err);
              error_free(s->migration_blocker);
              return;
          }

migrate_add_blocker returns error code, so we can just do

if (migrate_add_blocker(s->migration_blocker, errp)) {
error_free(s->migration_blocker;
return;
}

With or without this:

Signature · 2 lines
Best regards,
Vladimir
#9 lore raw

PATCH 3/3 xen-block: Use one Error * variable instead of two

In reply to Markus Armbruster
---
 hw/block/xen-block.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
hw/block/xen-block.c +1 -4
index 3885464513..7b3b6dee97 100644
@@ -998,14 +998,13 @@ static void xen_block_device_destroy(XenBackendInstance *backend,
     XenBlockVdev *vdev = &blockdev->props.vdev;
     XenBlockDrive *drive = blockdev->drive;
     XenBlockIOThread *iothread = blockdev->iothread;
+    Error *local_err = NULL;
 
     trace_xen_block_device_destroy(vdev->number);
 
     object_unparent(OBJECT(xendev));
 
     if (iothread) {
-        Error *local_err = NULL;
-
         xen_block_iothread_destroy(iothread, &local_err);
         if (local_err) {
             error_propagate_prepend(errp, local_err,
@@ -1015,8 +1014,6 @@ static void xen_block_device_destroy(XenBackendInstance *backend,
     }
 
     if (drive) {
-        Error *local_err = NULL;
-
         xen_block_drive_destroy(drive, &local_err);
         if (local_err) {
             error_propagate_prepend(errp, local_err,
Signature · 1 line
2.21.1
Reviewed-by on v1 3/3
#10 lore raw

Re: [PATCH 3/3] xen-block: Use one Error * variable instead of two

Quoted 4 lines · Markus Armbruster
---
  hw/block/xen-block.c | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
Reviewed-by on v1 3/3
#11 lore raw

Re: [PATCH 3/3] xen-block: Use one Error * variable instead of two

In reply to Markus Armbruster
Quoted 27 lines · Markus Armbruster
---
  hw/block/xen-block.c | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
hw/block/xen-block.c +1 -2
index 3885464513..7b3b6dee97 100644
@@ -998,14 +998,13 @@ static void xen_block_device_destroy(XenBackendInstance *backend,
      XenBlockVdev *vdev = &blockdev->props.vdev;
      XenBlockDrive *drive = blockdev->drive;
      XenBlockIOThread *iothread = blockdev->iothread;
+    Error *local_err = NULL;
 
      trace_xen_block_device_destroy(vdev->number);
 
      object_unparent(OBJECT(xendev));
 
      if (iothread) {
-        Error *local_err = NULL;
-
          xen_block_iothread_destroy(iothread, &local_err);
          if (local_err) {
              error_propagate_prepend(errp, local_err,

hw/block/xen-block.c static void xen_block_device_destroy(XenBackendInstance *backend, · line 1019

Quoted 8 lines
hw/block/xen-block.c +0 -2
@@ -1015,8 +1014,6 @@ static void xen_block_device_destroy(XenBackendInstance *backend,
      }
 
      if (drive) {
-        Error *local_err = NULL;
-
          xen_block_drive_destroy(drive, &local_err);
          if (local_err) {
              error_propagate_prepend(errp, local_err,
Reviewed-by on v1 3/3
#12 lore raw

Re: [PATCH 3/3] xen-block: Use one Error * variable instead of two

In reply to Markus Armbruster
Quoted 26 lines · Markus Armbruster
---
  hw/block/xen-block.c | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
hw/block/xen-block.c +1 -2
index 3885464513..7b3b6dee97 100644
@@ -998,14 +998,13 @@ static void xen_block_device_destroy(XenBackendInstance *backend,
      XenBlockVdev *vdev = &blockdev->props.vdev;
      XenBlockDrive *drive = blockdev->drive;
      XenBlockIOThread *iothread = blockdev->iothread;
+    Error *local_err = NULL;
 
      trace_xen_block_device_destroy(vdev->number);
 
      object_unparent(OBJECT(xendev));
 
      if (iothread) {
-        Error *local_err = NULL;
-
          xen_block_iothread_destroy(iothread, &local_err);
          if (local_err) {
              error_propagate_prepend(errp, local_err,

hw/block/xen-block.c static void xen_block_device_destroy(XenBackendInstance *backend, · line 1019

Quoted 8 lines
hw/block/xen-block.c +0 -2
@@ -1015,8 +1014,6 @@ static void xen_block_device_destroy(XenBackendInstance *backend,
      }
 
      if (drive) {
-        Error *local_err = NULL;
-
          xen_block_drive_destroy(drive, &local_err);
          if (local_err) {
              error_propagate_prepend(errp, local_err,

Hmm, no "return;" statement after this propagation. It's OK, as there no more code in the function after this "if", but I'd add it to be consistent and to avoid forgetting to add a return here when add more code to the function.

(and if you do this, you may also fix indentation of string paramter of error_propagate_prepend...)

Anyway,

Signature · 2 lines
Best regards,
Vladimir
author Reviewed-by Peter Maydell Reviewed-by Eric Blake Reviewed-by Philippe Mathieu-Daudé Reviewed-by Vladimir Sementsov-Ogievskiy
#13 lore raw

Re: [PATCH 3/3] xen-block: Use one Error * variable instead of two

Uh, I failed to actually send this. It's in my pull request now.

Quoted 34 lines · Vladimir Sementsov-Ogievskiy
Quoted 23 lines · Markus Armbruster
---
  hw/block/xen-block.c | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
hw/block/xen-block.c +1 -2
index 3885464513..7b3b6dee97 100644
@@ -998,14 +998,13 @@ static void xen_block_device_destroy(XenBackendInstance *backend,
      XenBlockVdev *vdev = &blockdev->props.vdev;
      XenBlockDrive *drive = blockdev->drive;
      XenBlockIOThread *iothread = blockdev->iothread;
+    Error *local_err = NULL;
        trace_xen_block_device_destroy(vdev->number);
        object_unparent(OBJECT(xendev));
        if (iothread) {
-        Error *local_err = NULL;
-
          xen_block_iothread_destroy(iothread, &local_err);
          if (local_err) {
              error_propagate_prepend(errp, local_err,

hw/block/xen-block.c static void xen_block_device_destroy(XenBackendInstance *backend, · line 1018

Quoted 7 lines
hw/block/xen-block.c +0 -2
@@ -1015,8 +1014,6 @@ static void xen_block_device_destroy(XenBackendInstance *backend,
      }
        if (drive) {
-        Error *local_err = NULL;
-
          xen_block_drive_destroy(drive, &local_err);
          if (local_err) {
              error_propagate_prepend(errp, local_err,

Hmm, no "return;" statement after this propagation. It's OK, as there no more code in the function after this "if", but I'd add it to be consistent and to avoid forgetting to add a return here when add more code to the function.

Quoted 6 lines

(and if you do this, you may also fix indentation of string paramter of error_propagate_prepend...)

Anyway,

Like this, I guess:

xen-block: Use one Error * variable instead of two

While there, tidy up indentation, and add return just for consistency and robustness.

Message-Id: <[email protected]>

hw/block/xen-block.c +4 -6
index 3885464513..07bb32e22b 100644
@@ -998,29 +998,27 @@ static void xen_block_device_destroy(XenBackendInstance *backend,
     XenBlockVdev *vdev = &blockdev->props.vdev;
     XenBlockDrive *drive = blockdev->drive;
     XenBlockIOThread *iothread = blockdev->iothread;
+    Error *local_err = NULL;
 
     trace_xen_block_device_destroy(vdev->number);
 
     object_unparent(OBJECT(xendev));
 
     if (iothread) {
-        Error *local_err = NULL;
-
         xen_block_iothread_destroy(iothread, &local_err);
         if (local_err) {
             error_propagate_prepend(errp, local_err,
-                                "failed to destroy iothread: ");
+                                    "failed to destroy iothread: ");
             return;
         }
     }
 
     if (drive) {
-        Error *local_err = NULL;
-
         xen_block_drive_destroy(drive, &local_err);
         if (local_err) {
             error_propagate_prepend(errp, local_err,
-                                "failed to destroy drive: ");
+                                    "failed to destroy drive: ");
+            return;
         }
     }
 }
#14 lore raw

Re: [PATCH 3/3] xen-block: Use one Error * variable instead of two

Quoted 88 lines · Markus Armbruster

Uh, I failed to actually send this. It's in my pull request now.

Quoted 34 lines · Vladimir Sementsov-Ogievskiy
Quoted 23 lines · Markus Armbruster
---
   hw/block/xen-block.c | 5 +----
   1 file changed, 1 insertion(+), 4 deletions(-)
hw/block/xen-block.c +1 -2
index 3885464513..7b3b6dee97 100644
@@ -998,14 +998,13 @@ static void xen_block_device_destroy(XenBackendInstance *backend,
       XenBlockVdev *vdev = &blockdev->props.vdev;
       XenBlockDrive *drive = blockdev->drive;
       XenBlockIOThread *iothread = blockdev->iothread;
+    Error *local_err = NULL;
         trace_xen_block_device_destroy(vdev->number);
         object_unparent(OBJECT(xendev));
         if (iothread) {
-        Error *local_err = NULL;
-
           xen_block_iothread_destroy(iothread, &local_err);
           if (local_err) {
               error_propagate_prepend(errp, local_err,

hw/block/xen-block.c static void xen_block_device_destroy(XenBackendInstance *backend, · line 1018

Quoted 7 lines
hw/block/xen-block.c +0 -2
@@ -1015,8 +1014,6 @@ static void xen_block_device_destroy(XenBackendInstance *backend,
       }
         if (drive) {
-        Error *local_err = NULL;
-
           xen_block_drive_destroy(drive, &local_err);
           if (local_err) {
               error_propagate_prepend(errp, local_err,

Hmm, no "return;" statement after this propagation. It's OK, as there no more code in the function after this "if", but I'd add it to be consistent and to avoid forgetting to add a return here when add more code to the function.

Quoted 6 lines

(and if you do this, you may also fix indentation of string paramter of error_propagate_prepend...)

Anyway,

Like this, I guess:

xen-block: Use one Error * variable instead of two

While there, tidy up indentation, and add return just for consistency and robustness.

Message-Id: <[email protected]>

hw/block/xen-block.c +2 -4
index 3885464513..07bb32e22b 100644
@@ -998,29 +998,27 @@ static void xen_block_device_destroy(XenBackendInstance *backend,
      XenBlockVdev *vdev = &blockdev->props.vdev;
      XenBlockDrive *drive = blockdev->drive;
      XenBlockIOThread *iothread = blockdev->iothread;
+    Error *local_err = NULL;
 
      trace_xen_block_device_destroy(vdev->number);
 
      object_unparent(OBJECT(xendev));
 
      if (iothread) {
-        Error *local_err = NULL;
-
          xen_block_iothread_destroy(iothread, &local_err);
          if (local_err) {
              error_propagate_prepend(errp, local_err,
-                                "failed to destroy iothread: ");
+                                    "failed to destroy iothread: ");
              return;
          }
      }
 
      if (drive) {
-        Error *local_err = NULL;

hw/block/xen-block.c static void xen_block_device_destroy(XenBackendInstance *backend, · line 1024

Quoted 10 lines
hw/block/xen-block.c +2 -2
-
          xen_block_drive_destroy(drive, &local_err);
          if (local_err) {
              error_propagate_prepend(errp, local_err,
-                                "failed to destroy drive: ");
+                                    "failed to destroy drive: ");
+            return;
          }
      }
  }

Yes, that's what I meant, thanks!

Signature · 2 lines
Best regards,
Vladimir
Reviewed-by on the v1 series
#15 lore raw
In reply to Markus Armbruster
Quoted 6 lines · Markus Armbruster

Markus Armbruster (3):
Use &error_abort instead of separate assert() hw/misc/ivshmem: Use one Error * variable instead of two
xen-block: Use one Error * variable instead of two

Quoted 6 lines
 block/monitor/block-hmp-cmds.c | 4 +---
 hw/block/xen-block.c           | 5 +----
 hw/misc/ivshmem.c              | 7 +++----
 target/arm/monitor.c           | 8 ++------
 tests/qtest/fuzz/qos_fuzz.c    | 6 ++----
 5 files changed, 9 insertions(+), 21 deletions(-)

series

-- PMM

#16 lore raw

[PATCH v10 4/3] hw/sd/ssi-sd: fix error handling in ssi_sd_realize

In reply to Markus Armbruster

It's wrong to use same err object as errp parameter for several function calls without intermediate checking for error: we'll crash if try to set err object twice. Fix that.

---

Forgive me for sending this into your series, but seems it is very appropriate.

It's rephrasing of my
[PATCH v9 03/10] hw/sd/ssi-sd: fix error handling in ssi_sd_realize
for partI series but but without use of ERRP_AUTO_PROPAGATE.

 hw/sd/ssi-sd.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
hw/sd/ssi-sd.c +14 -2
index 91db069212..829797b597 100644
@@ -255,13 +255,25 @@ static void ssi_sd_realize(SSISlave *d, Error **errp)
     carddev = qdev_create(BUS(&s->sdbus), TYPE_SD_CARD);
     if (dinfo) {
         qdev_prop_set_drive(carddev, "drive", blk_by_legacy_dinfo(dinfo), &err);
+        if (err) {
+            goto fail;
+        }
     }
+
     object_property_set_bool(OBJECT(carddev), true, "spi", &err);
+    if (err) {
+        goto fail;
+    }
+
     object_property_set_bool(OBJECT(carddev), true, "realized", &err);
     if (err) {
-        error_setg(errp, "failed to init SD card: %s", error_get_pretty(err));
-        return;
+        goto fail;
     }
+
+    return;
+
+fail:
+    error_propagate_prepend(errp, err, "failed to init SD card: ");
 }
 
 static void ssi_sd_reset(DeviceState *dev)
Signature · 1 line
2.21.0
#17 lore raw

Re: [PATCH v10 4/3] hw/sd/ssi-sd: fix error handling in ssi_sd_realize

Quoted 40 lines · Vladimir Sementsov-Ogievskiy

It's wrong to use same err object as errp parameter for several function calls without intermediate checking for error: we'll crash if try to set err object twice. Fix that.

---

Forgive me for sending this into your series, but seems it is very appropriate.

It's rephrasing of my
[PATCH v9 03/10] hw/sd/ssi-sd: fix error handling in ssi_sd_realize
for partI series but but without use of ERRP_AUTO_PROPAGATE.

  hw/sd/ssi-sd.c | 16 ++++++++++++++--
  1 file changed, 14 insertions(+), 2 deletions(-)
hw/sd/ssi-sd.c +8 -2
index 91db069212..829797b597 100644
@@ -255,13 +255,25 @@ static void ssi_sd_realize(SSISlave *d, Error **errp)
      carddev = qdev_create(BUS(&s->sdbus), TYPE_SD_CARD);
      if (dinfo) {
          qdev_prop_set_drive(carddev, "drive", blk_by_legacy_dinfo(dinfo), &err);
+        if (err) {
+            goto fail;
+        }
      }
+
      object_property_set_bool(OBJECT(carddev), true, "spi", &err);
+    if (err) {
+        goto fail;
+    }
+
      object_property_set_bool(OBJECT(carddev), true, "realized", &err);
      if (err) {
-        error_setg(errp, "failed to init SD card: %s", error_get_pretty(err));
-        return;

hw/sd/ssi-sd.c static void ssi_sd_realize(SSISlave *d, Error **errp) · line 279

Quoted 10 lines
hw/sd/ssi-sd.c +6 -0
+        goto fail;
      }
+
+    return;
+
+fail:
+    error_propagate_prepend(errp, err, "failed to init SD card: ");
  }
 
  static void ssi_sd_reset(DeviceState *dev)
author Reviewed-by
#18 lore raw

Re: [PATCH v10 4/3] hw/sd/ssi-sd: fix error handling in ssi_sd_realize

In reply to Vladimir Sementsov-Ogievskiy
Quoted 39 lines · Vladimir Sementsov-Ogievskiy

It's wrong to use same err object as errp parameter for several function calls without intermediate checking for error: we'll crash if try to set err object twice. Fix that.

---

Forgive me for sending this into your series, but seems it is very appropriate.

It's rephrasing of my
[PATCH v9 03/10] hw/sd/ssi-sd: fix error handling in ssi_sd_realize
for partI series but but without use of ERRP_AUTO_PROPAGATE.

 hw/sd/ssi-sd.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
hw/sd/ssi-sd.c +8 -2
index 91db069212..829797b597 100644
@@ -255,13 +255,25 @@ static void ssi_sd_realize(SSISlave *d, Error **errp)
     carddev = qdev_create(BUS(&s->sdbus), TYPE_SD_CARD);
     if (dinfo) {
         qdev_prop_set_drive(carddev, "drive", blk_by_legacy_dinfo(dinfo), &err);
+        if (err) {
+            goto fail;
+        }
     }
+
     object_property_set_bool(OBJECT(carddev), true, "spi", &err);
+    if (err) {
+        goto fail;
+    }
+
     object_property_set_bool(OBJECT(carddev), true, "realized", &err);
     if (err) {
-        error_setg(errp, "failed to init SD card: %s", error_get_pretty(err));
-        return;

hw/sd/ssi-sd.c static void ssi_sd_realize(SSISlave *d, Error **errp) · line 279

Quoted 10 lines
hw/sd/ssi-sd.c +6 -0
+        goto fail;
     }
+
+    return;
+
+fail:
+    error_propagate_prepend(errp, err, "failed to init SD card: ");
 }
 
 static void ssi_sd_reset(DeviceState *dev)
#19 lore raw

Re: [PATCH v10 4/3] hw/sd/ssi-sd: fix error handling in ssi_sd_realize

In reply to Vladimir Sementsov-Ogievskiy
Quoted 5 lines · Vladimir Sementsov-Ogievskiy

It's wrong to use same err object as errp parameter for several function calls without intermediate checking for error: we'll crash if try to set err object twice. Fix that.

Quoted 8 lines

---

Forgive me for sending this into your series, but seems it is very appropriate.

It's rephrasing of my
[PATCH v9 03/10] hw/sd/ssi-sd: fix error handling in ssi_sd_realize
for partI series but but without use of ERRP_AUTO_PROPAGATE.

Forgive? Thank you for extracting a bug fix for 5.0! Got more? :)