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/09/16 11:11:28 UTC
[30/50] [abbrv] git commit: updated refs/heads/kvm-vnc-listen to
895c51d
CLOUDSTACK-4649
use the same virtual hardware platform in XS 6.2 as that in XS 6.0.2
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1510139f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1510139f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1510139f
Branch: refs/heads/kvm-vnc-listen
Commit: 1510139f15c6c303310fccea9d28b56682b2b7b0
Parents: 60e0873
Author: Anthony Xu <an...@citrix.com>
Authored: Wed Sep 11 17:16:25 2013 -0700
Committer: Anthony Xu <an...@citrix.com>
Committed: Thu Sep 12 13:00:42 2013 -0700
----------------------------------------------------------------------
.../com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1510139f/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java
index 214dbd4..b22910a 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java
@@ -160,6 +160,7 @@ public class XenServer56FP1Resource extends XenServer56Resource {
VM template = templates.iterator().next();
VM.Record vmr = template.getRecord(conn);
+ vmr.platform.remove("device_id");
vmr.affinity = host;
vmr.otherConfig.remove("disks");
vmr.otherConfig.remove("default_template");