From: Eduardo Habkost <ehabkost@redhat.com>
Date: Thu, 8 Jun 2017 13:39:05 +0000 (-0300)
Subject: migration: Don't try to set *errp directly
X-Git-Tag: v2.10.0-rc0~134^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=250561e1aebf69e911992da9017322df7aeaa564;p=thirdparty%2Fqemu.git

migration: Don't try to set *errp directly

Assigning directly to *errp is not valid, as errp may be NULL,
&error_fatal, or &error_abort.  Use error_propagate() instead.

Cc: Juan Quintela <quintela@redhat.com>
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---

diff --git a/migration/migration.c b/migration/migration.c
index 9dfa19abe1d..ae087df56b5 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1179,7 +1179,7 @@ bool migration_is_blocked(Error **errp)
     }
 
     if (migration_blockers) {
-        *errp = error_copy(migration_blockers->data);
+        error_propagate(errp, error_copy(migration_blockers->data));
         return true;
     }