lkml.org 
[lkml]   [2007]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 015/104] KVM: Use standard CR8 flags, and fix TPR definition
    Date
    From: Rusty Russell <rusty@rustcorp.com.au>

    Intel manual (and KVM definition) say the TPR is 4 bits wide. Also fix
    CR8_RESEVED_BITS typo.

    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Acked-by: H. Peter Anvin <hpa@zytor.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>
    ---
    drivers/kvm/kvm_main.c | 4 ++--
    include/asm-i386/processor-flags.h | 2 +-
    2 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
    index 193197f..f0fc8d9 100644
    --- a/drivers/kvm/kvm_main.c
    +++ b/drivers/kvm/kvm_main.c
    @@ -92,7 +92,7 @@ static struct dentry *debugfs_dir;
    | X86_CR4_PGE | X86_CR4_PCE | X86_CR4_OSFXSR \
    | X86_CR4_OSXMMEXCPT | X86_CR4_VMXE))

    -#define CR8_RESEVED_BITS (~0x0fULL)
    +#define CR8_RESERVED_BITS (~(unsigned long)X86_CR8_TPR)
    #define EFER_RESERVED_BITS 0xfffffffffffff2fe

    #ifdef CONFIG_X86_64
    @@ -625,7 +625,7 @@ EXPORT_SYMBOL_GPL(set_cr3);

    void set_cr8(struct kvm_vcpu *vcpu, unsigned long cr8)
    {
    - if ( cr8 & CR8_RESEVED_BITS) {
    + if (cr8 & CR8_RESERVED_BITS) {
    printk(KERN_DEBUG "set_cr8: #GP, reserved bits 0x%lx\n", cr8);
    inject_gp(vcpu);
    return;
    diff --git a/include/asm-i386/processor-flags.h b/include/asm-i386/processor-flags.h
    index 5404e90..199cab1 100644
    --- a/include/asm-i386/processor-flags.h
    +++ b/include/asm-i386/processor-flags.h
    @@ -63,7 +63,7 @@
    /*
    * x86-64 Task Priority Register, CR8
    */
    -#define X86_CR8_TPR 0x00000007 /* task priority register */
    +#define X86_CR8_TPR 0x0000000F /* task priority register */

    /*
    * AMD and Transmeta use MSRs for configuration; see <asm/msr-index.h>
    --
    1.5.3
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-09-17 11:11    [W:0.023 / U:0.480 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site