← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to src/VBox/VMM/VMMR3/PDMUsb.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-07-04 13:02:31 UTC
  • mfrom: (3.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20110704130231-l843es6wqhx614n7
Tags: 4.0.10-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Add the Modaliases control field manually for maximum backportability.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/VMM/VMMR3/PDMUsb.cpp
941
941
        Log(("PDM: Destructing USB device '%s' instance %d...\n", pUsbIns->pReg->szName, pUsbIns->iInstance));
942
942
        pUsbIns->pReg->pfnDestruct(pUsbIns);
943
943
    }
944
 
    //TMR3TimerDestroyUsb(pVM, pUsbIns);
 
944
    TMR3TimerDestroyUsb(pVM, pUsbIns);
945
945
    //SSMR3DeregisterUsb(pVM, pUsbIns, NULL, 0);
946
946
    pdmR3ThreadDestroyUsb(pVM, pUsbIns);
947
947
 
1324
1324
             pszDesc = pszDesc2;
1325
1325
    }
1326
1326
 
1327
 
    /** @todo
1328
 
    int rc = TMR3TimerCreateUsb(pVM, pUsbIns, enmClock, pfnCallback, pvUser, fFlags, pszDesc, ppTimer); */
1329
 
    int rc = VERR_NOT_IMPLEMENTED; AssertFailed();
 
1327
    int rc = TMR3TimerCreateUsb(pVM, pUsbIns, enmClock, pfnCallback, pvUser, fFlags, pszDesc, ppTimer);
1330
1328
 
1331
1329
    LogFlow(("pdmR3UsbHlp_TMTimerCreate: caller='%s'/%d: returns %Rrc\n", pUsbIns->pReg->szName, pUsbIns->iInstance, rc));
1332
1330
    return rc;