[ros-diffs] [cgutman] 46237: - Add a hack to disable ACPI if VMware is detected - This hack circumvents the main blocker that prevents enabling ACPI in trunk

[cgutman at svn.reactos.org]

Author: cgutman
Date: Wed Mar 17 06:02:06 2010
New Revision: 46237

URL: http://svn.reactos.org/svn/reactos?rev=46237&view=rev
Log:
 - Add a hack to disable ACPI if VMware is detected
 - This hack circumvents the main blocker that prevents enabling ACPI in trunk

Modified:
    trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c

Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c?rev=46237&r1=46236&r2=46237&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c [iso-8859-1] Wed Mar 17 06:02:06 2010
@@ -592,6 +592,7 @@
     UINT32                  Length;
     UINT8                   *TableEntry;
     ACPI_STATUS             Status;
+    ACPI_TABLE_HEADER       LocalHeader;
 
 
     ACPI_FUNCTION_TRACE (TbParseRootTable);
@@ -645,6 +646,14 @@
     }
 
     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 */