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

Timestamp:

Jan 31, 2010 7:21:34 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

57098

Message:

EFI: functional reset

File:

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

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

@@ -109 +109 @@
 
     /* Boot parameters passed to the firmware */
-    char           pszBootArgs[256];
+    char            pszBootArgs[256];
+
+    /* Host UUID (for DMI) */
+    RTUUID          aUuid;
 } DEVEFI;
 typedef DEVEFI *PDEVEFI;
@@ -406 +409 @@
 {
     PDEVEFI  pThis = PDMINS_2_DATA(pDevIns, PDEVEFI);
+    int rc;
 
     LogFlow(("efiReset\n"));
@@ -417 +421 @@
     pThis->szPanicMsg[0] = '\0';
 
+    /* Plant DMI and MPS tables */
+    rc = FwCommonPlantDMITable(pDevIns,
+                               pThis->au8DMIPage,
+                               VBOX_DMI_TABLE_SIZE,
+                               &pThis->aUuid,
+                               pDevIns->pCfgHandle,
+                               true /* fPutSmbiosHeaders */);
+    Assert(RT_SUCCESS(rc));
+
+    FwCommonPlantMpsTable(pDevIns,
+                          pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE,
+                          pThis->cCpus);    
+
     /*
      * Re-shadow the Firmware Volume and make it RAM/RAM.
@@ -425 +442 @@
     {
         uint8_t abPage[PAGE_SIZE];
-        int     rc;
 
         /* Read the (original) ROM page and write it back to the RAM page. */
@@ -926 +942 @@
     uuid.Gen.u16TimeMid = RT_H2BE_U16(uuid.Gen.u16TimeMid);
     uuid.Gen.u16TimeHiAndVersion = RT_H2BE_U16(uuid.Gen.u16TimeHiAndVersion);
-    rc = FwCommonPlantDMITable(pDevIns, pThis->au8DMIPage, VBOX_DMI_TABLE_SIZE, &uuid, pCfgHandle, true /* fPutSmbiosHeaders */);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    FwCommonPlantMpsTable(pDevIns, pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE, pThis->cCpus);
-
-    rc = PDMDevHlpROMRegister(pDevIns, VBOX_DMI_TABLE_BASE, _4K, pThis->au8DMIPage,
-                              PGMPHYS_ROM_FLAGS_PERMANENT_BINARY, "DMI tables");
-    if (RT_FAILURE(rc))
-        return rc;
+    memcpy(&pThis->aUuid, &uuid, sizeof pThis->aUuid);
+
 
     /* RAM sizes */
@@ -1012 +1020 @@
                                  efiIOPortWrite, efiIOPortRead,
                                  NULL, NULL, "EFI communication ports");
+    if (RT_FAILURE(rc))
+        return rc;
+
+    rc = PDMDevHlpROMRegister(pDevIns, VBOX_DMI_TABLE_BASE, _4K,
+                              pThis->au8DMIPage,
+                              PGMPHYS_ROM_FLAGS_PERMANENT_BINARY,
+                              "DMI tables");
     if (RT_FAILURE(rc))
         return rc;