From f5b51970488df6204508f7d2e6e8e7b03e865711 Mon Sep 17 00:00:00 2001 From: Mike Tutkowski Date: Tue, 1 Sep 2015 16:00:08 -0600 Subject: [PATCH] Support live migration on older version of Libvirt --- .../hypervisor/kvm/resource/LibvirtComputingResource.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index ae48783ee6f..01237980b25 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -3096,8 +3096,12 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv VIR_DOMAIN_XML_MIGRATABLE flag (value = 8) https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainXMLFlags + Use VIR_DOMAIN_XML_SECURE (value = 1) prior to v1.0.0. + */ - xmlDesc = dm.getXMLDesc(8).replace(_privateIp, cmd.getDestinationIp()); + int xmlFlag = conn.getLibVirVersion() >= 1000000 ? 8 : 1; // 1000000 equals v1.0.0 + + xmlDesc = dm.getXMLDesc(xmlFlag).replace(_privateIp, cmd.getDestinationIp()); dconn = new Connect("qemu+tcp://" + cmd.getDestinationIp() + "/system");