- Add a hack to disable ACPI if VMware is detected

 - This hack circumvents the main blocker that prevents enabling ACPI in trunk

svn path=/trunk/; revision=46237

diff --git a/reactos/drivers/bus/acpi/acpica/tables/tbutils.c b/reactos/drivers/bus/acpi/acpica/tables/tbutils.c
index ec2a88e..a0f2758 100644 (file)
--- a/reactos/drivers/bus/acpi/acpica/tables/tbutils.c
+++ b/reactos/drivers/bus/acpi/acpica/tables/tbutils.c
@@ -592,6 +592,7 @@ AcpiTbParseRootTable (
     UINT32                  Length;
     UINT8                   *TableEntry;
     ACPI_STATUS             Status;
+    ACPI_TABLE_HEADER       LocalHeader;
 
 
     ACPI_FUNCTION_TRACE (TbParseRootTable);
@@ -646,6 +647,14 @@ AcpiTbParseRootTable (
 
     AcpiTbPrintTableHeader (Address, Table);
 
+    AcpiTbCleanupTableHeader (&LocalHeader, Table);
+    if (strstr(LocalHeader.AslCompilerId, "VMW"))
+    {
+        ACPI_ERROR ((AE_INFO, "VMware detected; ACPI has been disabled\n"));
+        AcpiOsUnmapMemory (Table, sizeof (ACPI_TABLE_HEADER));
+        return_ACPI_STATUS (AE_ERROR);
+    }
+
     /* Get the length of the full table, verify length and map entire table */
 
     Length = Table->Length;