{"id":807465,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807465/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20170830082702.3011-7-Sergio.G.DelReal@gmail.com>","date":"2017-08-30T08:26:55","name":"[v2,06/13] hvf: use new helper functions for put/get xsave","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"4b732c8a18a82e82efb77ad56ff3326fb693b1b6","submitter":{"id":70675,"url":"http://patchwork.ozlabs.org/api/1.0/people/70675/?format=json","name":"Sergio Andres Gomez Del Real","email":"sergio.g.delreal@gmail.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830082702.3011-7-Sergio.G.DelReal@gmail.com/mbox/","series":[{"id":548,"url":"http://patchwork.ozlabs.org/api/1.0/series/548/?format=json","date":"2017-08-30T08:26:49","name":"add support for Hypervisor.framework in QEMU","version":2,"mbox":"http://patchwork.ozlabs.org/series/548/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807465/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"VJtfQNqg\"; dkim-atps=neutral"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xhzDP5GP6z9t0M\n\tfor ;\n\tWed, 30 Aug 2017 18:28:37 +1000 (AEST)","from localhost ([::1]:48980 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmyMV-0002YY-Cz\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 04:28:35 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:60520)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmyLi-0002UC-JL\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:27:47 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmyLe-0000Mq-RQ\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:27:46 -0400","from mail-ua0-x242.google.com ([2607:f8b0:400c:c08::242]:34719)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1dmyLe-0000MV-MJ\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:27:42 -0400","by mail-ua0-x242.google.com with SMTP id 105so2346896uad.1\n\tfor ; Wed, 30 Aug 2017 01:27:42 -0700 (PDT)","from localhost.localdomain ([191.109.6.85])\n\tby smtp.gmail.com with ESMTPSA id\n\th74sm1079197vka.8.2017.08.30.01.27.40\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 30 Aug 2017 01:27:41 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=OkQLdaa875ZZxu2RJ1SbjpI6uzJU6+I2c2l5ub0vLac=;\n\tb=VJtfQNqg7ByjVStw7J7TZM3zHCHpdpYnmomwUvZpZmU27oxVaG0OWrOivjzezNEXSm\n\tO94stQihqnUsc++q6hpUjowa8Xw7cRkSG4IVTAkMPIm4uLbSXBvYIMRVw6hO7zHueN/E\n\tBe2EjZEygIChfHJZTMjXRftviP3di03CBGasxiOPd1KifzqBgTGqnWtCIqpH59y+Pxsn\n\tzSKjMrocKswO/A1TR4zcvMKT4JMCIiSmi9UdZxdMxbTybP0r3xf/JNhfa8v6OoVI5lvC\n\trZaKrrVH6hhVYfA4mf+HwkE73wt/ofYxnYqZqAqy06HNqUAkKIY+41DGz53Qaban3Kb7\n\tOwjA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=OkQLdaa875ZZxu2RJ1SbjpI6uzJU6+I2c2l5ub0vLac=;\n\tb=m0P3wH95IDWUwTh8Rfi7thmV+y2oJpxk2Yb2ABQHIijryMAT6+d9OvR+dSrahZkjjK\n\tHCwxTVn6bzK2hN01K34Q2A7ff8Iv+3r5hUVmjTJ9fUWwz2rh7dAHSMhZ/rVD9tUUXUWp\n\tIluT8Dn5t8l4nTMtFbFl3//MRcVg64zPLPODOjGIDd+qGnKSjlEmrjZ+eD4ZA8FXOgU0\n\trXXywzk3dZs4+jGLLEaJaWcthhgKzUbqC6h45LDthV6yGBn+zxjWEMFVAWLDB7A1YVUY\n\tiZJ4jJoJS4MsuWOFbKPnGbTwyazQn7mrtxE3jDo2dcC8cdgSl6kOcjcbYmDiViBAQQit\n\taX6w==","X-Gm-Message-State":"AHYfb5j0rF2YTCMmuVhvxYSpOhWqSxtzw32255QfGopOlXeWNF6eXl7x\n\tAq72bvxyrtygrAOo","X-Received":"by 10.159.34.134 with SMTP id 6mr460591uan.107.1504081661941;\n\tWed, 30 Aug 2017 01:27:41 -0700 (PDT)","From":"Sergio Andres Gomez Del Real ","X-Google-Original-From":"Sergio Andres Gomez Del Real\n\t","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 03:26:55 -0500","Message-Id":"<20170830082702.3011-7-Sergio.G.DelReal@gmail.com>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170830082702.3011-1-Sergio.G.DelReal@gmail.com>","References":"<20170830082702.3011-1-Sergio.G.DelReal@gmail.com>","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"2607:f8b0:400c:c08::242","Subject":"[Qemu-devel] [PATCH v2 06/13] hvf: use new helper functions for\n\tput/get xsave","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Sergio Andres Gomez Del Real ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"This commit makes use of the helper functions for handling xsave in\nxsave_helper.c, which are shared with kvm.\n\nSigned-off-by: Sergio Andres Gomez Del Real \n---\n target/i386/hvf-utils/x86hvf.c | 63 ++++++------------------------------------\n 1 file changed, 8 insertions(+), 55 deletions(-)","diff":"diff --git a/target/i386/hvf-utils/x86hvf.c b/target/i386/hvf-utils/x86hvf.c\nindex 967be2e7fe..819d760624 100644\n--- a/target/i386/hvf-utils/x86hvf.c\n+++ b/target/i386/hvf-utils/x86hvf.c\n@@ -76,36 +76,13 @@ void hvf_get_segment(SegmentCache *qseg, struct vmx_segment *vmx_seg)\n void hvf_put_xsave(CPUState *cpu_state)\n {\n \n- int x;\n struct hvf_xsave_buf *xsave;\n- \n+\n xsave = X86_CPU(cpu_state)->env.kvm_xsave_buf;\n- memset(xsave, 0, sizeof(*xsave)); \n- \n- memcpy(&xsave->data[4], &X86_CPU(cpu_state)->env.fpdp, sizeof(X86_CPU(cpu_state)->env.fpdp));\n- memcpy(&xsave->data[2], &X86_CPU(cpu_state)->env.fpip, sizeof(X86_CPU(cpu_state)->env.fpip));\n- memcpy(&xsave->data[8], &X86_CPU(cpu_state)->env.fpregs, sizeof(X86_CPU(cpu_state)->env.fpregs));\n- memcpy(&xsave->data[144], &X86_CPU(cpu_state)->env.ymmh_regs, sizeof(X86_CPU(cpu_state)->env.ymmh_regs));\n- memcpy(&xsave->data[288], &X86_CPU(cpu_state)->env.zmmh_regs, sizeof(X86_CPU(cpu_state)->env.zmmh_regs));\n- memcpy(&xsave->data[272], &X86_CPU(cpu_state)->env.opmask_regs, sizeof(X86_CPU(cpu_state)->env.opmask_regs));\n- memcpy(&xsave->data[240], &X86_CPU(cpu_state)->env.bnd_regs, sizeof(X86_CPU(cpu_state)->env.bnd_regs));\n- memcpy(&xsave->data[256], &X86_CPU(cpu_state)->env.bndcs_regs, sizeof(X86_CPU(cpu_state)->env.bndcs_regs));\n- memcpy(&xsave->data[416], &X86_CPU(cpu_state)->env.hi16_zmm_regs, sizeof(X86_CPU(cpu_state)->env.hi16_zmm_regs));\n- \n- xsave->data[0] = (uint16_t)X86_CPU(cpu_state)->env.fpuc;\n- xsave->data[0] |= (X86_CPU(cpu_state)->env.fpus << 16);\n- xsave->data[0] |= (X86_CPU(cpu_state)->env.fpstt & 7) << 11;\n- \n- for (x = 0; x < 8; ++x)\n- xsave->data[1] |= ((!X86_CPU(cpu_state)->env.fptags[x]) << x);\n- xsave->data[1] |= (uint32_t)(X86_CPU(cpu_state)->env.fpop << 16);\n- \n- memcpy(&xsave->data[40], &X86_CPU(cpu_state)->env.xmm_regs, sizeof(X86_CPU(cpu_state)->env.xmm_regs));\n- \n- xsave->data[6] = X86_CPU(cpu_state)->env.mxcsr;\n- *(uint64_t *)&xsave->data[128] = X86_CPU(cpu_state)->env.xstate_bv;\n- \n- if (hv_vcpu_write_fpstate(cpu_state->hvf_fd, xsave->data, 4096)){\n+\n+ x86_cpu_xsave_all_areas(X86_CPU(cpu_state), xsave);\n+\n+ if (hv_vcpu_write_fpstate(cpu_state->hvf_fd, xsave->data, 4096)) {\n abort();\n }\n }\n@@ -187,39 +164,15 @@ void hvf_put_msrs(CPUState *cpu_state)\n \n void hvf_get_xsave(CPUState *cpu_state)\n {\n- int x;\n struct hvf_xsave_buf *xsave;\n- \n+\n xsave = X86_CPU(cpu_state)->env.kvm_xsave_buf;\n- \n+\n if (hv_vcpu_read_fpstate(cpu_state->hvf_fd, xsave->data, 4096)) {\n abort();\n }\n \n- memcpy(&X86_CPU(cpu_state)->env.fpdp, &xsave->data[4], sizeof(X86_CPU(cpu_state)->env.fpdp));\n- memcpy(&X86_CPU(cpu_state)->env.fpip, &xsave->data[2], sizeof(X86_CPU(cpu_state)->env.fpip));\n- memcpy(&X86_CPU(cpu_state)->env.fpregs, &xsave->data[8], sizeof(X86_CPU(cpu_state)->env.fpregs));\n- memcpy(&X86_CPU(cpu_state)->env.ymmh_regs, &xsave->data[144], sizeof(X86_CPU(cpu_state)->env.ymmh_regs));\n- memcpy(&X86_CPU(cpu_state)->env.zmmh_regs, &xsave->data[288], sizeof(X86_CPU(cpu_state)->env.zmmh_regs));\n- memcpy(&X86_CPU(cpu_state)->env.opmask_regs, &xsave->data[272], sizeof(X86_CPU(cpu_state)->env.opmask_regs));\n- memcpy(&X86_CPU(cpu_state)->env.bnd_regs, &xsave->data[240], sizeof(X86_CPU(cpu_state)->env.bnd_regs));\n- memcpy(&X86_CPU(cpu_state)->env.bndcs_regs, &xsave->data[256], sizeof(X86_CPU(cpu_state)->env.bndcs_regs));\n- memcpy(&X86_CPU(cpu_state)->env.hi16_zmm_regs, &xsave->data[416], sizeof(X86_CPU(cpu_state)->env.hi16_zmm_regs));\n- \n- \n- X86_CPU(cpu_state)->env.fpuc = (uint16_t)xsave->data[0];\n- X86_CPU(cpu_state)->env.fpus = (uint16_t)(xsave->data[0] >> 16);\n- X86_CPU(cpu_state)->env.fpstt = (X86_CPU(cpu_state)->env.fpus >> 11) & 7;\n- X86_CPU(cpu_state)->env.fpop = (uint16_t)(xsave->data[1] >> 16);\n- \n- for (x = 0; x < 8; ++x)\n- X86_CPU(cpu_state)->env.fptags[x] =\n- ((((uint16_t)xsave->data[1] >> x) & 1) == 0);\n- \n- memcpy(&X86_CPU(cpu_state)->env.xmm_regs, &xsave->data[40], sizeof(X86_CPU(cpu_state)->env.xmm_regs));\n-\n- X86_CPU(cpu_state)->env.mxcsr = xsave->data[6];\n- X86_CPU(cpu_state)->env.xstate_bv = *(uint64_t *)&xsave->data[128];\n+ x86_cpu_xrstor_all_areas(X86_CPU(cpu_state), xsave);\n }\n \n void hvf_get_segments(CPUState *cpu_state)\n","prefixes":["v2","06/13"]}