← 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/DrvVD.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/DrvVD.cpp
1136
1136
 
1137
1137
    if (RT_FAILURE(rc))
1138
1138
    {
1139
 
        if (VALID_PTR(pThis->pDisk))
1140
 
        {
1141
 
            VDDestroy(pThis->pDisk);
1142
 
            pThis->pDisk = NULL;
1143
 
        }
1144
 
        drvvdFreeImages(pThis);
1145
1139
        if (VALID_PTR(pszName))
1146
1140
            MMR3HeapFree(pszName);
1147
1141
        if (VALID_PTR(pszFormat))
1148
1142
            MMR3HeapFree(pszFormat);
1149
 
 
1150
 
        return rc;
 
1143
        /* drvvdDestruct does the rest. */
1151
1144
    }
1152
1145
    else
1153
1146
    {
1193
1186
        pThis->fErrorUseRuntime = true;
1194
1187
    }
1195
1188
 
 
1189
    /* else: drvvdDestruct cleans up. */
 
1190
 
1196
1191
    LogFlow(("%s: returns %Rrc\n", __FUNCTION__, rc));
1197
1192
    return rc;
1198
1193
}
1210
1205
    PVBOXDISK pThis = PDMINS_2_DATA(pDrvIns, PVBOXDISK);
1211
1206
    LogFlow(("%s:\n", __FUNCTION__));
1212
1207
 
 
1208
    if (VALID_PTR(pThis->pDisk))
 
1209
    {
 
1210
        VDDestroy(pThis->pDisk);
 
1211
        pThis->pDisk = NULL;
 
1212
    }
1213
1213
    drvvdFreeImages(pThis);
1214
1214
}
1215
1215