← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/VBox/VMM/VMMAll/VMMAll.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/VMMAll/VMMAll.cpp
63
63
    return VMR3GetVMCPUId(pVM);
64
64
 
65
65
#elif defined(IN_RING0)
66
 
    if (pVM->cCPUs == 1)
 
66
    if (pVM->cCpus == 1)
67
67
        return 0;
68
68
    return HWACCMR0GetVMCPUId(pVM);
69
69
 
86
86
    VMCPUID idCpu = VMR3GetVMCPUId(pVM);
87
87
    if (idCpu == NIL_VMCPUID)
88
88
        return NULL;
89
 
    Assert(idCpu < pVM->cCPUs);
 
89
    Assert(idCpu < pVM->cCpus);
90
90
    return &pVM->aCpus[VMR3GetVMCPUId(pVM)];
91
91
 
92
92
#elif defined(IN_RING0)
93
 
    if (pVM->cCPUs == 1)
 
93
    if (pVM->cCpus == 1)
94
94
        return &pVM->aCpus[0];
95
95
    return HWACCMR0GetVMCPU(pVM);
96
96
 
108
108
 */
109
109
VMMDECL(PVMCPU) VMMGetCpu0(PVM pVM)
110
110
{
111
 
    Assert(pVM->cCPUs == 1);
 
111
    Assert(pVM->cCpus == 1);
112
112
    return &pVM->aCpus[0];
113
113
}
114
114
 
123
123
 */
124
124
VMMDECL(PVMCPU) VMMGetCpuById(PVM pVM, RTCPUID idCpu)
125
125
{
126
 
    AssertReturn(idCpu < pVM->cCPUs, NULL);
 
126
    AssertReturn(idCpu < pVM->cCpus, NULL);
127
127
    return &pVM->aCpus[idCpu];
128
128
}
129
129
 
152
152
{
153
153
    return pVM->vmm.s.enmSwitcher;
154
154
}
155