3 files changed, 7 insertions, 56 deletions
diff --git a/src/VBox/VMM/include/internal/em.h b/src/VBox/VMM/include/internal/em.h
deleted file mode 100644
index 2d63f0b0..00000000
--- a/src/VBox/VMM/include/internal/em.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $Id: em.h $ */
-/** @file
- * EM - Internal VMM header file.
- */
-
-/*
- * Copyright (C) 2006-2010 Oracle Corporation
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- */
-
-#ifndef ___EM_include_internal_h
-#define ___EM_include_internal_h
-
-#include <VBox/vmm/em.h>
-
-VMMR3DECL(int)  EMR3NotifyResume(PVM pVM);
-VMMR3DECL(int)  EMR3NotifySuspend(PVM pVM);
-
-VMMR3DECL(bool) EMR3IsExecutionAllowed(PVM pVM, PVMCPU pVCpu);
-
-#endif
diff --git a/src/VBox/VMM/include/internal/pgm.h b/src/VBox/VMM/include/internal/pgm.h
index 207050e4..55cb4945 100644
--- a/src/VBox/VMM/include/internal/pgm.h
+++ b/src/VBox/VMM/include/internal/pgm.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -45,6 +45,11 @@ typedef enum PGMPAGETYPE
     /** MMIO2 page aliased over an MMIO page. (RWX)
      * See PGMHandlerPhysicalPageAlias(). */
     PGMPAGETYPE_MMIO2_ALIAS_MMIO,
+    /** Special page aliased over an MMIO page. (RWX)
+     * See PGMHandlerPhysicalPageAliasHC(), but this is generally only used for
+     * VT-x's APIC access page at the moment.  Treated as MMIO by everyone except
+     * the shadow paging code. */
+    PGMPAGETYPE_SPECIAL_ALIAS_MMIO,
     /** Shadowed ROM. (RWX) */
     PGMPAGETYPE_ROM_SHADOW,
     /** ROM page. (R-X) */
@@ -54,7 +59,7 @@ typedef enum PGMPAGETYPE
     /** End of valid entries. */
     PGMPAGETYPE_END
 } PGMPAGETYPE;
-AssertCompile(PGMPAGETYPE_END <= 7);
+AssertCompile(PGMPAGETYPE_END == 8);
 
 VMMDECL(PGMPAGETYPE) PGMPhysGetPageType(PVM pVM, RTGCPHYS GCPhys);
 
diff --git a/src/VBox/VMM/include/internal/vm.h b/src/VBox/VMM/include/internal/vm.h
deleted file mode 100644
index a3bc6ce6..00000000
--- a/src/VBox/VMM/include/internal/vm.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* $Id: vm.h $ */
-/** @file
- * VM - Internal VMM header file.
- */
-
-/*
- * Copyright (C) 2006-2010 Oracle Corporation
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- */
-
-#ifndef ___VM_include_internal_h
-#define ___VM_include_internal_h
-
-#include <VBox/vmm/vm.h>
-
-VMMR3DECL(int) VMR3SaveFT(PVM pVM, PCSSMSTRMOPS pStreamOps, void *pvStreamOpsUser, bool *pfSuspended, bool fSkipStateChanges);
-VMMR3DECL(int) VMR3LoadFromStreamFT(PVM pVM, PCSSMSTRMOPS pStreamOps, void *pvStreamOpsUser);
-
-#endif