From: John Wolfe <jwolfe@vmware.com>
Date: Tue, 12 Jul 2022 16:56:01 +0000 (-0700)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-12.1.0~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a816c2e149010bdca27a47006932aa10b686a895;p=thirdparty%2Fopen-vm-tools.git

Common header file change not applicable 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 f37a9e85d..d55141a75 100644
--- a/open-vm-tools/lib/include/vm_device_version.h
+++ b/open-vm-tools/lib/include/vm_device_version.h
@@ -279,29 +279,11 @@
 #define AHCI_MAX_PORTS SATA_MAX_DEVICES
 
 /*
- * Publicly supported maximum number of disks per VM.
- * The officially supported maximum number of disks per VM don't change.
+ * Official limit for supported number of disks is 440 per VM.
+ * VM can have more disks (up to 636 as of now), but such VM is not
+ * supported (main reason being too long downtime during (s)vmotion).
  */
-#define MAX_NUM_DISKS \
-   ((SATA_MAX_CONTROLLERS * SATA_MAX_DEVICES) + \
-    (SCSI_MAX_CONTROLLERS * SCSI_MAX_DEVICES) + \
-    (NVME_MAX_CONTROLLERS * NVME_HW19_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.
- *
- * NVME_MAX_NAMESPACES is 64, so 4 * 64 = 256 NVMe disks.
- */
-#define MAX_NUM_DISKS_HWV14 MAX(MAX_NUM_DISKS, \
-   MAX((SCSI_MAX_CONTROLLERS * PVSCSI_MAX_NUM_DISKS), \
-       (NVME_MAX_CONTROLLERS * NVME_MAX_NAMESPACES)))
+#define MAX_NUM_DISKS_SUPPORTED 440
 
 /*
  * VSCSI_BV_INTS is the number of uint32's needed for a bit vector