← Back to branch summary

~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/VMM/PDMLdr.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
https://launchpad.net/bugs/498219
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/474625
https://launchpad.net/bugs/495935
https://launchpad.net/bugs/473334
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - 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
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/VMM/PDMLdr.cpp
497
497
                            if (pUVM->pdm.s.pModules)
498
498
                            {
499
499
                                /* we don't expect this list to be very long, so rather save the tail pointer. */
500
 
                                PPDMMOD pCur = pUVM->pdm.s.pModules;
 
500
                                pCur = pUVM->pdm.s.pModules;
501
501
                                while (pCur->pNext)
502
502
                                    pCur = pCur->pNext;
503
503
                                pCur->pNext = pModule;
528
528
        int rc2 = RTLdrClose(pModule->hLdrMod);
529
529
        AssertRC(rc2);
530
530
    }
531
 
    RTMemFree(pModule);
532
 
    RTMemTmpFree(pszFile);
533
531
 
534
532
    /* Don't consider VERR_PDM_MODULE_NAME_CLASH and VERR_NO_MEMORY above as these are very unlikely. */
535
533
    if (RT_FAILURE(rc))
536
 
        return VMSetError(pVM, rc, RT_SRC_POS, N_("Cannot load GC module %s"), pszFilename);
 
534
        rc = VMSetError(pVM, rc, RT_SRC_POS, N_("Cannot load GC module %s"), pszFilename);
 
535
 
 
536
    RTMemFree(pModule);
 
537
    RTMemTmpFree(pszFile);
537
538
    return rc;
538
539
}
539
540
 
601
602
        if (pUVM->pdm.s.pModules)
602
603
        {
603
604
            /* we don't expect this list to be very long, so rather save the tail pointer. */
604
 
            PPDMMOD pCur = pUVM->pdm.s.pModules;
 
605
            pCur = pUVM->pdm.s.pModules;
605
606
            while (pCur->pNext)
606
607
                pCur = pCur->pNext;
607
608
            pCur->pNext = pModule;