Fix HVM VM restart bug in XenServer

syed · syed · commit 966814b07d43 · 2016-12-15T14:12:59.000-05:00
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
@@ -1149,8 +1149,8 @@ public VBD createVbd(final Connection conn, final DiskTO volume, final String vm
             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);

Original file line number	Diff line number	Diff line change
`@@ -1149,8 +1149,8 @@ public VBD createVbd(final Connection conn, final DiskTO volume, final String vm`
`1149`	`1149`	`vbdr.unpluggable = (volume.getType() == Volume.Type.ROOT) ? false : true;`
`1150`	`1150`	`vbdr.userdevice = "autodetect";`
`1151`	`1151`	`final Long deviceId = volume.getDiskSeq();`
`1152`		`- if (deviceId != null && !isDeviceUsed(conn, vm, deviceId)) {`
`1153`		`- vbdr.userdevice = deviceId.toString();`
	`1152`	`+ if (deviceId != null && (!isDeviceUsed(conn, vm, deviceId) \|\| deviceId > 3)) {`
	`1153`	`+ vbdr.userdevice = deviceId.toString();`
`1154`	`1154`	`}`
`1155`	`1155`	`}`
`1156`	`1156`	`final VBD vbd = VBD.create(conn, vbdr);`