From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:48 +0000 (-0700)
Subject: Change to shared header file unrelated to open-vm-tools.
X-Git-Tag: stable-10.2.0~124
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24a6ab223b139fdc191b913d8d551ed61ca07e01;p=thirdparty%2Fopen-vm-tools.git

Change to shared header file unrelated to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/vm_device_version.h b/open-vm-tools/lib/include/vm_device_version.h
index 3df374f89..508f572da 100644
--- a/open-vm-tools/lib/include/vm_device_version.h
+++ b/open-vm-tools/lib/include/vm_device_version.h
@@ -237,8 +237,12 @@
 
 /************* SCSI implementation limits ********************************/
 #define SCSI_MAX_CONTROLLERS	 4	  // Need more than 1 for MSCS clustering
-#define	SCSI_MAX_DEVICES	 16	  // BT-958 emulates only 16
-#define PVSCSI_MAX_DEVICES       255      // 255 (including the controller)
+#define	SCSI_MAX_DEVICES         16	  // BT-958 emulates only 16
+#define PVSCSI_HWV14_MAX_DEVICES 65	  /* HWv14 And Later Supports 64 
+					   * + controller at ID 7 
+					   */
+#define PVSCSI_MAX_DEVICES       255	  // 255 (including the controller)
+#define PVSCSI_MAX_NUM_DISKS     (PVSCSI_HWV14_MAX_DEVICES - 1)
 
 /************* SATA implementation limits ********************************/
 #define SATA_MAX_CONTROLLERS   4
@@ -247,10 +251,7 @@
 #define AHCI_MAX_PORTS SATA_MAX_DEVICES
 
 /*
- * Maximum number of supported disk in a VM.
- *
- * Note: With some config options for PVSCSI, maximum number of disks could
- * be ~1K but that number is not publicly supported yet.
+ * Publicly supported maximum number of disks per VM.
  */
 #define MAX_NUM_DISKS \
    ((SATA_MAX_CONTROLLERS * SATA_MAX_DEVICES) + \
@@ -258,6 +259,19 @@
     (NVME_MAX_CONTROLLERS * NVME_MAX_NAMESPACES) + \
     (IDE_NUM_INTERFACES * IDE_DRIVES_PER_IF))
 
+/*
+ * Maximum number of supported disks in a VM from HWV14 or later, using PVSCSI updated max
+ * devices.  The note above still holds true, but instead of publicly supporting
+ * all devices, HWv14 simply extends the maximum support to 256 devices,
+ * instead ~244 calculated above.
+ *
+ * PVSCSI_HW_MAX_DEVICES is 65 - allowing 64 disks + controller (at ID 7)
+ * 4 * 64 = 256 devices.
+ *
+ */
+#define MAX_NUM_DISKS_HWV14 MAX(MAX_NUM_DISKS, \
+   (SCSI_MAX_CONTROLLERS * PVSCSI_MAX_NUM_DISKS))
+
 /*
  * VSCSI_BV_INTS is the number of uint32's needed for a bit vector
  * to cover all scsi devices per target.