Changeset 28414 in vbox for trunk/src/VBox/Devices/EFI

Timestamp:

Apr 16, 2010 12:54:33 PM (15 years ago)

Author:

vboxsync

Message:

EFI: fix reset once again

File:

• trunk/src/VBox/Devices/EFI/DevEFI.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/DevEFI.cpp

@@ -476 +476 @@
     if (pThis->u8IOAPIC)
         FwCommonPlantMpsFloatPtr(pDevIns);
+    
+    /*
+     * Plant DMI and MPS tables
+     */
+    rc = FwCommonPlantDMITable(pDevIns,
+                               pThis->au8DMIPage,
+                               VBOX_DMI_TABLE_SIZE,
+                               &pThis->aUuid,
+                               pDevIns->pCfg,
+                               true /*fPutSmbiosHeaders*/);
+    AssertRC(rc);
+    if (pThis->u8IOAPIC)
+        FwCommonPlantMpsTable(pDevIns,
+                              pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE,
+                              _4K - VBOX_DMI_TABLE_SIZE,
+                              pThis->cCpus);
+    
 
     /*
@@ -1189 +1206 @@
 
     /*
-     * Plant DMI and MPS tables
-     */
-    rc = FwCommonPlantDMITable(pDevIns,
-                               pThis->au8DMIPage,
-                               VBOX_DMI_TABLE_SIZE,
-                               &pThis->aUuid,
-                               pDevIns->pCfg,
-                               true /*fPutSmbiosHeaders*/);
-    AssertRCReturn(rc, rc);
-    if (pThis->u8IOAPIC)
-        FwCommonPlantMpsTable(pDevIns,
-                              pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE,
-                              _4K - VBOX_DMI_TABLE_SIZE,
-                              pThis->cCpus);
+     * Call reset to set things up.
+     */
+    efiReset(pDevIns);
+
+
     rc = PDMDevHlpROMRegister(pDevIns, VBOX_DMI_TABLE_BASE, _4K, pThis->au8DMIPage,
                               PGMPHYS_ROM_FLAGS_PERMANENT_BINARY, "DMI tables");
@@ -1208 +1216 @@
     AssertRCReturn(rc, rc);
 
-    /*
-     * Call reset to set things up.
-     */
-    efiReset(pDevIns);
+
 
     return VINF_SUCCESS;