From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 5 Jun 2018 22:47:40 +0000 (-0700)
Subject: Changes to common header files; not applicable to open-vm-tools.
X-Git-Tag: stable-11.0.0~543
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac8f3f74ca37cd5b2e006120a54926f801309537;p=thirdparty%2Fopen-vm-tools.git

Changes to common header files; not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/backdoor_def.h b/open-vm-tools/lib/include/backdoor_def.h
index f99c415bb..cad4f4962 100644
--- a/open-vm-tools/lib/include/backdoor_def.h
+++ b/open-vm-tools/lib/include/backdoor_def.h
@@ -168,6 +168,7 @@ extern "C" {
 #  define BDOOR_CMD_FE_EXCEPTION              1
 #  define BDOOR_CMD_FE_SGX                    2
 #  define BDOOR_CMD_FE_PCI_MMIO               3
+#  define BDOOR_CMD_FE_GMM                    4
 #define   BDOOR_CMD_VMK_INFO                 72
 #define   BDOOR_CMD_EFI_BOOT_CONFIG          73 /* CPL 0 only. */
 #  define BDOOR_CMD_EBC_LEGACYBOOT_ENABLED        0
@@ -232,7 +233,11 @@ extern "C" {
 #  define BDOOR_CMD_FUZZER_INIT               0
 #  define BDOOR_CMD_FUZZER_NEXT               1
 #define   BDOOR_CMD_PUTCHR12                 95
-#define   BDOOR_CMD_MAX                      96
+#define   BDOOR_CMD_GMM                      96
+#  define  BDOOR_CMD_GMM_GET_SIZE             0
+#  define BDOOR_CMD_GMM_MAP_MEMORY            1
+#  define BDOOR_CMD_GMM_GET_PPN_AND_SZ        2 /* Devel only. */
+#define   BDOOR_CMD_MAX                      97
 
 
 /*
diff --git a/open-vm-tools/lib/include/loglevel_user.h b/open-vm-tools/lib/include/loglevel_user.h
index 5a64fd9c3..07f6a5785 100644
--- a/open-vm-tools/lib/include/loglevel_user.h
+++ b/open-vm-tools/lib/include/loglevel_user.h
@@ -59,6 +59,7 @@
    LOGLEVEL_VAR(chipset), \
    LOGLEVEL_VAR(smram), \
    LOGLEVEL_VAR(txt), \
+   LOGLEVEL_VAR(gmm), \
    LOGLEVEL_VAR(sgx), \
    LOGLEVEL_VAR(smc), \
    LOGLEVEL_VAR(ich7m), \