You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by de...@apache.org on 2013/06/29 02:12:10 UTC

git commit: updated refs/heads/master-6-17-stable to 9e4b4a7

Updated Branches:
  refs/heads/master-6-17-stable e8b2d74a0 -> 9e4b4a707


CLOUDSTACK-3082: System VMs are failed to start with Xen 6.2.0( Failing to create VIF's)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9e4b4a70
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9e4b4a70
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9e4b4a70

Branch: refs/heads/master-6-17-stable
Commit: 9e4b4a707f433d30c4513926cbdbb352d527ed55
Parents: e8b2d74
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Wed Jun 26 12:34:31 2013 +0530
Committer: Devdeep Singh <de...@gmail.com>
Committed: Sat Jun 29 05:44:48 2013 +0530

----------------------------------------------------------------------
 .../src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9e4b4a70/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 2397d70..11e75ab 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -885,6 +885,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
             vifr.MAC = "FE:FF:FF:FF:FF:FF";
             vifr.network = nw;
 
+            vifr.lockingMode = Types.VifLockingMode.NETWORK_DEFAULT;
             dom0vif = VIF.create(conn, vifr);
         }
         // At this stage we surely have a VIF
@@ -1089,6 +1090,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
             vifr.qosAlgorithmParams.put("kbps", Integer.toString(nic.getNetworkRateMbps() * 128));
         }
 
+        vifr.lockingMode = Types.VifLockingMode.NETWORK_DEFAULT;
         VIF vif = VIF.create(conn, vifr);
         if (s_logger.isDebugEnabled()) {
             vifr = vif.getRecord(conn);
@@ -4930,6 +4932,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
                 vifr.otherConfig = config;
                 vifr.MAC = "FE:FF:FF:FF:FF:FF";
                 vifr.network = linkLocal;
+                vifr.lockingMode = Types.VifLockingMode.NETWORK_DEFAULT;
                 dom0vif = VIF.create(conn, vifr);
                 dom0vif.plug(conn);
             } else {