Repository: cloudstack Updated Branches: refs/heads/4.4-forward 7959c1faf -> d0552a2ab
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/d0552a2a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d0552a2a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d0552a2a Branch: refs/heads/4.4-forward Commit: d0552a2ab2875c3850cb0f54407c33714160bbf0 Parents: 7959c1f Author: Anthony Xu <anthony...@citrix.com> Authored: Fri Jun 27 14:52:13 2014 -0700 Committer: Anthony Xu <anthony...@citrix.com> Committed: Fri Jun 27 14:52:13 2014 -0700 ---------------------------------------------------------------------- .../src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d0552a2a/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 056858d..4c99a92 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 @@ -3908,7 +3908,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);
