Changeset 41371 in vbox for trunk/src/VBox/Main/xml

Timestamp:

May 21, 2012 3:23:40 PM (13 years ago)

Author:

vboxsync

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

78064

Message:

Main,include,VBoxManage: smartcard support: IMachine::EmulatedUSBCardReaderEnabled.

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (5 diffs)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1606 +1606 @@
           keyboardHidType(KeyboardHidType_PS2Keyboard),
           chipsetType(ChipsetType_PIIX3),
+          fEmulatedUSBCardReader(false),
           clipboardMode(ClipboardMode_Bidirectional),
           ulMemoryBalloonSize(0),
@@ -1668 +1669 @@
                   && (keyboardHidType           == h.keyboardHidType)
                   && (chipsetType               == h.chipsetType)
+                  && (fEmulatedUSBCardReader    == h.fEmulatedUSBCardReader)
                   && (vrdeSettings              == h.vrdeSettings)
                   && (biosSettings              == h.biosSettings)
@@ -2820 +2822 @@
                     hw.pciAttachments.push_back(hpda);
                 }
+            }
+        }
+        else if (pelmHwChild->nameEquals("EmulatedUSB"))
+        {
+            const xml::ElementNode *pelmCardReader;
+
+            if ((pelmCardReader = pelmHwChild->findChildElement("CardReader")))
+            {
+                pelmCardReader->getAttributeValue("enabled", hw.fEmulatedUSBCardReader);
             }
         }
@@ -4042 +4053 @@
     }
 
+    if (m->sv >= SettingsVersion_v1_12)
+    {
+        xml::ElementNode *pelmEmulatedUSB = pelmHardware->createChild("EmulatedUSB");
+        xml::ElementNode *pelmCardReader = pelmEmulatedUSB->createChild("CardReader");
+
+        pelmCardReader->setAttribute("enabled", hw.fEmulatedUSBCardReader);
+    }
+
     xml::ElementNode *pelmGuest = pelmHardware->createChild("Guest");
     pelmGuest->setAttribute("memoryBalloonSize", hw.ulMemoryBalloonSize);
@@ -4648 +4667 @@
     if (m->sv < SettingsVersion_v1_12)
     {
+        // 4.1: Emulated USB devices.
+        if (hardwareMachine.fEmulatedUSBCardReader)
+            m->sv = SettingsVersion_v1_12;
+    }
+
+    if (m->sv < SettingsVersion_v1_12)
+    {
         // VirtualBox 4.1 adds PCI passthrough.
         if (hardwareMachine.pciAttachments.size())