File d35ae41-bnc875694.patch of Package libvirt.openSUSE_13.1_Update

commit d35ae4143d11f45856ae002fcd419da0eb9bba9f
Author: Michael Avdienko <whitearchey@gmail.com>
Date:   Fri Nov 15 20:47:43 2013 +0900

    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.
    
    Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

Index: libvirt-1.1.2/src/qemu/qemu_migration.c
===================================================================
--- libvirt-1.1.2.orig/src/qemu/qemu_migration.c
+++ libvirt-1.1.2/src/qemu/qemu_migration.c
@@ -1653,6 +1653,10 @@ qemuMigrationUpdateJobStatus(virQEMUDriv
                        _("%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;
Index: libvirt-1.1.2/src/qemu/qemu_monitor.c
===================================================================
--- libvirt-1.1.2.orig/src/qemu/qemu_monitor.c
+++ libvirt-1.1.2/src/qemu/qemu_monitor.c
@@ -109,7 +109,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,
Index: libvirt-1.1.2/src/qemu/qemu_monitor.h
===================================================================
--- libvirt-1.1.2.orig/src/qemu/qemu_monitor.h
+++ libvirt-1.1.2/src/qemu/qemu_monitor.h
@@ -396,6 +396,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
 };