← Back to branch summary

~ubuntu-branches/ubuntu/natty/virtualbox-ose/natty-updates

« back to all changes in this revision

Viewing changes to src/VBox/Main/ConsoleImpl.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-03-11 17:16:37 UTC
  • mfrom: (0.3.4 upstream) (0.4.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100311171637-43z64ia3ccpj8vqn
Tags: 3.1.4-dfsg-2ubuntu1
https://launchpad.net/bugs/528561
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/535297
* Merge from Debian unstable (LP: #528561), remaining changes:
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
  - Replace *-source packages with transitional packages for *-dkms
* Fix crash in vboxvideo_drm with kernel 2.6.33 / backported drm code
  (LP: #535297)
* Add a list of linux-headers packages to the apport hook
* Update debian/patches/u02-lp-integration.dpatch with a
  DEP-3 compliant header
* Add ${misc:Depends} to virtualbox-ose-source and virtualbox-ose-guest-source
  Depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Main/ConsoleImpl.cpp
286
286
{
287
287
    LogFlowThisFunc(("\n"));
288
288
 
289
 
    memset(mapFDLeds, 0, sizeof(mapFDLeds));
290
 
    memset(mapIDELeds, 0, sizeof(mapIDELeds));
291
 
    memset(mapSATALeds, 0, sizeof(mapSATALeds));
292
 
    memset(mapSCSILeds, 0, sizeof(mapSCSILeds));
 
289
    memset(mapStorageLeds, 0, sizeof(mapStorageLeds));
293
290
    memset(mapNetworkLeds, 0, sizeof(mapNetworkLeds));
294
291
    memset(&mapUSBLed, 0, sizeof(mapUSBLed));
295
292
    memset(&mapSharedFolderLed, 0, sizeof(mapSharedFolderLed));
296
293
 
 
294
    for (unsigned i = 0; i < RT_ELEMENTS(maStorageDevType); ++ i)
 
295
        maStorageDevType[i] = DeviceType_Null;
 
296
 
297
297
    return S_OK;
298
298
}
299
299
 
2175
2175
    switch (aDeviceType)
2176
2176
    {
2177
2177
        case DeviceType_Floppy:
2178
 
        {
2179
 
            for (unsigned i = 0; i < RT_ELEMENTS(mapFDLeds); ++i)
2180
 
                SumLed.u32 |= readAndClearLed(mapFDLeds[i]);
2181
 
            break;
2182
 
        }
2183
 
 
2184
2178
        case DeviceType_DVD:
2185
 
        {
2186
 
            SumLed.u32 |= readAndClearLed(mapIDELeds[2]);
2187
 
            break;
2188
 
        }
2189
 
 
2190
2179
        case DeviceType_HardDisk:
2191
2180
        {
2192
 
            SumLed.u32 |= readAndClearLed(mapIDELeds[0]);
2193
 
            SumLed.u32 |= readAndClearLed(mapIDELeds[1]);
2194
 
            SumLed.u32 |= readAndClearLed(mapIDELeds[3]);
2195
 
            for (unsigned i = 0; i < RT_ELEMENTS(mapSATALeds); ++i)
2196
 
                SumLed.u32 |= readAndClearLed(mapSATALeds[i]);
2197
 
            for (unsigned i = 0; i < RT_ELEMENTS(mapSCSILeds); ++i)
2198
 
                SumLed.u32 |= readAndClearLed(mapSCSILeds[i]);
 
2181
            for (unsigned i = 0; i < RT_ELEMENTS(mapStorageLeds); ++i)
 
2182
                if (maStorageDevType[i] == aDeviceType)
 
2183
                    SumLed.u32 |= readAndClearLed(mapStorageLeds[i]);
2199
2184
            break;
2200
2185
        }
2201
2186
 
7278
7263
        rc = CFGMR3InsertNode(pCfg, "VDConfig", &pVDC);                 RC_CHECK();
7279
7264
        for (size_t i = 0; i < names.size(); ++ i)
7280
7265
        {
7281
 
            if (values[i])
 
7266
            if (values[i] && *values[i])
7282
7267
            {
7283
7268
                Utf8Str name = names[i];
7284
7269
                Utf8Str value = values[i];
7319
7304
            rc = CFGMR3InsertNode(pCur, "VDConfig", &pVDC);             RC_CHECK();
7320
7305
            for (size_t i = 0; i < aNames.size(); ++ i)
7321
7306
            {
7322
 
                if (aValues[i])
 
7307
                if (aValues[i] && *aValues[i])
7323
7308
                {
7324
7309
                    Utf8Str name = aNames[i];
7325
7310
                    Utf8Str value = aValues[i];
7326
 
                    rc = CFGMR3InsertString(pVDC, name.c_str(), value.c_str());
 
7311
                    rc = CFGMR3InsertString(pVDC, name.c_str(), value.c_str()); RC_CHECK();
7327
7312
                    if (    !(name.compare("HostIPStack"))
7328
7313
                        &&  !(value.compare("0")))
7329
7314
                        fHostIP = false;