Changes to common source 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 afe2392ef519f507dcd0c9dd3210f2dca86f54b5..5cea2349133d6113c37673b2e3ed2bc9c6eecf5b 100644 (file)
--- a/open-vm-tools/lib/include/backdoor_def.h
+++ b/open-vm-tools/lib/include/backdoor_def.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2021 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2022 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -174,9 +174,9 @@ extern "C" {
 #define   BDOOR_CMD_SENDPSHAREHINTS          66 /* Not in use. Deprecated. */
 #define   BDOOR_CMD_ENABLE_USB_MOUSE         67
 #define   BDOOR_CMD_GET_VCPU_INFO            68
-#  define BDOOR_CMD_VCPU_SLC64                0
+//#define BDOOR_CMD_VCPU_SLC64                0 /* BT-is-dead. Deprecated. */
 #  define BDOOR_CMD_VCPU_SYNC_VTSCS           1
-#  define BDOOR_CMD_VCPU_HV_REPLAY_OK         2
+//#define BDOOR_CMD_VCPU_HV_REPLAY_OK         2 /* Replay-is-dead. Deprecated.*/
 #  define BDOOR_CMD_VCPU_LEGACY_X2APIC_OK     3
 #  define BDOOR_CMD_VCPU_MMIO_HONORS_PAT      4
 #  define BDOOR_CMD_VCPU_RESERVED            31

diff --git a/open-vm-tools/lib/include/hostinfo.h b/open-vm-tools/lib/include/hostinfo.h
index a53420c977dc37786d8c06aa274a67432bfda920..4373c22225f328ea393ef7b20edafaa1d615eb36 100644 (file)
--- a/open-vm-tools/lib/include/hostinfo.h
+++ b/open-vm-tools/lib/include/hostinfo.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2021 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2022 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -156,7 +156,6 @@ Bool Hostinfo_Daemonize(const char *path,
 Bool Hostinfo_NestingSupported(void);
 Bool Hostinfo_VCPUInfoBackdoor(unsigned bit);
 Bool Hostinfo_SynchronizedVTSCs(void);
-Bool Hostinfo_NestedHVReplaySupported(void);
 Bool Hostinfo_TouchBackDoor(void);
 Bool Hostinfo_TouchVirtualPC(void);
 Bool Hostinfo_TouchXen(void);

diff --git a/open-vm-tools/lib/misc/hostinfoHV.c b/open-vm-tools/lib/misc/hostinfoHV.c
index f3e67045708df659a678ec61ec82c37332e00ab9..7af7d169e68ace09e0a36f74424c4d8794cfb75b 100644 (file)
--- a/open-vm-tools/lib/misc/hostinfoHV.c
+++ b/open-vm-tools/lib/misc/hostinfoHV.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2011-2021 VMware, Inc. All rights reserved.
+ * Copyright (C) 2011-2022 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -422,37 +422,6 @@ Hostinfo_HyperV(void)
 }
 
 
-/*
- *----------------------------------------------------------------------
- *
- *  Hostinfo_NestedHVReplaySupported --
- *
- *      Access the backdoor with a HV replay control query. This is used
- *      to determine if we are running in a VM that supports nested HV replay.
- *      This function should only be called after determining that the
- *     backdoor is present with Hostinfo_TouchBackdoor().
- *
- * Results:
- *      TRUE if the outer VM supports nexted HV replay.
- *      FALSE otherwise.
- *
- * Side effects:
- *      Exception if not in a VM, so don't do that!
- *
- *----------------------------------------------------------------------
- */
-
-Bool
-Hostinfo_NestedHVReplaySupported(void)
-{
-#if defined(__i386__) || defined(__x86_64__)
-   return Hostinfo_VCPUInfoBackdoor(BDOOR_CMD_VCPU_HV_REPLAY_OK);
-#else
-   return FALSE;
-#endif
-}
-
-
 /*
  *----------------------------------------------------------------------
  *