Changeset 56252 in vbox

Timestamp:

Jun 5, 2015 10:54:51 AM (10 years ago)

Author:

vboxsync

Message:

updated pci raw config docs; read config.

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/PGM.cpp (modified) (1 diff)
• include/PGMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/PGM.cpp

@@ -1352 +1352 @@
 
     /*
-     * Check for PCI pass-through.
+     * Check for PCI pass-through and other configurables.
      */
     rc = CFGMR3QueryBoolDef(pCfgPGM, "PciPassThrough", &pVM->pgm.s.fPciPassthrough, false);
     AssertMsgRCReturn(rc, ("Configuration error: Failed to query integer \"PciPassThrough\", rc=%Rrc.\n", rc), rc);
     AssertLogRelReturn(!pVM->pgm.s.fPciPassthrough || pVM->pgm.s.fRamPreAlloc, VERR_INVALID_PARAMETER);
+
+    rc = CFGMR3QueryBoolDef(CFGMR3GetRoot(pVM), "PageFusionAllowed", &pVM->pgm.s.fPageFusionAllowed, false);
+    AssertLogRelRCReturn(rc, rc);
 
 #ifdef VBOX_WITH_STATISTICS

trunk/src/VBox/VMM/include/PGMInternal.h

@@ -3229 +3229 @@
      * (Only used in strict builds.) */
     bool                            fNoMorePhysWrites;
-    /** Set if PCI passthrough is enabled. */
+    /** @cfgm{/PageFusionAllowed, boolean, false}
+     * Whether page fusion is allowed. */
+    bool                            fPageFusionAllowed;
+    /** @cfgm{/PGM/PciPassThrough, boolean, false}
+     * Whether PCI passthrough is enabled. */
     bool                            fPciPassthrough;
     /** The number of MMIO2 regions (serves as the next MMIO2 ID). */
     uint8_t                         cMmio2Regions;
     /** Alignment padding that makes the next member start on a 8 byte boundary. */
-    bool                            afAlignment1[2];
+    bool                            afAlignment1[1];
 
     /** Indicates that PGMR3FinalizeMappings has been called and that further