From: Kruti <kpendharkar@vmware.com>
Date: Fri, 3 May 2024 16:05:44 +0000 (-0700)
Subject: Change to common header file not applicable to open-vm-tools.
X-Git-Tag: stable-12.5.0~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8336d5d8ace540b356813c197794d5f14f2ae38b;p=thirdparty%2Fopen-vm-tools.git

Change to common header file not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/vm_basic_defs.h b/open-vm-tools/lib/include/vm_basic_defs.h
index 73735fff4..cb77b46e8 100644
--- a/open-vm-tools/lib/include/vm_basic_defs.h
+++ b/open-vm-tools/lib/include/vm_basic_defs.h
@@ -605,6 +605,19 @@ typedef int pid_t;
 #define VMK_HAS_VMM_ONLY(...)
 #endif
 
+#if defined VMM || defined VMK_HAS_VMM
+/* Structure field only used to support the VMM (as opposed to the ULM). */
+#define VMM_ONLY_FIELD(name) name
+#else
+/*
+ * Structure field only used to support the VMM (as opposed to the ULM).
+ * Until VMK_HAS_VMM is retired, keep this field so the size of the structure
+ * is unchanged (was bug 3354277), but prepend an underscore to the field's
+ * name to verify at compile time that the field is indeed not used.
+ */
+#define VMM_ONLY_FIELD(name) _##name
+#endif
+
 #undef ARM64_ONLY
 #ifdef VM_ARM_64
 #define ARM64_ONLY(...)  __VA_ARGS__