Changes in shared code that don't affect open-vm-tools functionality.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/lib/include/vm_device_version.h b/open-vm-tools/lib/include/vm_device_version.h
index ce8cd1c417d4e00851c65a4303ce5142245a7ce8..cceed4fe0bb5f9962b9e13d72229da16f1e8db81 100644 (file)
--- a/open-vm-tools/lib/include/vm_device_version.h
+++ b/open-vm-tools/lib/include/vm_device_version.h
@@ -150,6 +150,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)
+/*
+ * VSCSI_BV_INTS is the number of uint32's needed for a bit vector 
+ * to cover all scsi devices per target.
+ */
+#define VSCSI_BV_INTS            CEILING(PVSCSI_MAX_DEVICES, 8 * sizeof (uint32))
 #define SCSI_IDE_CHANNEL         SCSI_MAX_CONTROLLERS
 #define SCSI_IDE_HOSTED_CHANNEL  (SCSI_MAX_CONTROLLERS + 1)
 #define SCSI_MAX_CHANNELS        (SCSI_MAX_CONTROLLERS + 2)

diff --git a/open-vm-tools/modules/shared/vmxnet/vmnet_def.h b/open-vm-tools/modules/shared/vmxnet/vmnet_def.h
index 300abc4023f3fe717c36d5417736e7313671434d..ce1bfb4e080718348ea34141b6ef837049df9dd8 100644 (file)
--- a/open-vm-tools/modules/shared/vmxnet/vmnet_def.h
+++ b/open-vm-tools/modules/shared/vmxnet/vmnet_def.h
@@ -77,5 +77,6 @@
 #define VMNET_CAP_UPT          0x400000        /* Support UPT */
 #define VMNET_CAP_RDONLY_INETHDRS 0x800000 /* Modifies inet headers for TSO/CSUm */
 #define VMNET_CAP_NPA         0x1000000        /* Support NPA */
+#define VMNET_CAP_DCB         0x2000000        /* Support DCB */
 
 #endif // _VMNET_DEF_H_