Changeset 29891 in vbox for trunk/src/VBox/Devices/Serial

Timestamp:

May 31, 2010 10:23:34 AM (15 years ago)

Author:

vboxsync

Message:

Devices/Serial: allow to force the guest into 16450 mode by CFGM key

File:

• trunk/src/VBox/Devices/Serial/DevSerial.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Serial/DevSerial.cpp

@@ -974 +974 @@
     {
         pThis->f16550AEnabled = false;
+        LogRel(("Serial#%d: falling back to 16450 mode from load state\n", pDevIns->iInstance));
     }
     else
@@ -1156 +1157 @@
      * Validate and read the configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfg, "IRQ\0" "IOBase\0" "GCEnabled\0" "R0Enabled\0" "YieldOnLSRRead\0"))
+    if (!CFGMR3AreValuesValid(pCfg, "IRQ\0"
+                                    "IOBase\0"
+                                    "GCEnabled\0"
+                                    "R0Enabled\0"
+                                    "YieldOnLSRRead\0"
+                                    "Enable16550A\0"
+                                    ))
     {
         AssertMsgFailed(("serialConstruct Invalid configuration values\n"));
@@ -1208 +1215 @@
     Log(("DevSerial: instance %d iobase=%04x irq=%d\n", iInstance, io_base, irq_lvl));
 
+    rc = CFGMR3QueryBoolDef(pCfg, "Enable16550A", &pThis->f16550AEnabled, true);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed to get the \"Enable16550A\" value"));
+
     pThis->irq = irq_lvl;
 #ifdef VBOX_SERIAL_PCI
@@ -1215 +1227 @@
 #endif
 
-    pThis->f16550AEnabled = true;
+    LogRel(("Serial#%d: emulating %s\n", pDevIns->iInstance, pThis->f16550AEnabled ? "16550A" : "16450"));
 
     /*