On Tue, Aug 25, 2015 at 12:04:14PM +0300, nshirokovskiy@xxxxxxxxxxxxx wrote:
> From: Nikolay Shirokovskiy <nshirokovskiy@xxxxxxxxxxxxx>
>
> This patch makes basic vz migration possible. For example by virsh:
> virsh -c vz:///system migrate --direct $NAME $STUB vz+ssh://$DST/system
>
> $STUB could be anything as it is required virsh argument but it is not
> used in direct migration.
>
> Vz migration is implemented as direct migration. The reason is that vz sdk do
> all the job. Prepare phase function is used to pass session uuid from
> destination to source so we don't introduce new rpc call.
>
> Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@xxxxxxxxxxxxx>
> ---
> src/libvirt-domain.c | 3 +-
> src/vz/vz_driver.c | 193 ++++++++++++++++++++++++++++++++++++++++++++++++++
> src/vz/vz_sdk.c | 33 +++++++++
> src/vz/vz_sdk.h | 2 +
> 4 files changed, 230 insertions(+), 1 deletions(-)
>
> diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
> index cbf08fc..8577edd 100644
> --- a/src/libvirt-domain.c
> +++ b/src/libvirt-domain.c
> @@ -3425,7 +3425,8 @@ virDomainMigrateDirect(virDomainPtr domain,
> NULLSTR(xmlin), flags, NULLSTR(dname), NULLSTR(uri),
> bandwidth);
>
> - if (!domain->conn->driver->domainMigratePerform) {
> + if (!domain->conn->driver->domainMigratePerform &&
> + !domain->conn->driver->domainMigratePerform3) {
> virReportUnsupportedError();
> return -1;
> }
Can you send just this bit of code as a separate patch, as it is a
trivial unrelated fix we can merge now.
Regards,
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 :|
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list