Changeset 24136 in vbox for trunk/src/VBox

Timestamp:

Oct 28, 2009 12:48:41 PM (16 years ago)

Author:

vboxsync

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

54055

Message:

Main,VBoxManage,xml: Added a HardwareUUID property for reporting the original machine UUID after cloning or teleporting a VM.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (3 diffs)
• Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (3 diffs)
• Main/ConsoleImpl2.cpp (modified) (3 diffs)
• Main/MachineImpl.cpp (modified) (4 diffs)
• Main/idl/VirtualBox.xidl (modified) (3 diffs)
• Main/include/MachineImpl.h (modified) (2 diffs)
• Main/xml/Settings.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -237 +237 @@
                  "                            [--teleporterport <port>]\n"
                  "                            [--teleporteraddress <address|empty>\n"
-                 "                            [--teleporterpassword <password>]\n");
+                 "                            [--teleporterpassword <password>]\n"
+                 "                            [--hardwareuuid <uuid>]\n"
+                );
         RTPrintf("\n");
     }

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -146 +146 @@
 
     BOOL accessible = FALSE;
-    CHECK_ERROR (machine, COMGETTER(Accessible) (&accessible));
-    CheckComRCReturnRC (rc);
+    CHECK_ERROR(machine, COMGETTER(Accessible)(&accessible));
+    CheckComRCReturnRC(rc);
 
     Bstr uuid;
-    rc = machine->COMGETTER(Id) (uuid.asOutParam());
+    rc = machine->COMGETTER(Id)(uuid.asOutParam());
 
     if (!accessible)
@@ -161 +161 @@
                 RTPrintf("name=\"<inaccessible>\"\n");
             else
-                RTPrintf ("Name:            <inaccessible!>\n");
+                RTPrintf("Name:            <inaccessible!>\n");
             if (details == VMINFO_MACHINEREADABLE)
-                RTPrintf ("UUID=\"%s\"\n", Utf8Str(uuid).raw());
-            else
-                RTPrintf ("UUID:            %s\n", Utf8Str(uuid).raw());
+                RTPrintf("UUID=\"%s\"\n", Utf8Str(uuid).raw());
+            else
+                RTPrintf("UUID:            %s\n", Utf8Str(uuid).raw());
             if (details != VMINFO_MACHINEREADABLE)
             {
                 Bstr settingsFilePath;
-                rc = machine->COMGETTER(SettingsFilePath) (settingsFilePath.asOutParam());
-                RTPrintf ("Config file:     %lS\n", settingsFilePath.raw());
+                rc = machine->COMGETTER(SettingsFilePath)(settingsFilePath.asOutParam());
+                RTPrintf("Config file:     %lS\n", settingsFilePath.raw());
                 ComPtr<IVirtualBoxErrorInfo> accessError;
-                rc = machine->COMGETTER(AccessError) (accessError.asOutParam());
-                RTPrintf ("Access error details:\n");
-                ErrorInfo ei (accessError);
+                rc = machine->COMGETTER(AccessError)(accessError.asOutParam());
+                RTPrintf("Access error details:\n");
+                ErrorInfo ei(accessError);
                 GluePrintErrorInfo(ei);
-                RTPrintf ("\n");
+                RTPrintf("\n");
             }
         }
@@ -218 +218 @@
     else
         RTPrintf("Config file:     %lS\n", settingsFilePath.raw());
+
+    Bstr strHardwareUuid;
+    rc = machine->COMGETTER(HardwareUUID)(strHardwareUuid.asOutParam());
+    if (details == VMINFO_MACHINEREADABLE)
+        RTPrintf("HardwareUUID=\"%s\"\n", strHardwareUuid.raw());
+    else
+        RTPrintf("Hardware UUID:   %lS\n", strHardwareUuid.raw());
 
     ULONG memorySize;

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -126 +126 @@
     MODIFYVM_TELEPORTER_PORT,
     MODIFYVM_TELEPORTER_ADDRESS,
-    MODIFYVM_TELEPORTER_PASSWORD
+    MODIFYVM_TELEPORTER_PASSWORD,
+    MODIFYVM_HARDWARE_UUID
 };
 
@@ -201 +202 @@
     { "--teleporteraddress",        MODIFYVM_TELEPORTER_ADDRESS,        RTGETOPT_REQ_STRING },
     { "--teleporterpassword",       MODIFYVM_TELEPORTER_PASSWORD,       RTGETOPT_REQ_STRING },
+    { "--hardwareuuid",             MODIFYVM_HARDWARE_UUID,             RTGETOPT_REQ_STRING },
 };
 
@@ -1816 +1818 @@
             }
 
+            case MODIFYVM_HARDWARE_UUID:
+            {
+                CHECK_ERROR(machine, COMSETTER(HardwareUUID)(Bstr(ValueUnion.psz)));
+                break;
+            }
+
             default:
             {

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -199 +199 @@
     hrc = pMachine->COMGETTER(BIOSSettings)(biosSettings.asOutParam());             H();
 
-    hrc = pMachine->COMGETTER(Id)(&str);                                            H();
-    Guid MachineUuid(str);
-    PCRTUUID pUuid = MachineUuid.raw();
+    hrc = pMachine->COMGETTER(HardwareUUID)(&str);                                  H();
+    RTUUID HardwareUuid;
+    rc = RTUuidFromUtf16(&HardwareUuid, str);                                       RC_CHECK();
     STR_FREE();
 
@@ -234 +234 @@
     hrc = pMachine->COMGETTER(Name)(&str);                                          H();
     rc = CFGMR3InsertStringW(pRoot, "Name",                 str);                   RC_CHECK();
-    rc = CFGMR3InsertBytes(pRoot,   "UUID", pUuid, sizeof(*pUuid));                 RC_CHECK();
+    rc = CFGMR3InsertBytes(pRoot,   "UUID", &HardwareUuid, sizeof(HardwareUuid));   RC_CHECK();
     rc = CFGMR3InsertInteger(pRoot, "RamSize",              cbRam);                 RC_CHECK();
     rc = CFGMR3InsertInteger(pRoot, "RamHoleSize",          cbRamHole);             RC_CHECK();
@@ -705 +705 @@
         rc = CFGMR3InsertInteger(pBiosCfg,  "IOAPIC",               fIOAPIC);           RC_CHECK();
         rc = CFGMR3InsertInteger(pBiosCfg,  "PXEDebug",             fPXEDebug);         RC_CHECK();
-        rc = CFGMR3InsertBytes(pBiosCfg,    "UUID", pUuid, sizeof(*pUuid));             RC_CHECK();
+        rc = CFGMR3InsertBytes(pBiosCfg,    "UUID", &HardwareUuid,sizeof(HardwareUuid));RC_CHECK();
 
         DeviceType_T bootDevice;

trunk/src/VBox/Main/MachineImpl.cpp

@@ -213 +213 @@
 
     if (mHWVersion != that.mHWVersion ||
+        mHardwareUUID != that.mHardwareUUID ||
         mMemorySize != that.mMemorySize ||
         mMemoryBalloonSize != that.mMemoryBalloonSize ||
@@ -988 +989 @@
     mHWData.backup();
     mHWData->mHWVersion = hwVersion;
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMGETTER(HardwareUUID)(BSTR *aUUID)
+{
+    CheckComArgOutPointerValid(aUUID);
+
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoReadLock alock(this);
+
+    if (!mHWData->mHardwareUUID.isEmpty())
+        mHWData->mHardwareUUID.toUtf16().cloneTo(aUUID);
+    else
+        mData->mUuid.toUtf16().cloneTo(aUUID);
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMSETTER(HardwareUUID) (IN_BSTR aUUID)
+{
+    Guid hardwareUUID(aUUID);
+    if (hardwareUUID.isEmpty())
+        return E_INVALIDARG;
+
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this);
+
+    HRESULT rc = checkStateDependency(MutableStateDep);
+    CheckComRCReturnRC(rc);
+
+    mHWData.backup();
+    if (hardwareUUID == mData->mUuid)
+        mHWData->mHardwareUUID.clear();
+    else
+        mHWData->mHardwareUUID = hardwareUUID;
 
     return S_OK;
@@ -5304 +5345 @@
         /* The hardware version attribute (optional). */
         mHWData->mHWVersion = data.strVersion;
+        mHWData->mHardwareUUID = data.uuid;
 
         mHWData->mHWVirtExEnabled             = data.fHardwareVirt;
@@ -6251 +6293 @@
 
         data.strVersion = mHWData->mHWVersion;
+        data.uuid = mHWData->mHardwareUUID;
 
         // CPU

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

@@ -4059 +4059 @@
   <interface
      name="IMachine" extends="$unknown"
-     uuid="db35f17a-179f-4332-91b2-a49d5cfb678c"
+     uuid="37642E74-969A-4590-BD52-390E541F904D"
      wsmap="managed"
      >
@@ -4236 +4236 @@
     </attribute>
 
+    <attribute name="hardwareUUID" type="uuid" mod="string">
+      <desc>
+        The UUID presented to the guest via memory tables, hardware and guest
+        properties.  For most VMs this is the same as the @a id, but for VMs
+        which have been cloned or teleported it may be the same as the source
+        VM.  This latter is because the guest shouldn't notice that it was
+        cloned or teleported.
+      </desc>
+    </attribute>
+
     <attribute name="CPUCount" type="unsigned long">
       <desc>Number of virtual CPUs in the VM.</desc>
@@ -11947 +11957 @@
     <attribute name="ports" type="wstring">
       <desc>
-        VRDP server port numbers. The server will try to bind to one of free ports from the list. 
+        VRDP server port numbers. The server will try to bind to one of free ports from the list.
         <note>
           This is a string of comma separated TCP port numbers or port number ranges.

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

@@ -282 +282 @@
 
         Bstr           mHWVersion;
+        Guid           mHardwareUUID;   /**< If Null, use mData.mUuid. */
         ULONG          mMemorySize;
         ULONG          mMemoryBalloonSize;
@@ -521 +522 @@
     STDMETHOD(COMGETTER(HardwareVersion))(BSTR *aVersion);
     STDMETHOD(COMSETTER(HardwareVersion))(IN_BSTR aVersion);
+    STDMETHOD(COMGETTER(HardwareUUID))(BSTR *aUUID);
+    STDMETHOD(COMSETTER(HardwareUUID))(IN_BSTR aUUID);
     STDMETHOD(COMGETTER(MemorySize))(ULONG *memorySize);
     STDMETHOD(COMSETTER(MemorySize))(ULONG memorySize);

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

@@ -1447 +1447 @@
             // defaults to 2 and is only written if != 2
 
+    Utf8Str strUUID;
+    if (elmHardware.getAttributeValue("uuid", strUUID))
+        parseUUID(hw.uuid, strUUID);
+    else
+        hw.uuid.clear();
+
     xml::NodesLoop nl1(elmHardware);
     const xml::ElementNode *pelmHwChild;
@@ -2330 +2336 @@
     if (hw.strVersion != "2")
         pelmHardware->setAttribute("version", hw.strVersion);
+    if (!hw.uuid.isEmpty())
+        pelmHardware->setAttribute("uuid", makeString(hw.uuid));
 
     xml::ElementNode *pelmCPU      = pelmHardware->createChild("CPU");
@@ -2896 +2904 @@
             )
        )
+        m->sv = SettingsVersion_v1_9;
+
+    if (    m->sv < SettingsVersion_v1_9
+        &&  !hardwareMachine.uuid.isEmpty())
         m->sv = SettingsVersion_v1_9;
 }