You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2014/01/27 19:04:42 UTC
git commit: updated refs/heads/master to daeea46
Updated Branches:
refs/heads/master a735de8f8 -> daeea46da
CLOUDSTACK-5956 remove persist flag during live migration
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/daeea46d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/daeea46d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/daeea46d
Branch: refs/heads/master
Commit: daeea46da0fb7ba49d8c18334d9427fb9b06d524
Parents: a735de8
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Mon Jan 27 11:04:05 2014 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Mon Jan 27 11:04:05 2014 -0700
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/daeea46d/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
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 70975fa..1ea0989 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
@@ -2927,10 +2927,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
dconn = new Connect("qemu+tcp://" + cmd.getDestinationIp() + "/system");
/*
- * Hard code lm flags: VIR_MIGRATE_LIVE(1<<0) and
- * VIR_MIGRATE_PERSIST_DEST(1<<3)
+ * Hard code lm flag: VIR_MIGRATE_LIVE(1<<0)
*/
- destDomain = dm.migrate(dconn, (1 << 0) | (1 << 3), xmlDesc, vmName, "tcp:" + cmd.getDestinationIp(), _migrateSpeed);
+ destDomain = dm.migrate(dconn, (1 << 0), xmlDesc, vmName, "tcp:" + cmd.getDestinationIp(), _migrateSpeed);
_storagePoolMgr.disconnectPhysicalDisksViaVmSpec(cmd.getVirtualMachine());
} catch (LibvirtException e) {