Changeset 16515 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 4, 2009 3:01:28 PM (16 years ago)

Author:

vboxsync

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

42438

Message:

OVF: bring back string references; look up controllers by array item index, not internal refid; fix image config

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageImport.cpp (modified) (4 diffs)

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

@@ -97 +97 @@
             {
                 com::SafeArray<VirtualSystemDescriptionType_T> retTypes;
-                com::SafeArray<ULONG> aRefs;
+                com::SafeArray<BSTR> aRefs;
                 com::SafeArray<BSTR> aOrigValues;
                 com::SafeArray<BSTR> aConfigValues;
@@ -147 +147 @@
 
                         case VirtualSystemDescriptionType_HardDiskControllerIDE:
-                            RTPrintf("%2d: IDE controller: reference ID %d"
-                                     "\n    (disable with \"-vsys %d -ignore %d\")\n",
-                                     a,
-                                     aRefs[a],
+                            RTPrintf("%2d: IDE controller, type %ls"
+                                     "\n    (disable with \"-vsys %d -ignore %d\")\n",
+                                     a,
+                                     aConfigValues[a],
                                      i, a);
                         break;
 
                         case VirtualSystemDescriptionType_HardDiskControllerSATA:
-                            RTPrintf("%2d: SATA controller: reference ID %d"
-                                     "\n    (disable with \"-vsys %d -ignore %d\")\n",
-                                     a,
-                                     aRefs[a],
+                            RTPrintf("%2d: SATA controller, type %ls"
+                                     "\n    (disable with \"-vsys %d -ignore %d\")\n",
+                                     a,
+                                     aConfigValues[a],
                                      i, a);
                         break;
 
                         case VirtualSystemDescriptionType_HardDiskControllerSCSI:
-                            RTPrintf("%2d: SCSI controller: reference ID %d, type %ls"
-                                     "\n    (change with \"-vsys %d -scsitype%d={BusLogic|LsiLogic}\";"
+                            RTPrintf("%2d: SCSI controller, type %ls"
+                                     "\n    (change with \"-vsys %d -type%d={BusLogic|LsiLogic}\";"
                                      "\n    disable with \"-vsys %d -ignore %d\")\n",
                                      a,
-                                     aRefs[a],
                                      aConfigValues[a],
                                      i, a, i, a);
@@ -173 +172 @@
 
                         case VirtualSystemDescriptionType_HardDiskImage:
-                            RTPrintf("%2d: Hard disk image: controller %d, source image \"%ls\", target image \"%ls\""
+                            RTPrintf("%2d: Hard disk image: source image=%ls, target path=%ls, %ls"
                                      "\n    (change controller with \"-vsys %d -controller%d=<id>\";"
                                      "\n    disable with \"-vsys %d -ignore %d\")\n",
                                      a,
-                                     aRefs[a],
                                      aOrigValues[a],
                                      aConfigValues[a],
+                                     aExtraConfigValues[a],
                                      i, a, i, a);
                         break;
@@ -196 +195 @@
 
                         case VirtualSystemDescriptionType_NetworkAdapter:
-                            RTPrintf("%2d: Network adapter: orig %ls, auto %ls, conf %ls\n",
+                            RTPrintf("%2d: Network adapter: orig %ls, config %ls, extra %ls\n",
                                      a,
                                      aOrigValues[a],