For historical reasons we automatically enabled VIR_MIGRATE_PAUSED flag
when a migration was started for a paused domain. However, when resuming
failed post-copy migration the domain on the source host will always be
paused (as it is already running on the destination host). We must avoid
enabling VIR_MIGRATE_PAUSED in this case.
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com>
---
Notes:
Version 2:
- no change
src/libvirt-domain.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index 5141174728..d86625526c 100644
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -3290,7 +3290,9 @@ virDomainMigrateVersion3Full(virDomainPtr domain,
ret = virDomainGetInfo(domain, &info);
state = info.state;
}
- if (ret == 0 && state == VIR_DOMAIN_PAUSED)
+ if (ret == 0 &&
+ state == VIR_DOMAIN_PAUSED &&
+ !(flags & VIR_MIGRATE_POSTCOPY_RESUME))
flags |= VIR_MIGRATE_PAUSED;
destflags = flags & ~(VIR_MIGRATE_ABORT_ON_ERROR |
--
2.35.1