← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/VBox/Devices/Storage/DrvHostBase.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-10-13 23:06:00 UTC
  • mfrom: (0.3.2 upstream) (0.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20091013230600-xhu2pwizq0wo63l9
Tags: 3.0.8-dfsg-1ubuntu1
https://launchpad.net/bugs/444812
https://launchpad.net/bugs/267097
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/434503
* Merge from debian unstable (LP: #444812), remaining changes:
  - Enable DKMS support on virtualbox host and guest modules (LP: #267097)
    - Drop virtualbox-ose{-guest,}-modules-* package templates
    - Recommend *-source instead of *-modules packages
    - Replace error messages related to missing/mismatched
      kernel module accordingly
  - Autoload kernel module
    - LOAD_VBOXDRV_MODULE=1 in virtualbox-ose.default
  - Disable update action
    - patches/u01-disable-update-action.dpatch
  - Virtualbox should go in Accessories, not in System tools (LP: #288590)
    - virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add apport hook
    - virtualbox-ose.files/source_virtualbox-ose.py
    - virtualbox-ose.install
  - Add launchpad integration
    - control
    - lpi-bug.xpm
    - patches/u02-lp-integration.dpatch
* Try to remove existing dkms modules before adding the new modules
  (LP: #434503)
  - debian/virtualbox-ose-source.postinst
  - debian/virtualbox-ose-guest-source.postinst
* Don't fail if dkms modules have already been removed
  - debian/virtualbox-ose-source.prerm
  - debian/virtualbox-ose-guest-source.prerm

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Devices/Storage/DrvHostBase.cpp
1050
1050
    if (RT_SUCCESS(rc))
1051
1051
    {
1052
1052
        rc = RTFileOpen(pFileRawDevice, pThis->pszRawDeviceOpen, fFlags);
1053
 
        if (RT_FAILURE(rc))
1054
 
        {
1055
 
            LogRel(("DVD: failed to open device %s\n", pThis->pszRawDeviceOpen));
1056
 
            RTFileClose(*pFileBlockDevice);
1057
 
        }
 
1053
        if (RT_SUCCESS(rc))
 
1054
            return rc;
 
1055
 
 
1056
        LogRel(("DVD: failed to open device %s rc=%Rrc\n", pThis->pszRawDeviceOpen, rc));
 
1057
        RTFileClose(*pFileBlockDevice);
1058
1058
    }
1059
1059
    else
1060
 
        LogRel(("DVD: failed to open device %s\n", pThis->pszRawDeviceOpen));
 
1060
        LogRel(("DVD: failed to open device %s rc=%Rrc\n", pThis->pszDeviceOpen, rc));
1061
1061
    return rc;
1062
1062
}
1063
1063
#endif  /* RT_OS_SOLARIS */
1080
1080
 
1081
1081
    RTFILE FileDevice;
1082
1082
#ifdef RT_OS_SOLARIS
 
1083
    if (pThis->FileRawDevice != NIL_RTFILE)
 
1084
    {
 
1085
        RTFileClose(pThis->FileRawDevice);
 
1086
        pThis->FileDevice = NIL_RTFILE;
 
1087
    }
 
1088
    if (pThis->FileDevice != NIL_RTFILE)
 
1089
    {
 
1090
        RTFileClose(pThis->FileDevice);
 
1091
        pThis->FileRawDevice = NIL_RTFILE;
 
1092
    }
1083
1093
    RTFILE FileRawDevice;
1084
1094
    int rc = drvHostBaseOpen(pThis, &FileDevice, &FileRawDevice, pThis->fReadOnlyConfig);
1085
1095
#else