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

[Vladimir Sementsov-Ogievskiy]

13.03.2020 20:05, Markus Armbruster wrote:

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

Signed-off-by: Markus Armbruster <arm...@redhat.com>
---
  hw/misc/ivshmem.c | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index 1a0fad74e1..a8dc9b377d 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -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'");

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

-        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:
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>



--
Best regards,
Vladimir