← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/VBox/Devices/Input/DevPS2.cpp

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2012-06-21 12:31:17 UTC
  • mfrom: (3.1.17 sid)
  • Revision ID: package-import@ubuntu.com-20120621123117-xo4y7f94ofy9p2hp
Tags: 4.1.18-dfsg-1
https://launchpad.net/bugs/1012627
https://launchpad.net/bugs/1013368
* New upstream release.
  - Fixes host freezes with 64-bit guests on 32-bit hosts. (LP: #1012627)
  - Fixes odd permissions of files in shared folders. (LP: #1013368)
* Drop 37-fix-unregister-netdevice.patch, fixed upstream.
* Compress orig tarball and binary packages with xz.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Devices/Input/DevPS2.cpp
543
543
#ifndef IN_RING3
544
544
        rc = VINF_IOM_HC_IOPORT_WRITE;
545
545
#else /* IN_RING3 */
 
546
        LogRel(("Reset initiated by keyboard controller\n"));
546
547
        rc = PDMDevHlpVMReset(s->CTX_SUFF(pDevIns));
547
548
#endif /* !IN_RING3 */
548
549
        break;