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

Timestamp:

Aug 19, 2018 7:07:19 PM (7 years ago)

Author:

vboxsync

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

124451

Message:

Main,FE/VBoxManage: Allow changing the UART type of the serial ports through the API

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManageInfo.cpp (modified) (6 diffs)
• VBoxManageModifyVM.cpp (modified) (3 diffs)

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

@@ -608 +608 @@
                      "                                             file <file>|\n"
                      "                                             <devicename>]\n"
+                     "                            [--uarttype<1-N> 16450|16550A|16750\n"
 #if defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
                      "                            [--lpt<1-N> off|<I/O base> <IRQ>]\n"

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

@@ -1493 +1493 @@
                 Bstr path;
                 BOOL fServer;
+                UartType_T UartType;
                 uart->COMGETTER(IRQ)(&ulIRQ);
                 uart->COMGETTER(IOBase)(&ulIOBase);
@@ -1498 +1499 @@
                 uart->COMGETTER(Server)(&fServer);
                 uart->COMGETTER(HostMode)(&HostMode);
+                uart->COMGETTER(UartType)(&UartType);
 
                 if (details == VMINFO_MACHINEREADABLE)
@@ -1510 +1512 @@
                             RTPrintf("uartmode%d=\"disconnected\"\n", currentUART + 1);
                         else
-                            RTPrintf(", disconnected\n");
+                            RTPrintf(", disconnected");
                         break;
                     case PortMode_RawFile:
@@ -1525 +1527 @@
                                      fServer ? "tcpserver" : "tcpclient", path.raw());
                         else
-                            RTPrintf(", attached to tcp (%s) '%ls'\n",
+                            RTPrintf(", attached to tcp (%s) '%ls'",
                                      fServer ? "server" : "client", path.raw());
                         break;
@@ -1533 +1535 @@
                                      fServer ? "server" : "client", path.raw());
                         else
-                            RTPrintf(", attached to pipe (%s) '%ls'\n",
+                            RTPrintf(", attached to pipe (%s) '%ls'",
                                      fServer ? "server" : "client", path.raw());
                         break;
@@ -1541 +1543 @@
                                      path.raw());
                         else
-                            RTPrintf(", attached to device '%ls'\n", path.raw());
+                            RTPrintf(", attached to device '%ls'", path.raw());
+                        break;
+                }
+                switch (UartType)
+                {
+                    default:
+                    case UartType_U16450:
+                        if (details == VMINFO_MACHINEREADABLE)
+                            RTPrintf("uarttype%d=\"16450\"\n", currentUART + 1);
+                        else
+                            RTPrintf(", 16450\n");
+                        break;
+                    case UartType_U16550A:
+                        if (details == VMINFO_MACHINEREADABLE)
+                            RTPrintf("uarttype%d=\"16550A\"\n", currentUART + 1);
+                        else
+                            RTPrintf(", 16550A\n");
+                        break;
+                    case UartType_U16750:
+                        if (details == VMINFO_MACHINEREADABLE)
+                            RTPrintf("uarttype%d=\"16750\"\n", currentUART + 1);
+                        else
+                            RTPrintf(", 16750\n");
                         break;
                 }

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

@@ -147 +147 @@
     MODIFYVM_HIDKBD,
     MODIFYVM_UARTMODE,
+    MODIFYVM_UARTTYPE,
     MODIFYVM_UART,
 #if defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
@@ -334 +335 @@
     { "--keyboard",                 MODIFYVM_HIDKBD,                    RTGETOPT_REQ_STRING },
     { "--uartmode",                 MODIFYVM_UARTMODE,                  RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
+    { "--uarttype",                 MODIFYVM_UARTTYPE,                  RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--uart",                     MODIFYVM_UART,                      RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
 #if defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
@@ -2157 +2159 @@
             }
 
+            case MODIFYVM_UARTTYPE:
+            {
+                ComPtr<ISerialPort> uart;
+
+                CHECK_ERROR_BREAK(sessionMachine, GetSerialPort(GetOptState.uIndex - 1, uart.asOutParam()));
+                ASSERT(uart);
+
+                if (!RTStrICmp(ValueUnion.psz, "16450"))
+                {
+                    CHECK_ERROR(uart, COMSETTER(UartType)(UartType_U16450));
+                }
+                else if (!RTStrICmp(ValueUnion.psz, "16550A"))
+                {
+                    CHECK_ERROR(uart, COMSETTER(UartType)(UartType_U16550A));
+                }
+                else if (!RTStrICmp(ValueUnion.psz, "16750"))
+                {
+                    CHECK_ERROR(uart, COMSETTER(UartType)(UartType_U16750));
+                }
+                else
+                    return errorSyntax(USAGE_MODIFYVM,
+                                       "Invalid argument to '%s'",
+                                       GetOptState.pDef->pszLong);
+                break;
+            }
+
             case MODIFYVM_UART:
             {