You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2013/12/09 16:49:35 UTC
git commit: updated refs/heads/master to 088247b
Updated Branches:
refs/heads/master f194adb2d -> 088247b61
kvm: Force the default disk cache mode to none.
Not doing this caused the cache mode to be null for SystemVMs for their CDROM/ISO.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/088247b6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/088247b6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/088247b6
Branch: refs/heads/master
Commit: 088247b61b4ecea7bb757becd233e10c97a7a75a
Parents: f194adb
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Mon Dec 9 16:48:05 2013 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Mon Dec 9 16:49:17 2013 +0100
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/088247b6/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
index 49cf1b2..9910877 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
@@ -461,6 +461,7 @@ public class LibvirtVMDef {
public void defFileBasedDisk(String filePath, String diskLabel, diskBus bus, diskFmtType diskFmtType) {
_diskType = diskType.FILE;
_deviceType = deviceType.DISK;
+ _diskCacheMode = diskCacheMode.NONE;
_sourcePath = filePath;
_diskLabel = diskLabel;
_diskFmtType = diskFmtType;
@@ -488,6 +489,7 @@ public class LibvirtVMDef {
_diskType = diskType.FILE;
_deviceType = deviceType.DISK;
+ _diskCacheMode = diskCacheMode.NONE;
_sourcePath = filePath;
_diskLabel = getDevLabel(devId, bus);
_diskFmtType = diskFmtType;
@@ -501,6 +503,7 @@ public class LibvirtVMDef {
_sourcePath = volPath;
_diskLabel = "hdc";
_diskFmtType = diskFmtType.RAW;
+ _diskCacheMode = diskCacheMode.NONE;
_bus = diskBus.IDE;
}
@@ -508,6 +511,7 @@ public class LibvirtVMDef {
_diskType = diskType.BLOCK;
_deviceType = deviceType.DISK;
_diskFmtType = diskFmtType.RAW;
+ _diskCacheMode = diskCacheMode.NONE;
_sourcePath = diskName;
_diskLabel = getDevLabel(devId, bus);
_bus = bus;
@@ -517,6 +521,7 @@ public class LibvirtVMDef {
_diskType = diskType.BLOCK;
_deviceType = deviceType.DISK;
_diskFmtType = diskFmtType.RAW;
+ _diskCacheMode = diskCacheMode.NONE;
_sourcePath = diskName;
_diskLabel = diskLabel;
_bus = bus;
@@ -527,6 +532,7 @@ public class LibvirtVMDef {
_diskType = diskType.NETWORK;
_deviceType = deviceType.DISK;
_diskFmtType = diskFmtType.RAW;
+ _diskCacheMode = diskCacheMode.NONE;
_sourcePath = diskName;
_sourceHost = sourceHost;
_sourcePort = sourcePort;
@@ -542,6 +548,7 @@ public class LibvirtVMDef {
_diskType = diskType.NETWORK;
_deviceType = deviceType.DISK;
_diskFmtType = diskFmtType.RAW;
+ _diskCacheMode = diskCacheMode.NONE;
_sourcePath = diskName;
_sourceHost = sourceHost;
_sourcePort = sourcePort;