cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [01/10] git commit: updated refs/heads/master to fa85151
Date Tue, 28 Feb 2017 00:20:41 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master f9ef6ca66 -> fa85151be


Fix HVM VM restart bug in XenServer


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

Branch: refs/heads/master
Commit: 966814b07d438c3d9eac415c54c1b4bdbf1911f9
Parents: 7da95172
Author: Syed <syed1.mushtaq@gmail.com>
Authored: Thu Dec 15 14:12:59 2016 -0500
Committer: Syed <syed1.mushtaq@gmail.com>
Committed: Thu Dec 15 14:12:59 2016 -0500

----------------------------------------------------------------------
 .../cloud/hypervisor/xenserver/resource/CitrixResourceBase.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/966814b0/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 2865e56..5746536 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
@@ -1149,8 +1149,8 @@ public abstract class CitrixResourceBase implements ServerResource,
HypervisorRe
             vbdr.unpluggable = (volume.getType() == Volume.Type.ROOT) ? false : true;
             vbdr.userdevice = "autodetect";
             final Long deviceId = volume.getDiskSeq();
-            if (deviceId != null && !isDeviceUsed(conn, vm, deviceId)) {
-                vbdr.userdevice = deviceId.toString();
+            if (deviceId != null && (!isDeviceUsed(conn, vm, deviceId) || deviceId
> 3)) {
+                    vbdr.userdevice = deviceId.toString();
             }
         }
         final VBD vbd = VBD.create(conn, vbdr);


Mime
View raw message