Changeset 81581 in vbox for trunk/src/VBox/Main

Timestamp:

Oct 30, 2019 9:45:55 AM (5 years ago)

Author:

vboxsync

Message:

Main,FE/VBoxManage: Add an option to present the SMBIOS System UUID (SMBIOS spec chapter 7.2.1) in little endian format to the guest like it is supposed to be done. To not break existing behavior and causing certain software to require re-activation existing VMs will keep the current (wrong) beahvior. New VMs will be switched to the correct behavior. In addition VBoxManage got a new parameter to set the behavior evene for existing VMs

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (2 diffs)
• include/BIOSSettingsImpl.h (modified) (1 diff)
• src-client/ConsoleImpl2.cpp (modified) (3 diffs)
• src-server/BIOSSettingsImpl.cpp (modified) (1 diff)
• xml/Settings.cpp (modified) (5 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -5263 +5263 @@
     uuid="73af4152-7e67-4144-bf34-41c38e8b4cc7"
     wsmap="managed"
-    reservedMethods="1" reservedAttributes="8"
+    reservedMethods="1" reservedAttributes="7"
     >
     <desc>
@@ -5330 +5330 @@
         The location of the file storing the non-volatile memory content when
         the VM is powered off.  The file does not always exist.
+      </desc>
+    </attribute>
+
+    <attribute name="SMBIOSUuidLittleEndian" type="boolean">
+      <desc>
+        Flag to control whether the SMBIOS system UUID is presented in little endian
+        form to the guest as mandated by the SMBIOS spec chapter 7.2.1.
+        Before VirtualBox version 6.1 it was always presented in big endian form
+        and to retain the old behavior this flag was introduced so it can be changed.
+        VMs created with VBox 6.1 will default to true for this flag.
       </desc>
     </attribute>

trunk/src/VBox/Main/include/BIOSSettingsImpl.h

@@ -85 +85 @@
     HRESULT setPXEDebugEnabled(BOOL enable);
     HRESULT getNonVolatileStorageFile(com::Utf8Str &aNonVolatileStorageFile);
+    HRESULT getSMBIOSUuidLittleEndian(BOOL *enabled);
+    HRESULT setSMBIOSUuidLittleEndian(BOOL enable);
 
     struct Data;

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

@@ -1685 +1685 @@
             InsertConfigInteger(pBiosCfg,  "PXEDebug",             fPXEDebug);
             InsertConfigBytes(pBiosCfg,    "UUID", &HardwareUuid,sizeof(HardwareUuid));
+            BOOL fUuidLe;
+            hrc = biosSettings->COMGETTER(SMBIOSUuidLittleEndian)(&fUuidLe);                H();
+            InsertConfigInteger(pBiosCfg,  "UuidLe",               fUuidLe);
             InsertConfigNode(pBiosCfg,     "NetBoot", &pNetBootCfg);
             InsertConfigInteger(pBiosCfg,  "McfgBase",   uMcfgBase);
@@ -1754 +1757 @@
             hrc = biosSettings->COMGETTER(NonVolatileStorageFile)(bstrNVRAM.asOutParam());  H();
 
+            BOOL fUuidLe;
+            hrc = biosSettings->COMGETTER(SMBIOSUuidLittleEndian)(&fUuidLe);                H();
+
             /* Get graphics mode settings */
             uint32_t u32GraphicsMode = UINT32_MAX;
@@ -1816 +1822 @@
             InsertConfigInteger(pCfg,  "APIC",        uFwAPIC);
             InsertConfigBytes(pCfg,    "UUID", &HardwareUuid,sizeof(HardwareUuid));
+            InsertConfigInteger(pCfg,  "UuidLe",      fUuidLe);
             InsertConfigInteger(pCfg,  "64BitEntry",  f64BitEntry); /* boolean */
             InsertConfigString(pCfg,   "NvramFile",   bstrNVRAM);

trunk/src/VBox/Main/src-server/BIOSSettingsImpl.cpp

@@ -489 +489 @@
 
 
+HRESULT BIOSSettings::getSMBIOSUuidLittleEndian(BOOL *enabled)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *enabled = m->bd->fSmbiosUuidLittleEndian;
+
+    return S_OK;
+}
+
+HRESULT BIOSSettings::setSMBIOSUuidLittleEndian(BOOL enable)
+{
+    /* the machine needs to be mutable */
+    AutoMutableStateDependency adep(m->pMachine);
+    if (FAILED(adep.rc())) return adep.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    m->bd.backup();
+    m->bd->fSmbiosUuidLittleEndian = RT_BOOL(enable);
+
+    alock.release();
+    AutoWriteLock mlock(m->pMachine COMMA_LOCKVAL_SRC_POS);  // mParent is const, needs no locking
+    m->pMachine->i_setModified(Machine::IsModified_BIOS);
+
+    return S_OK;
+}
+
 
 // IBIOSSettings methods

trunk/src/VBox/Main/xml/Settings.cpp

@@ -2539 +2539 @@
     fLogoFadeOut(true),
     fPXEDebugEnabled(false),
+    fSmbiosUuidLittleEndian(true),
     ulLogoDisplayTime(0),
     biosBootMenuMode(BIOSBootMenuMode_MessageAndMenu),
@@ -2556 +2557 @@
         && fLogoFadeOut
         && !fPXEDebugEnabled
+        && !fSmbiosUuidLittleEndian
         && ulLogoDisplayTime == 0
         && biosBootMenuMode == BIOSBootMenuMode_MessageAndMenu
@@ -2572 +2574 @@
 {
     return (this == &d)
-        || (   fACPIEnabled        == d.fACPIEnabled
-            && fIOAPICEnabled      == d.fIOAPICEnabled
-            && fLogoFadeIn         == d.fLogoFadeIn
-            && fLogoFadeOut        == d.fLogoFadeOut
-            && fPXEDebugEnabled    == d.fPXEDebugEnabled
-            && ulLogoDisplayTime   == d.ulLogoDisplayTime
-            && biosBootMenuMode    == d.biosBootMenuMode
-            && apicMode            == d.apicMode
-            && llTimeOffset        == d.llTimeOffset
-            && strLogoImagePath    == d.strLogoImagePath
-            && strNVRAMPath        == d.strNVRAMPath);
+        || (   fACPIEnabled            == d.fACPIEnabled
+            && fIOAPICEnabled          == d.fIOAPICEnabled
+            && fLogoFadeIn             == d.fLogoFadeIn
+            && fLogoFadeOut            == d.fLogoFadeOut
+            && fPXEDebugEnabled        == d.fPXEDebugEnabled
+            && fSmbiosUuidLittleEndian == d.fSmbiosUuidLittleEndian
+            && ulLogoDisplayTime       == d.ulLogoDisplayTime
+            && biosBootMenuMode        == d.biosBootMenuMode
+            && apicMode                == d.apicMode
+            && llTimeOffset            == d.llTimeOffset
+            && strLogoImagePath        == d.strLogoImagePath
+            && strNVRAMPath            == d.strNVRAMPath);
 }
 
@@ -4821 +4824 @@
             if ((pelmBIOSChild = pelmHwChild->findChildElement("NVRAM")))
                 pelmBIOSChild->getAttributeValue("path", hw.biosSettings.strNVRAMPath);
+            if ((pelmBIOSChild = pelmHwChild->findChildElement("SmbiosUuidLittleEndian")))
+                pelmBIOSChild->getAttributeValue("enabled", hw.biosSettings.fSmbiosUuidLittleEndian);
+            else
+                hw.biosSettings.fSmbiosUuidLittleEndian = false; /* Default for existing VMs. */
 
             // legacy BIOS/IDEController (pre 1.7)
@@ -6293 +6300 @@
         if (!hw.biosSettings.strNVRAMPath.isEmpty())
             pelmBIOS->createChild("NVRAM")->setAttribute("path", hw.biosSettings.strNVRAMPath);
+        if (hw.biosSettings.fSmbiosUuidLittleEndian)
+            pelmBIOS->createChild("SmbiosUuidLittleEndian")->setAttribute("enabled", hw.biosSettings.fSmbiosUuidLittleEndian);
     }