From e52a4d93067fde04ac7413463cc962ba1998885e Mon Sep 17 00:00:00 2001 From: Edison Su Date: Fri, 20 Dec 2013 12:36:30 -0800 Subject: [PATCH] CLOUDSTACK-5572: quicevm won't save memory, as it needs pv driver installed Conflicts: engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java --- .../apache/cloudstack/storage/helper/HypervisorHelperImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java b/engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java index 3836c2c3d49..b41c1fa14ac 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java @@ -111,7 +111,8 @@ public class HypervisorHelperImpl implements HypervisorHelper { String value = configurationDao.getValue("vmsnapshot.create.wait"); int wait = NumbersUtil.parseInt(value, 1800); Long hostId = vmSnapshotHelper.pickRunningHost(virtualMachine.getId()); - VMSnapshotTO vmSnapshotTO = new VMSnapshotTO(1L, UUID.randomUUID().toString(), VMSnapshot.Type.DiskAndMemory, null, null, false, null, true); + VMSnapshotTO vmSnapshotTO = new VMSnapshotTO(1L, UUID.randomUUID().toString(), VMSnapshot.Type.Disk, null, null, false, + null, true); GuestOSVO guestOS = guestOSDao.findById(virtualMachine.getGuestOSId()); List volumeTOs = vmSnapshotHelper.getVolumeTOList(virtualMachine.getId()); CreateVMSnapshotCommand ccmd =