Patchwork powerpc/kvm: Copy the pvr value after memset

login
register
mail settings
Submitter Aneesh Kumar K.V
Date Aug. 22, 2013, 11:38 a.m.
Message ID <1377171519-25900-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/269029/
State Not Applicable
Headers show

Comments

Aneesh Kumar K.V - Aug. 22, 2013, 11:38 a.m.
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>

Otherwise we would clear the pvr value

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
 arch/powerpc/kvm/book3s_hv.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
Alexander Graf - Aug. 22, 2013, 4:47 p.m.
On 22.08.2013, at 12:38, Aneesh Kumar K.V wrote:

> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
> 
> Otherwise we would clear the pvr value
> 
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

Thanks, applied to kvm-ppc-queue. Next time please do whitespace changes in a separate patch.


Alex

> ---
> arch/powerpc/kvm/book3s_hv.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
> index 2efa9dd..dd1b72c 100644
> --- a/arch/powerpc/kvm/book3s_hv.c
> +++ b/arch/powerpc/kvm/book3s_hv.c
> @@ -680,13 +680,12 @@ static int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
> }
> 
> int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,
> -                                  struct kvm_sregs *sregs)
> +				  struct kvm_sregs *sregs)
> {
> 	int i;
> 
> -	sregs->pvr = vcpu->arch.pvr;
> -
> 	memset(sregs, 0, sizeof(struct kvm_sregs));
> +	sregs->pvr = vcpu->arch.pvr;
> 	for (i = 0; i < vcpu->arch.slb_max; i++) {
> 		sregs->u.s.ppc64.slb[i].slbe = vcpu->arch.slb[i].orige;
> 		sregs->u.s.ppc64.slb[i].slbv = vcpu->arch.slb[i].origv;
> @@ -696,7 +695,7 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,
> }
> 
> int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,
> -                                  struct kvm_sregs *sregs)
> +				  struct kvm_sregs *sregs)
> {
> 	int i, j;
> 
> -- 
> 1.8.1.2
> 
> --
> To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 2efa9dd..dd1b72c 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -680,13 +680,12 @@  static int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
 }
 
 int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,
-                                  struct kvm_sregs *sregs)
+				  struct kvm_sregs *sregs)
 {
 	int i;
 
-	sregs->pvr = vcpu->arch.pvr;
-
 	memset(sregs, 0, sizeof(struct kvm_sregs));
+	sregs->pvr = vcpu->arch.pvr;
 	for (i = 0; i < vcpu->arch.slb_max; i++) {
 		sregs->u.s.ppc64.slb[i].slbe = vcpu->arch.slb[i].orige;
 		sregs->u.s.ppc64.slb[i].slbv = vcpu->arch.slb[i].origv;
@@ -696,7 +695,7 @@  int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,
 }
 
 int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,
-                                  struct kvm_sregs *sregs)
+				  struct kvm_sregs *sregs)
 {
 	int i, j;