[libvirt] [PATCHv2 04/16] qemu: fix error message with migrate2 xml

[Daniel P. Berrange]

On Tue, Jul 19, 2011 at 10:20:27PM -0600, Eric Blake wrote:
> Otherwise, an ABI mismatch gives error messages attributing the target
> xml string as current, and the current domain state as the new xml.
> 
> * src/qemu/qemu_migration.c (qemuMigrationBegin): Use correct
> argument order.
> ---
> 
> v2: new patch.  Noticed because I used the public migrate2 handling
> of dxml as the model for my patch 16/16, then noticed that the
> error messages were backwards as a result.
> 
>  src/qemu/qemu_migration.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> index 9c1bde5..3282271 100644
> --- a/src/qemu/qemu_migration.c
> +++ b/src/qemu/qemu_migration.c
> @@ -1037,7 +1037,7 @@ char *qemuMigrationBegin(struct qemud_driver *driver,
>                                              VIR_DOMAIN_XML_INACTIVE)))
>              goto cleanup;
> 
> -        if (!virDomainDefCheckABIStability(def, vm->def))
> +        if (!virDomainDefCheckABIStability(vm->def, def))
>              goto cleanup;
> 
>          rv = qemuDomainDefFormatXML(driver, def,

ACK


Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|