Changeset 24136 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManageInfo.cpp (modified) (3 diffs)
• VBoxManageModifyVM.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:
             {