← Back to branch summary

~ubuntu-branches/ubuntu/vivid/virtualbox/vivid

« back to all changes in this revision

Viewing changes to src/VBox/Main/src-client/ConsoleImpl2.cpp

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2012-06-21 12:31:17 UTC
  • mfrom: (3.1.17 sid)
  • Revision ID: package-import@ubuntu.com-20120621123117-xo4y7f94ofy9p2hp
Tags: 4.1.18-dfsg-1
https://launchpad.net/bugs/1012627
https://launchpad.net/bugs/1013368
* New upstream release.
  - Fixes host freezes with 64-bit guests on 32-bit hosts. (LP: #1012627)
  - Fixes odd permissions of files in shared folders. (LP: #1013368)
* Drop 37-fix-unregister-netdevice.patch, fixed upstream.
* Compress orig tarball and binary packages with xz.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Main/src-client/ConsoleImpl2.cpp
2304
2304
# endif
2305
2305
#endif
2306
2306
#ifdef VBOX_WITH_USB_CARDREADER
2307
 
                InsertConfigNode(pUsbDevices, "CardReader", &pDev);
2308
 
                InsertConfigNode(pDev,     "0", &pInst);
2309
 
                InsertConfigNode(pInst,    "Config", &pCfg);
2310
 
                InsertConfigNode(pInst,    "LUN#0", &pLunL0);
 
2307
                BOOL aEmulatedUSBCardReaderEnabled = FALSE;
 
2308
                hrc = pMachine->COMGETTER(EmulatedUSBCardReaderEnabled)(&aEmulatedUSBCardReaderEnabled);    H();
 
2309
                if (aEmulatedUSBCardReaderEnabled)
 
2310
                {
 
2311
                    InsertConfigNode(pUsbDevices, "CardReader", &pDev);
 
2312
                    InsertConfigNode(pDev,     "0", &pInst);
 
2313
                    InsertConfigNode(pInst,    "Config", &pCfg);
 
2314
 
 
2315
                    InsertConfigNode(pInst,    "LUN#0", &pLunL0);
2311
2316
# ifdef VBOX_WITH_USB_CARDREADER_TEST
2312
 
                InsertConfigString(pLunL0,    "Driver", "DrvDirectCardReader");
2313
 
                InsertConfigNode(pLunL0,    "Config", &pCfg);
 
2317
                    InsertConfigString(pLunL0, "Driver", "DrvDirectCardReader");
 
2318
                    InsertConfigNode(pLunL0,   "Config", &pCfg);
 
2319
# else
 
2320
                    InsertConfigString(pLunL0, "Driver", "UsbCardReader");
 
2321
                    InsertConfigNode(pLunL0,   "Config", &pCfg);
 
2322
                    InsertConfigInteger(pCfg,  "Object", (uintptr_t)mUsbCardReader);
2314
2323
# endif
 
2324
                }
2315
2325
#endif
 
2326
 
2316
2327
# if 0  /* Virtual MSD*/
2317
2328
 
2318
2329
                InsertConfigNode(pUsbDevices, "Msd", &pDev);