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:00:04 UTC
git commit: updated refs/heads/master to daa57f6
Repository: cloudstack
Updated Branches:
refs/heads/master a2acae13e -> daa57f67d
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/daa57f67
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/daa57f67
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/daa57f67
Branch: refs/heads/master
Commit: daa57f67d63050202487ca672b230713fc2f0bcc
Parents: a2acae1
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 16:58:08 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/daa57f67/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 d22487a..2afc291 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -3999,7 +3999,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);
}
@@ -4162,7 +4162,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()));
}
}