diff options
author | Zhang Xiantao <xiantao.zhang@intel.com> | 2007-10-20 03:34:38 -0400 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2008-01-30 10:52:54 -0500 |
commit | 34c16eecf78ed4cf01f39ac7211f5b57942ec899 (patch) | |
tree | 9a9d6192db411cc3c7ff665cc94a8797eb55aa80 /drivers/kvm/kvm_main.c | |
parent | 8d4e1288ebb753d3140d81cb349f22b0a6829a4a (diff) |
KVM: Portability: Split kvm_vcpu into arch dependent and independent parts (part 1)
First step to split kvm_vcpu. Currently, we just use an macro to define
the common fields in kvm_vcpu for all archs, and all archs need to define
its own kvm_vcpu struct.
Signed-off-by: Zhang Xiantao <xiantao.zhang@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm/kvm_main.c')
-rw-r--r-- | drivers/kvm/kvm_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c index 8f6c21d02656..0b23657f434c 100644 --- a/drivers/kvm/kvm_main.c +++ b/drivers/kvm/kvm_main.c | |||
@@ -2244,7 +2244,7 @@ static int kvm_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) | |||
2244 | if (r) | 2244 | if (r) |
2245 | goto out; | 2245 | goto out; |
2246 | } | 2246 | } |
2247 | 2247 | #if CONFIG_HAS_IOMEM | |
2248 | if (vcpu->mmio_needed) { | 2248 | if (vcpu->mmio_needed) { |
2249 | memcpy(vcpu->mmio_data, kvm_run->mmio.data, 8); | 2249 | memcpy(vcpu->mmio_data, kvm_run->mmio.data, 8); |
2250 | vcpu->mmio_read_completed = 1; | 2250 | vcpu->mmio_read_completed = 1; |
@@ -2259,7 +2259,7 @@ static int kvm_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) | |||
2259 | goto out; | 2259 | goto out; |
2260 | } | 2260 | } |
2261 | } | 2261 | } |
2262 | 2262 | #endif | |
2263 | if (kvm_run->exit_reason == KVM_EXIT_HYPERCALL) { | 2263 | if (kvm_run->exit_reason == KVM_EXIT_HYPERCALL) { |
2264 | kvm_x86_ops->cache_regs(vcpu); | 2264 | kvm_x86_ops->cache_regs(vcpu); |
2265 | vcpu->regs[VCPU_REGS_RAX] = kvm_run->hypercall.ret; | 2265 | vcpu->regs[VCPU_REGS_RAX] = kvm_run->hypercall.ret; |