Prev: [088/200] md: remove unneeded sysfs files more promptly
Next: [138/200] gconfig: fix build failure on fedora 13
From: Greg KH on 1 Jul 2010 17:30
2.6.34-stable review patch. If anyone has any objections, please let me know.

------------------

From: Avi Kivity <avi(a)redhat.com>

Signed-off-by: Avi Kivity <avi(a)redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

(Cherry-picked from commit 98001d8d017cea1ee0f9f35c6227bbd63ef5005b)
---
arch/powerpc/kvm/book3s.c | 10 ++++++++++
arch/powerpc/kvm/booke.c | 15 ++++++++++++++-
2 files changed, 24 insertions(+), 1 deletion(-)

--- a/arch/powerpc/kvm/book3s.c
+++ b/arch/powerpc/kvm/book3s.c
@@ -922,6 +922,8 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct
struct kvmppc_vcpu_book3s *vcpu3s = to_book3s(vcpu);
int i;

+ vcpu_load(vcpu);
+
sregs->pvr = vcpu->arch.pvr;

sregs->u.s.sdr1 = to_book3s(vcpu)->sdr1;
@@ -940,6 +942,9 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct
sregs->u.s.ppc32.dbat[i] = vcpu3s->dbat[i].raw;
}
}
+
+ vcpu_put(vcpu);
+
return 0;
}

@@ -949,6 +954,8 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct
struct kvmppc_vcpu_book3s *vcpu3s = to_book3s(vcpu);
int i;

+ vcpu_load(vcpu);
+
kvmppc_set_pvr(vcpu, sregs->pvr);

vcpu3s->sdr1 = sregs->u.s.sdr1;
@@ -975,6 +982,9 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct

/* Flush the MMU after messing with the segments */
kvmppc_mmu_pte_flush(vcpu, 0, 0);
+
+ vcpu_put(vcpu);
+
return 0;
}

--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -479,6 +479,8 @@ int kvm_arch_vcpu_ioctl_get_regs(struct
{
int i;

+ vcpu_load(vcpu);
+
regs->pc = vcpu->arch.pc;
regs->cr = kvmppc_get_cr(vcpu);
regs->ctr = vcpu->arch.ctr;
@@ -499,6 +501,8 @@ int kvm_arch_vcpu_ioctl_get_regs(struct
for (i = 0; i < ARRAY_SIZE(regs->gpr); i++)
regs->gpr[i] = kvmppc_get_gpr(vcpu, i);

+ vcpu_put(vcpu);
+
return 0;
}

@@ -506,6 +510,8 @@ int kvm_arch_vcpu_ioctl_set_regs(struct
{
int i;

+ vcpu_load(vcpu);
+
vcpu->arch.pc = regs->pc;
kvmppc_set_cr(vcpu, regs->cr);
vcpu->arch.ctr = regs->ctr;
@@ -525,6 +531,8 @@ int kvm_arch_vcpu_ioctl_set_regs(struct
for (i = 0; i < ARRAY_SIZE(regs->gpr); i++)
kvmppc_set_gpr(vcpu, i, regs->gpr[i]);

+ vcpu_put(vcpu);
+
return 0;
}

@@ -553,7 +561,12 @@ int kvm_arch_vcpu_ioctl_set_fpu(struct k
int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,
struct kvm_translation *tr)
{
- return kvmppc_core_vcpu_translate(vcpu, tr);
+ int r;
+
+ vcpu_load(vcpu);
+ r = kvmppc_core_vcpu_translate(vcpu, tr);
+ vcpu_put(vcpu);
+ return r;
}

int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log)


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [088/200] md: remove unneeded sysfs files more promptly
Next: [138/200] gconfig: fix build failure on fedora 13