hw/misc/ivshmem: Use one Error * variable instead of two
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 <armbru@redhat.com>
Message-Id: <20200313170517.22480-3-armbru@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
This commit is contained in:
parent
20ac582d0c
commit
364effc0eb
|
@ -832,7 +832,6 @@ static void ivshmem_common_realize(PCIDevice *dev, Error **errp)
|
||||||
IVShmemState *s = IVSHMEM_COMMON(dev);
|
IVShmemState *s = IVSHMEM_COMMON(dev);
|
||||||
Error *err = NULL;
|
Error *err = NULL;
|
||||||
uint8_t *pci_conf;
|
uint8_t *pci_conf;
|
||||||
Error *local_err = NULL;
|
|
||||||
|
|
||||||
/* IRQFD requires MSI */
|
/* IRQFD requires MSI */
|
||||||
if (ivshmem_has_feature(s, IVSHMEM_IOEVENTFD) &&
|
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)) {
|
if (!ivshmem_is_master(s)) {
|
||||||
error_setg(&s->migration_blocker,
|
error_setg(&s->migration_blocker,
|
||||||
"Migration is disabled when using feature 'peer mode' in device 'ivshmem'");
|
"Migration is disabled when using feature 'peer mode' in device 'ivshmem'");
|
||||||
migrate_add_blocker(s->migration_blocker, &local_err);
|
migrate_add_blocker(s->migration_blocker, &err);
|
||||||
if (local_err) {
|
if (err) {
|
||||||
error_propagate(errp, local_err);
|
error_propagate(errp, err);
|
||||||
error_free(s->migration_blocker);
|
error_free(s->migration_blocker);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue