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

Timestamp:

Apr 11, 2008 11:58:03 AM (17 years ago)

Author:

vboxsync

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

29537

Message:

adjusted SATA handling

File:

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

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

@@ -337 +337 @@
                  "                            [-boot<1-4> none|floppy|dvd|disk|net>]\n"
                  "                            [-hd<a|b|d> none|<uuid>|<filename>]\n"
+#ifdef VBOX_WITH_AHCI
+                 "                            [-sata on|off]\n"
+                 "                            [-sataportcount <1-30>]\n"
+                 "                            [-sataport<1-30> none|<uuid>|<filename>]\n"
+                 "                            [-sataideemulation hda|hdb|hdc|hdd <1-30>]\n"
+#endif
                  "                            [-dvd none|<uuid>|<filename>|host:<drive>]\n"
                  "                            [-dvdpassthrough on|off]\n"
@@ -412 +418 @@
                  "                            [-usbehci on|off]\n"
                  "                            [-snapshotfolder default|<path>]\n");
-#ifdef VBOX_WITH_AHCI
-        RTPrintf("                            [-sata on|off]\n"
-                 "                            [-sataportcount <1-30>]\n"
-                 "                            [-sataport<1-30> none|<uuid>|<filename>]\n"
-                 "                            [-sataideemulation hda|hdb|hdc|hdd <1-30>]\n");
-#endif
         RTPrintf("\n");
     }
@@ -1074 +1074 @@
             RTPrintf("Floppy:          %s\n", pszFloppy.raw());
     }
-
+        
+    /*
+     * SATA.
+     */
+    ComPtr<ISATAController> SATACtl;
+    rc = machine->COMGETTER(SATAController)(SATACtl.asOutParam());
+    if (SUCCEEDED(rc))
+    {
+        BOOL fEnabled;
+        rc = SATACtl->COMGETTER(Enabled)(&fEnabled);
+        if (FAILED(rc))
+            fEnabled = false;
+        if (details == VMINFO_MACHINEREADABLE)
+            RTPrintf("sata=\"%s\"\n", fEnabled ? "on" : "off");
+        else
+            RTPrintf("SATA:          %s\n", fEnabled ? "enabled" : "disabled");
+    }
+
+    /*
+         * Hard disks
+         */
     ComPtr<IHardDisk> hardDisk;
     Bstr filePath;
@@ -2022 +2042 @@
         RTPrintf("\n");
 
-    /*
-     * SATA.
-     */
-    ComPtr<ISATAController> SATACtl;
-    rc = machine->COMGETTER(SATAController)(SATACtl.asOutParam());
-    if (SUCCEEDED(rc))
-    {
-        BOOL fEnabled;
-        rc = SATACtl->COMGETTER(Enabled)(&fEnabled);
-        if (FAILED(rc))
-            fEnabled = false;
-        if (details == VMINFO_MACHINEREADABLE)
-            RTPrintf("sata=\"%s\"\n", fEnabled ? "on" : "off");
-        else
-            RTPrintf("SATA:            %s\n", fEnabled ? "enabled" : "disabled");
-    }
-
     if (console)
     {