Changeset 20289 in vbox

Timestamp:

Jun 4, 2009 2:44:43 PM (16 years ago)

Author:

vboxsync

Message:

Frontends/VBoxManage: fix showvminfo --machinereadable output of boot order

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxInternalManage.cpp (modified) (1 diff)
• VBoxManageInfo.cpp (modified) (7 diffs)

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

@@ -957 +957 @@
     {
         RTPrintf("File '%s' is no block device\n", rawdisk.raw());
-        vrc = VERR_INVALID_PARAMETER;
-        goto out;
+        vrc = RTFileGetSize(RawFile, &cbSize);
+        //vrc = VERR_INVALID_PARAMETER;
+        //goto out;
     }
 #elif defined(RT_OS_DARWIN)

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

@@ -267 +267 @@
         {
             if (details == VMINFO_MACHINEREADABLE)
-                RTPrintf("bootdevice-%d=\"floppy\"\n", i);
+                RTPrintf("boot%d=\"floppy\"\n", i);
             else
                 RTPrintf("Boot Device (%d): Floppy\n", i);
@@ -274 +274 @@
         {
             if (details == VMINFO_MACHINEREADABLE)
-                RTPrintf("bootdevice-%d=\"dvd\"\n", i);
+                RTPrintf("boot%d=\"dvd\"\n", i);
             else
                 RTPrintf("Boot Device (%d): DVD\n", i);
@@ -281 +281 @@
         {
             if (details == VMINFO_MACHINEREADABLE)
-                RTPrintf("bootdevice-%d=\"harddisk\"\n", i);
+                RTPrintf("boot%d=\"disk\"\n", i);
             else
                 RTPrintf("Boot Device (%d): HardDisk\n", i);
@@ -288 +288 @@
         {
             if (details == VMINFO_MACHINEREADABLE)
-                RTPrintf("bootdevice-%d=\"network\"\n", i);
+                RTPrintf("boot%d=\"net\"\n", i);
             else
                 RTPrintf("Boot Device (%d): Network\n", i);
@@ -295 +295 @@
         {
             if (details == VMINFO_MACHINEREADABLE)
-                RTPrintf("bootdevice-%d=\"usb\"\n", i);
+                RTPrintf("boot%d=\"usb\"\n", i);
             else
                 RTPrintf("Boot Device (%d): USB\n", i);
@@ -302 +302 @@
         {
             if (details == VMINFO_MACHINEREADABLE)
-                RTPrintf("bootdevice-%d=\"sharedfolder\"\n", i);
+                RTPrintf("boot%d=\"sharedfolder\"\n", i);
             else
                 RTPrintf("Boot Device (%d): Shared Folder\n", i);
@@ -309 +309 @@
         {
             if (details == VMINFO_MACHINEREADABLE)
-                RTPrintf("bootdevice-%d=\"null\"\n", i);
+                RTPrintf("boot%d=\"none\"\n", i);
             else
                 RTPrintf("Boot Device (%d): Not Assigned\n", i);