From 540d74da7ab3c6f19268ba1dbacf70c01a61c7b7 Mon Sep 17 00:00:00 2001 From: Zhang xiantao Date: Mon, 19 Nov 2007 14:56:05 +0800 Subject: [PATCH] Move vcpu regs enumeration defintion to x86.h Signed-off-by: Zhang xiantao --- drivers/kvm/kvm.h | 35 ----------------------------------- drivers/kvm/x86.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h index 922ff5e..a76b212 100644 --- a/drivers/kvm/kvm.h +++ b/drivers/kvm/kvm.h @@ -150,41 +150,6 @@ struct kvm_guest_debug { int singlestep; }; -enum { - VCPU_REGS_RAX = 0, - VCPU_REGS_RCX = 1, - VCPU_REGS_RDX = 2, - VCPU_REGS_RBX = 3, - VCPU_REGS_RSP = 4, - VCPU_REGS_RBP = 5, - VCPU_REGS_RSI = 6, - VCPU_REGS_RDI = 7, -#ifdef CONFIG_X86_64 - VCPU_REGS_R8 = 8, - VCPU_REGS_R9 = 9, - VCPU_REGS_R10 = 10, - VCPU_REGS_R11 = 11, - VCPU_REGS_R12 = 12, - VCPU_REGS_R13 = 13, - VCPU_REGS_R14 = 14, - VCPU_REGS_R15 = 15, -#endif - NR_VCPU_REGS -}; - -enum { - VCPU_SREG_CS, - VCPU_SREG_DS, - VCPU_SREG_ES, - VCPU_SREG_FS, - VCPU_SREG_GS, - VCPU_SREG_SS, - VCPU_SREG_TR, - VCPU_SREG_LDTR, -}; - -#include "x86_emulate.h" - struct kvm_pio_request { unsigned long count; int cur_count; diff --git a/drivers/kvm/x86.h b/drivers/kvm/x86.h index ce16d18..ac3485a 100644 --- a/drivers/kvm/x86.h +++ b/drivers/kvm/x86.h @@ -55,6 +55,41 @@ extern spinlock_t kvm_lock; extern struct list_head vm_list; +enum { + VCPU_REGS_RAX = 0, + VCPU_REGS_RCX = 1, + VCPU_REGS_RDX = 2, + VCPU_REGS_RBX = 3, + VCPU_REGS_RSP = 4, + VCPU_REGS_RBP = 5, + VCPU_REGS_RSI = 6, + VCPU_REGS_RDI = 7, +#ifdef CONFIG_X86_64 + VCPU_REGS_R8 = 8, + VCPU_REGS_R9 = 9, + VCPU_REGS_R10 = 10, + VCPU_REGS_R11 = 11, + VCPU_REGS_R12 = 12, + VCPU_REGS_R13 = 13, + VCPU_REGS_R14 = 14, + VCPU_REGS_R15 = 15, +#endif + NR_VCPU_REGS +}; + +enum { + VCPU_SREG_CS, + VCPU_SREG_DS, + VCPU_SREG_ES, + VCPU_SREG_FS, + VCPU_SREG_GS, + VCPU_SREG_SS, + VCPU_SREG_TR, + VCPU_SREG_LDTR, +}; + +#include "x86_emulate.h" + struct kvm_vcpu { KVM_VCPU_COMM; u64 host_tsc; -- 1.5.0.5