← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2011-12-29 12:29:25 UTC
  • mfrom: (3.1.8 sid)
  • Revision ID: package-import@ubuntu.com-20111229122925-8ota2o33fuk0bkf8
Tags: 4.1.8-dfsg-1
* New upstream release.
* Move all transitional packages to section oldlibs and priority extra.
* Refresh 16-no-update.patch.
* Drop 36-kernel-3.2.patch, applied upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/VMM/VMMR3/EMHwaccm.cpp
303
303
        return VBOXSTRICTRC_TODO(rcStrict);     /* rip already updated. */
304
304
    }
305
305
    AssertMsgReturn(rcStrict == VERR_NOT_FOUND, ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)),
306
 
                    RT_SUCCESS_NP(rcStrict) ? VERR_INTERNAL_ERROR_5 : VBOXSTRICTRC_TODO(rcStrict));
 
306
                    RT_SUCCESS_NP(rcStrict) ? VERR_IPE_UNEXPECTED_INFO_STATUS : VBOXSTRICTRC_TODO(rcStrict));
307
307
 
308
308
    /** @todo probably we should fall back to the recompiler; otherwise we'll go back and forth between HC & GC
309
309
     *   as io instructions tend to come in packages of more than one
473
473
 */
474
474
int emR3HwAccExecute(PVM pVM, PVMCPU pVCpu, bool *pfFFDone)
475
475
{
476
 
    int      rc = VERR_INTERNAL_ERROR;
 
476
    int      rc = VERR_IPE_UNINITIALIZED_STATUS;
477
477
    PCPUMCTX pCtx = pVCpu->em.s.pCtx;
478
478
 
479
479
    LogFlow(("emR3HwAccExecute%d: (cs:eip=%04x:%RGv)\n", pVCpu->idCpu, pCtx->cs, (RTGCPTR)pCtx->rip));