On Wed, Nov 04, 2009 at 06:53:19PM +0100, Paolo Bonzini wrote:
> Seems like a bad merge conflict.
>
> * src/qemu/qemu_driver.c (qemudDomainMigratePerform): Do call
> doPeer2PeerMigrate for VIR_MIGRATE_PEER2PEER.
> ---
> Note: untested beyond compiling.
>
> src/qemu/qemu_driver.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index 0ed2136..635d787 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -6792,9 +6792,9 @@ qemudDomainMigratePerform (virDomainPtr dom,
> event = NULL;
> }
>
> - if ((flags & VIR_MIGRATE_TUNNELLED)) {
> + if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) {
> if (doPeer2PeerMigrate(dom, vm, uri, flags, dname, resource) < 0)
> - /* doTunnelMigrate already set the error, so just get out */
> + /* doPeer2PeerMigrate already set the error, so just get out */
> goto cleanup;
> } else {
> if (doNativeMigrate(dom, vm, uri, flags, dname, resource) < 0)
ACK
Daniel
--
|: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :|
|: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
--
Libvir-list mailing list
Libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list