You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2014/11/27 17:02:08 UTC
git commit: updated refs/heads/4.5 to 9928d66
Repository: cloudstack
Updated Branches:
refs/heads/4.5 807bfb03e -> 9928d66fd
CLOUDSTACK-6893: fix enum ValueOf issue which causes systemvm fail to start
(cherry picked from commit 63ff5a7cbc3341809884e47796476d47ace03961)
(cherry picked from commit d0e0edca111feb71e7cd8267d9c28820d85b12f9)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9928d66f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9928d66f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9928d66f
Branch: refs/heads/4.5
Commit: 9928d66fdaf71b43412e20b129975c42e0552d6f
Parents: 807bfb0
Author: Wei Zhou <w....@leaseweb.com>
Authored: Wed Jun 11 13:46:12 2014 +0200
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Thu Nov 27 17:01:17 2014 +0100
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9928d66f/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 b95d53b..576abe6 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
@@ -3996,7 +3996,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
if ((volumeObjectTO.getIopsWriteRate() != null) && (volumeObjectTO.getIopsWriteRate() > 0))
disk.setIopsWriteRate(volumeObjectTO.getIopsWriteRate());
if (volumeObjectTO.getCacheMode() != null)
- disk.setCacheMode(DiskDef.diskCacheMode.valueOf(volumeObjectTO.getCacheMode().toString()));
+ disk.setCacheMode(DiskDef.diskCacheMode.valueOf(volumeObjectTO.getCacheMode().toString().toUpperCase()));
}
vm.getDevices().addDevice(disk);
}
@@ -4159,7 +4159,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
diskdef.setIopsWriteRate(iopsWriteRate);
if (cacheMode != null) {
- diskdef.setCacheMode(DiskDef.diskCacheMode.valueOf(cacheMode));
+ diskdef.setCacheMode(DiskDef.diskCacheMode.valueOf(cacheMode.toUpperCase()));
}
}