From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45787)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <agraf@suse.de>) id 1X5YeN-0005hV-Nr
	for qemu-devel@nongnu.org; Fri, 11 Jul 2014 07:06:05 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <agraf@suse.de>) id 1X5YeH-0008Io-C1
	for qemu-devel@nongnu.org; Fri, 11 Jul 2014 07:05:59 -0400
Message-ID: <53BFC50D.3060706@suse.de>
Date: Fri, 11 Jul 2014 13:05:49 +0200
From: Alexander Graf <agraf@suse.de>
MIME-Version: 1.0
References: <1405075131-2721-1-git-send-email-cornelia.huck@de.ibm.com>
	<1405075131-2721-2-git-send-email-cornelia.huck@de.ibm.com>
In-Reply-To: <1405075131-2721-2-git-send-email-cornelia.huck@de.ibm.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH for-2.1 1/1] s390x/kvm: synchronize guest
 floating point registers
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Cornelia Huck <cornelia.huck@de.ibm.com>, qemu-devel@nongnu.org
Cc: borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, "Jason J. Herne" <jjherne@us.ibm.com>, qemu-stable@nongnu.org


On 11.07.14 12:38, Cornelia Huck wrote:
> From: "Jason J. Herne" <jjherne@us.ibm.com>
>
> Add code to kvm_arch_get_registers and kvm_arch_put_registers to
> save/restore floating point registers. This missing sync was
> unnoticed until migration of userspace that uses fprs.
>
> Signed-off-by: Jason J. Herne <jjherne@us.ibm.com>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> [Update patch to latest upstream]
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
> ---
>   target-s390x/kvm.c |   23 +++++++++++++++++++++++
>   1 file changed, 23 insertions(+)
>
> diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
> index a6e587b..144189b 100644
> --- a/target-s390x/kvm.c
> +++ b/target-s390x/kvm.c
> @@ -207,6 +207,7 @@ int kvm_arch_put_registers(CPUState *cs, int level)
>       CPUS390XState *env = &cpu->env;
>       struct kvm_sregs sregs;
>       struct kvm_regs regs;
> +    struct kvm_fpu fpu;
>       int r;
>       int i;
>   
> @@ -229,6 +230,17 @@ int kvm_arch_put_registers(CPUState *cs, int level)
>           }
>       }
>   
> +    /* Floating point */
> +    for (i = 0; i < 16; i++) {
> +        fpu.fprs[i] = env->fregs[i].ll;
> +    }
> +    fpu.fpc = env->fpc;
> +
> +    r = kvm_vcpu_ioctl(cs, KVM_SET_FPU, &fpu);
> +    if (r < 0) {
> +        return r;
> +    }
> +
>       /* Do we need to save more than that? */
>       if (level == KVM_PUT_RUNTIME_STATE) {
>           return 0;
> @@ -296,6 +308,7 @@ int kvm_arch_get_registers(CPUState *cs)
>       CPUS390XState *env = &cpu->env;
>       struct kvm_sregs sregs;
>       struct kvm_regs regs;
> +    struct kvm_fpu fpu;
>       int i, r;
>   
>       /* get the PSW */
> @@ -336,6 +349,16 @@ int kvm_arch_get_registers(CPUState *cs)
>           }
>       }
>   
> +    /* Floating point */
> +    r = kvm_vcpu_ioctl(cs, KVM_GET_FPU, &fpu);
> +    if (r < 0) {
> +            return r;
> +        }

Broken indentation.


Alex

> +    for (i = 0; i < 16; i++) {
> +        env->fregs[i].ll = fpu.fprs[i];
> +    }
> +    env->fpc = fpu.fpc;
> +
>       /* The prefix */
>       if (cap_sync_regs && cs->kvm_run->kvm_valid_regs & KVM_SYNC_PREFIX) {
>           env->psa = cs->kvm_run->s.regs.prefix;