[libvirt] [PATCH] Fix migration with QEMU 1.6

[Eric Blake]

On 11/15/2013 04:47 AM, Michael Avdienko wrote:
> 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.
> 

> +++ 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,

Thanks for your first patch!  However...

In https://bugzilla.redhat.com/show_bug.cgi?id=1015636, we call out:
https://lists.gnu.org/archive/html/qemu-devel/2013-10/msg00908.html

where the qemu developers mention that we should be tolerant of all
future unknown values, rather than the current setup of choking on
unknown strings.

Would you like to prepare a followup along those lines?

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 621 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20131115/5d0d6b9b/attachment-0001.sig>