← 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/ATAController.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/Devices/Storage/ATAController.cpp
4692
4692
 
4693
4693
        cTransAvailable = (s->iIOBufferPIODataEnd - s->iIOBufferPIODataStart) / cb;
4694
4694
#ifndef IN_RING3
 
4695
        /* Deal with the unlikely case where no data (or not enough for the read length operation) is available; go back to ring 3. */
 
4696
        if (!cTransAvailable)
 
4697
        {
 
4698
            PDMCritSectLeave(&pCtl->lock);
 
4699
            return VINF_IOM_HC_IOPORT_READ;
 
4700
        }
4695
4701
        /* The last transfer unit cannot be handled in GC, as it involves thread communication. */
4696
4702
        cTransAvailable--;
4697
4703
#endif /* !IN_RING3 */
4738
4744
 
4739
4745
        cTransAvailable = (s->iIOBufferPIODataEnd - s->iIOBufferPIODataStart) / cb;
4740
4746
#ifndef IN_RING3
 
4747
        /* Deal with the unlikely case where no data (or not enough for the read length operation) is available; go back to ring 3. */
 
4748
        if (!cTransAvailable)
 
4749
        {
 
4750
            PDMCritSectLeave(&pCtl->lock);
 
4751
            return VINF_IOM_HC_IOPORT_WRITE;
 
4752
        }
4741
4753
        /* The last transfer unit cannot be handled in GC, as it involves thread communication. */
4742
4754
        cTransAvailable--;
4743
4755
#endif /* !IN_RING3 */