Changeset 43131 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Aug 31, 2012 11:34:49 AM (13 years ago)

Author:

vboxsync

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

80500

Message:

EFI: permanent NVRAM storage.

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (4 diffs)
• ConsoleImpl2.cpp (modified) (1 diff)
• VBoxDriversRegister.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -57 +57 @@
 #include "SharedFolderImpl.h"
 #include "AudioSnifferInterface.h"
+#include "Nvram.h"
 #ifdef VBOX_WITH_USB_VIDEO
 # include "UsbWebcamInterface.h"
@@ -377 +378 @@
     , m_pVMMDev(NULL)
     , mAudioSniffer(NULL)
+    , mNvram(NULL)
 #ifdef VBOX_WITH_USB_VIDEO
     , mUsbWebcamInterface(NULL)
@@ -535 +537 @@
         unconst(mAudioSniffer) = new AudioSniffer(this);
         AssertReturn(mAudioSniffer, E_FAIL);
+
+        FirmwareType_T enmFirmwareType;
+        mMachine->COMGETTER(FirmwareType)(&enmFirmwareType);
+        if (   enmFirmwareType == FirmwareType_EFI
+            || enmFirmwareType == FirmwareType_EFI32
+            || enmFirmwareType == FirmwareType_EFI64
+            || enmFirmwareType == FirmwareType_EFIDUAL)
+        {
+            unconst(mNvram) = new Nvram(this);
+            AssertReturn(mNvram, E_FAIL);
+        }
+
 #ifdef VBOX_WITH_USB_VIDEO
         unconst(mUsbWebcamInterface) = new UsbWebcamInterface(this);
@@ -628 +642 @@
         RTMemFree((void *)mpVmm2UserMethods);
         mpVmm2UserMethods = NULL;
+    }
+
+    if (mNvram)
+    {
+        delete mNvram;
+        unconst(mNvram) = NULL;
     }
 

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -1513 +1513 @@
                 InsertConfigInteger(pCfg, "DmiExposeMemoryTable", 1);
             }
+            PCFGMNODE pDrv;
+            InsertConfigNode(pInst,    "LUN#0", &pLunL0);
+            InsertConfigString(pLunL0, "Driver", "NvramStorage");
+            InsertConfigNode(pLunL0,   "Config", &pCfg);
+            InsertConfigInteger(pCfg,  "Object", (uint64_t)mNvram);
         }
 

trunk/src/VBox/Main/src-client/VBoxDriversRegister.cpp

@@ -25 +25 @@
 #include "VMMDev.h"
 #include "AudioSnifferInterface.h"
+#include "Nvram.h"
 #ifdef VBOX_WITH_USB_VIDEO
 # include "UsbWebcamInterface.h"
@@ -73 +74 @@
         return rc;
 
+    rc = pCallbacks->pfnRegister(pCallbacks, &Nvram::DrvReg);
+    if (RT_FAILURE(rc))
+        return rc;
+
 #ifdef VBOX_WITH_USB_VIDEO
     rc = pCallbacks->pfnRegister(pCallbacks, &UsbWebcamInterface::DrvReg);