As of vSphere 6.7 there can be up to 64 units on a SCSI bus. Honestly, I'm not a big fan of 5/7 but we want to support three different values and one of them doesn't depend on the driver that's assigning the disk address, but at a runtime information. Thus using xmlopt is not good enough. Any clever idea is very welcome. Michal Prívozník (7): vmx: Fill virtualHW.version to ESX version mapping vmx2xmltest: Add a test case vmx: Rework disk def allocation vmx: Drop needless check in virVMXParseDisk() conf: Store SCSI bus length in virDomainDef vmx: Support super wide SCSI bus DO NOT MERGE src/bhyve/bhyve_parse_command.c | 2 +- src/conf/domain_conf.c | 33 +++--- src/conf/domain_conf.h | 10 +- src/hyperv/hyperv_driver.c | 4 +- src/libxl/libxl_driver.c | 2 +- src/libxl/xen_xl.c | 2 +- src/libxl/xen_xm.c | 2 +- src/lxc/lxc_native.c | 2 +- src/openvz/openvz_conf.c | 2 +- src/qemu/qemu_process.c | 2 +- src/vbox/vbox_common.c | 8 +- src/vmx/vmx.c | 108 +++++++++--------- src/vz/vz_sdk.c | 2 +- tests/genericxml2xmltest.c | 2 +- tests/openvzutilstest.c | 2 +- tests/qemublocktest.c | 2 +- tests/qemumonitortestutils.c | 2 +- tests/securityselinuxtest.c | 2 +- .../vmx2xml-esx-in-the-wild-11.vmx | 97 ++++++++++++++++ .../vmx2xml-esx-in-the-wild-11.xml | 43 +++++++ tests/vmx2xmltest.c | 1 + 21 files changed, 239 insertions(+), 91 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-esx-in-the-wild-11.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-esx-in-the-wild-11.xml -- 2.31.1
