From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 19 Feb 2019 20:51:33 +0000 (-0800)
Subject: Changes to common header files not applicable to open-vm-tools.
X-Git-Tag: stable-11.0.0~195
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b88dd52f7d3f70664282f9546230f40dbabc694;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 ab03fd264..17966183a 100644
--- a/open-vm-tools/lib/include/backdoor_def.h
+++ b/open-vm-tools/lib/include/backdoor_def.h
@@ -240,8 +240,8 @@ extern "C" {
 #  define BDOOR_CMD_GMM_WATCH_PPNS_START      4
 #  define BDOOR_CMD_GMM_WATCH_PPNS_STOP       5
 #  define BDOOR_CMD_GMM_RESYNC_RUNTIME_INFO   6
-#define   BDOOR_CMD_HYPERCLOCK               97
-#  define BDOOR_CMD_HYPERCLOCK_GETTIME        0
+#define   BDOOR_CMD_PTPCLOCK                 97
+#  define BDOOR_CMD_PTPCLOCK_GETTIME          0
 #define   BDOOR_CMD_MAX                      98
 
 
diff --git a/open-vm-tools/lib/include/loglevel_user.h b/open-vm-tools/lib/include/loglevel_user.h
index 7ce04e7b5..5c2ea3256 100644
--- a/open-vm-tools/lib/include/loglevel_user.h
+++ b/open-vm-tools/lib/include/loglevel_user.h
@@ -110,7 +110,7 @@
    LOGLEVEL_VAR(qat), \
    LOGLEVEL_VAR(vtpm), \
    LOGLEVEL_VAR(mor), \
-   LOGLEVEL_VAR(hyperclock), \
+   LOGLEVEL_VAR(ptpclock), \
    \
    /* user/disk */ \
    LOGLEVEL_VAR(aioMgr), \
diff --git a/open-vm-tools/lib/include/vm_device_version.h b/open-vm-tools/lib/include/vm_device_version.h
index 192ab0ce6..025fe2524 100644
--- a/open-vm-tools/lib/include/vm_device_version.h
+++ b/open-vm-tools/lib/include/vm_device_version.h
@@ -347,8 +347,8 @@
 /************* QAT implementation limits ********************/
 #define MAX_QAT_PCI_DEVICES 4
 
-/************* HyperClock implementation limits ********************/
-#define MAX_HYPERCLOCK_DEVICES 1
+/************* PTPClock implementation limits ********************/
+#define MAX_PTPCLOCK_DEVICES 1
 
 /************* Strings for Host USB Driver *******************************/