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

diff --git a/open-vm-tools/lib/include/loglevel_userVars.h b/open-vm-tools/lib/include/loglevel_userVars.h
index 679450f67be757e8d530579ef4bde2abbf7b747e..ca1aac8472933d5a5fe71430169e290d6ab2c51b 100644 (file)
--- a/open-vm-tools/lib/include/loglevel_userVars.h
+++ b/open-vm-tools/lib/include/loglevel_userVars.h
@@ -287,6 +287,7 @@
    LOGLEVEL_VAR(vdpPlugin), \
    LOGLEVEL_VAR(vdtiPciCfgSpc), \
    LOGLEVEL_VAR(vflash), \
+   LOGLEVEL_VAR(vg), \
    LOGLEVEL_VAR(vga), \
    LOGLEVEL_VAR(vide), \
    LOGLEVEL_VAR(viewClient), \

diff --git a/open-vm-tools/lib/include/vm_device_version.h b/open-vm-tools/lib/include/vm_device_version.h
index 5c08b39b5e0046a9fe4011b8be2bdbcefb3dc415..990448a5c7073baa5fdd1e3fe272afb929aa3438 100644 (file)
--- a/open-vm-tools/lib/include/vm_device_version.h
+++ b/open-vm-tools/lib/include/vm_device_version.h
@@ -56,6 +56,7 @@
  */
 #define PCI_VENDOR_ID_VMWARE                    0x15AD
 #define PCI_DEVICE_ID_VMWARE_SBX                0x0420
+#define PCI_DEVICE_ID_VMWARE_SVGA4              0x0408
 #define PCI_DEVICE_ID_VMWARE_SVGA_EFI           0x0407
 #define PCI_DEVICE_ID_VMWARE_SVGA3              0x0406
 #define PCI_DEVICE_ID_VMWARE_SVGA2              0x0405
@@ -266,8 +267,8 @@
 /************* SCSI implementation limits ********************************/
 #define SCSI_MAX_CONTROLLERS    4        // Need more than 1 for MSCS clustering
 #define        SCSI_MAX_DEVICES         16       // BT-958 emulates only 16
-#define PVSCSI_HWV14_MAX_DEVICES 65      /* HWv14 And Later Supports 64 
-                                          * + controller at ID 7 
+#define PVSCSI_HWV14_MAX_DEVICES 65      /* HWv14 And Later Supports 64
+                                          * + controller at ID 7
                                           */
 #define PVSCSI_MAX_DEVICES       255     // 255 (including the controller)
 #define PVSCSI_MAX_NUM_DISKS     (PVSCSI_HWV14_MAX_DEVICES - 1)
@@ -366,13 +367,13 @@
  * Globally unique ID for the VMware device interface. Define INITGUID before including
  * this header file to instantiate the variable.
  */
-DEFINE_GUID(GUID_DEVICE_INTERFACE_VMWARE_USB_DEVICES, 
+DEFINE_GUID(GUID_DEVICE_INTERFACE_VMWARE_USB_DEVICES,
 0x2da1fe75, 0xaab3, 0x4d2c, 0xac, 0xdf, 0x39, 0x8, 0x8c, 0xad, 0xa6, 0x65);
 
 /*
  * Globally unique ID for the VMware device setup class.
  */
-DEFINE_GUID(GUID_CLASS_VMWARE_USB_DEVICES, 
+DEFINE_GUID(GUID_CLASS_VMWARE_USB_DEVICES,
 0x3b3e62a5, 0x3556, 0x4d7e, 0xad, 0xad, 0xf5, 0xfa, 0x3a, 0x71, 0x2b, 0x56);
 
 /*