← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to arch/x86/kvm/x86.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Upstream Kernel Changes
  • Date: 2012-03-27 17:01:30 UTC
  • Revision ID: package-import@ubuntu.com-20120327170130-qrvi60snnxty6ibi
Tags: 3.2.0-1411.14
https://launchpad.net/bugs/963512
[ Paolo Pisati ]

* Revert to Ubuntu-3.2.0-1409.12 until we figure out what's wrong with hdmi
  - LP: #963512

[ Upstream Kernel Changes ]

* Revert "Reapply upleveled PMU interrupt patch"
* KBuild: Allow scripts/* to be cross compiled
* LINARO: Use KBUILD_SCRIPTROOT to cross build scripts

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/x86/kvm/x86.c
4655
4655
        return kvm_x86_ops->check_intercept(emul_to_vcpu(ctxt), info, stage);
4656
4656
}
4657
4657
 
4658
 
static bool emulator_get_cpuid(struct x86_emulate_ctxt *ctxt,
4659
 
                               u32 *eax, u32 *ebx, u32 *ecx, u32 *edx)
4660
 
{
4661
 
        struct kvm_cpuid_entry2 *cpuid = NULL;
4662
 
 
4663
 
        if (eax && ecx)
4664
 
                cpuid = kvm_find_cpuid_entry(emul_to_vcpu(ctxt),
4665
 
                                            *eax, *ecx);
4666
 
 
4667
 
        if (cpuid) {
4668
 
                *eax = cpuid->eax;
4669
 
                *ecx = cpuid->ecx;
4670
 
                if (ebx)
4671
 
                        *ebx = cpuid->ebx;
4672
 
                if (edx)
4673
 
                        *edx = cpuid->edx;
4674
 
                return true;
4675
 
        }
4676
 
 
4677
 
        return false;
4678
 
}
4679
 
 
4680
4658
static struct x86_emulate_ops emulate_ops = {
4681
4659
        .read_std            = kvm_read_guest_virt_system,
4682
4660
        .write_std           = kvm_write_guest_virt_system,
4707
4685
        .get_fpu             = emulator_get_fpu,
4708
4686
        .put_fpu             = emulator_put_fpu,
4709
4687
        .intercept           = emulator_intercept,
4710
 
        .get_cpuid           = emulator_get_cpuid,
4711
4688
};
4712
4689
 
4713
4690
static void cache_all_regs(struct kvm_vcpu *vcpu)