From: Oliver Kurth <okurth@vmware.com>
Date: Sun, 21 Jul 2019 00:15:20 +0000 (-0700)
Subject: Changes to common header files not applicable to open-vm-tools.
X-Git-Tag: stable-11.1.0~303
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba2226dd1e18f3f33dc2138cd6b3392b8bcbc8b8;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_types.h b/open-vm-tools/lib/include/backdoor_types.h
index d506c3146..2e3bde21f 100644
--- a/open-vm-tools/lib/include/backdoor_types.h
+++ b/open-vm-tools/lib/include/backdoor_types.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1999-2016 VMware, Inc. All rights reserved.
+ * Copyright (C) 1999-2016,2019 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
@@ -44,6 +44,17 @@
 #error The backdoor protocol is only supported on x86 architectures.
 #endif
 
+/*
+ * The three different backdoor interfaces: the legacy IN/OUT interface, and the
+ * hypercall interfaces for AMD and Intel.
+ */
+typedef enum {
+   BACKDOOR_INTERFACE_NONE,
+   BACKDOOR_INTERFACE_IO,
+   BACKDOOR_INTERFACE_VMMCALL,
+   BACKDOOR_INTERFACE_VMCALL
+} BackdoorInterface;
+
 /*
  * These #defines are intended for defining register structs as part of
  * existing named unions. If the union should encapsulate the register
diff --git a/open-vm-tools/lib/include/x86cpuid.h b/open-vm-tools/lib/include/x86cpuid.h
index 313e8f35c..88eee563d 100644
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -201,6 +201,7 @@ enum {
 #define CPUID_SGX_FEATURES         0x12
 #define CPUID_PT_FEATURES          0x14
 #define CPUID_HYPERVISOR_LEVEL_0   0x40000000
+#define CPUID_VMW_FEATURES         0x40000010
 #define CPUID_SVM_FEATURES         0x8000000a
 #define CPUID_SEV_INFO             0x8000001f