[libvirt] [PATCH] Fix migration with QEMU 1.6

QEMU 1.6.0 introduced new migration status: setup Libvirt does not expect such string in QMP and refuses to migrate with error "unexpected migration status in setup" This patch fixes it. Sorry for previous bad try. Unfortunately I have seen Serge Hallyn's patch too late. Now I think it's better to include following code into my patch: if (setting_up) { priv->job.info.fileTotal = -1; priv->job.info.fileRemaining = -1; priv->job.info.fileProcessed = 0; priv->job.info.memTotal = -1; priv->job.info.memRemaining = -1; priv->job.info.memProcessed = 0; priv->job.info.dataTotal = -1; priv->job.info.dataRemaining = -1; priv->job.info.dataProcessed = 0; } But I'm not sure if my patch is good enough. If it is then I will include aforementioned code in it. --- src/qemu/qemu_migration.c | 4 ++++ src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_monitor.h | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a3d986f..4b5fdba 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1644,6 +1644,10 @@ qemuMigrationUpdateJobStatus(virQEMUDriverPtr driver, _("%s: %s"), job, _("is not active")); break; + case QEMU_MONITOR_MIGRATION_STATUS_SETUP: + ret = 0; + break; + case QEMU_MONITOR_MIGRATION_STATUS_ACTIVE: priv->job.info.fileTotal = priv->job.status.disk_total; priv->job.info.fileRemaining = priv->job.status.disk_remaining; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 30315b3..0d4598e 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -114,7 +114,7 @@ VIR_ONCE_GLOBAL_INIT(qemuMonitor) VIR_ENUM_IMPL(qemuMonitorMigrationStatus, QEMU_MONITOR_MIGRATION_STATUS_LAST, - "inactive", "active", "completed", "failed", "cancelled") + "inactive", "active", "completed", "failed", "cancelled", "setup") VIR_ENUM_IMPL(qemuMonitorMigrationCaps, QEMU_MONITOR_MIGRATION_CAPS_LAST, diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index f893b1f..eabf000 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -397,6 +397,7 @@ enum { QEMU_MONITOR_MIGRATION_STATUS_COMPLETED, QEMU_MONITOR_MIGRATION_STATUS_ERROR, QEMU_MONITOR_MIGRATION_STATUS_CANCELLED, + QEMU_MONITOR_MIGRATION_STATUS_SETUP, QEMU_MONITOR_MIGRATION_STATUS_LAST }; -- 1.7.10.4