From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:23 +0000 (-0700)
Subject: Change to shared header file unrelated to open-vm-tools.
X-Git-Tag: stable-10.2.0~358
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1f94428ec7fd468b7f316bd5a09bd839428bf2d;p=thirdparty%2Fopen-vm-tools.git

Change to shared header file unrelated to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/loglevel_user.h b/open-vm-tools/lib/include/loglevel_user.h
index dd98d7592..624a2c878 100644
--- a/open-vm-tools/lib/include/loglevel_user.h
+++ b/open-vm-tools/lib/include/loglevel_user.h
@@ -106,6 +106,7 @@
    LOGLEVEL_VAR(vrdma), \
    LOGLEVEL_VAR(nvdimm), \
    LOGLEVEL_VAR(qat), \
+   LOGLEVEL_VAR(vtpm), \
    \
    /* user/disk */ \
    LOGLEVEL_VAR(aioMgr), \
@@ -309,7 +310,8 @@
    LOGLEVEL_VAR(toolsversion), \
    LOGLEVEL_VAR(vmva), \
    LOGLEVEL_VAR(udpfec),    /* lib/udpfec */ \
-   LOGLEVEL_VAR(maclatency)
+   LOGLEVEL_VAR(maclatency), \
+   LOGLEVEL_VAR(tpm2emu)
 
    /* end of list */
 
diff --git a/open-vm-tools/lib/include/vm_device_version.h b/open-vm-tools/lib/include/vm_device_version.h
index 8f3782f24..5de5c0b56 100644
--- a/open-vm-tools/lib/include/vm_device_version.h
+++ b/open-vm-tools/lib/include/vm_device_version.h
@@ -92,6 +92,7 @@
 #define PCI_DEVICE_ID_VMWARE_DUMMY      0x0809
 
 #define PCI_DEVICE_ID_VMWARE_VRDMA      0x0820
+#define PCI_DEVICE_ID_VMWARE_VTPM       0x0830
 
 /*
  * VMware Virtual Device Test Infrastructure (VDTI) devices