cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthon...@apache.org
Subject git commit: updated refs/heads/master to 54d7e8d
Date Fri, 27 Jun 2014 22:01:14 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master afd48819a -> 54d7e8dcd


Destroy unplugged VIFs before creating a VIF for a VM, and reuse the device id


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

Branch: refs/heads/master
Commit: 54d7e8dcd3fe8e2297cd1fe019941b042bd74e4b
Parents: afd4881
Author: Anthony Xu <anthony.xu@citrix.com>
Authored: Fri Jun 27 14:52:13 2014 -0700
Committer: Anthony Xu <anthony.xu@citrix.com>
Committed: Fri Jun 27 15:00:49 2014 -0700

----------------------------------------------------------------------
 .../com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54d7e8dc/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index 107b053..b040633 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -3928,7 +3928,6 @@ public abstract class CitrixResourceBase implements ServerResource,
HypervisorRe
                         s_logger.debug("Found unplugged VIF " + deviceId + " in VM " + vmName
+ " destroy it");
                         vif.destroy(conn);
                     }
-                    usedDeviceNums.add(Integer.valueOf(vif.getDevice(conn)));
                 } catch (NumberFormatException e) {
                     String msg = "Obtained an invalid value for an allocated VIF device number
for VM: " + vmName;
                     s_logger.debug(msg, e);


Mime
View raw message