From 5fed699a2d55e3977d90426622aadcf720c6f876 Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Thu, 26 Nov 2015 12:45:25 +0100 Subject: [PATCH] qemu: Reorder migration status enum A migration is in "setup" state after it was "inactive" and before it becomes "active". Let's reflect this in our migration status enum. Signed-off-by: Jiri Denemark --- src/qemu/qemu_monitor.c | 6 ++++-- src/qemu/qemu_monitor.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 4906faa93e..249a25e2cb 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -160,8 +160,10 @@ VIR_ONCE_GLOBAL_INIT(qemuMonitor) VIR_ENUM_IMPL(qemuMonitorMigrationStatus, QEMU_MONITOR_MIGRATION_STATUS_LAST, - "inactive", "active", "completed", "failed", "cancelling", - "cancelled", "setup") + "inactive", "setup", + "active", + "completed", "failed", + "cancelling", "cancelled") VIR_ENUM_IMPL(qemuMonitorMigrationCaps, QEMU_MONITOR_MIGRATION_CAPS_LAST, diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 6be0108ead..84e51cde5d 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -457,12 +457,12 @@ int qemuMonitorSetMigrationCacheSize(qemuMonitorPtr mon, enum { QEMU_MONITOR_MIGRATION_STATUS_INACTIVE, + QEMU_MONITOR_MIGRATION_STATUS_SETUP, QEMU_MONITOR_MIGRATION_STATUS_ACTIVE, QEMU_MONITOR_MIGRATION_STATUS_COMPLETED, QEMU_MONITOR_MIGRATION_STATUS_ERROR, QEMU_MONITOR_MIGRATION_STATUS_CANCELLING, QEMU_MONITOR_MIGRATION_STATUS_CANCELLED, - QEMU_MONITOR_MIGRATION_STATUS_SETUP, QEMU_MONITOR_MIGRATION_STATUS_LAST };