From nobody Sat Oct 25 02:31:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521039297740229.24545732990214; Wed, 14 Mar 2018 07:54:57 -0700 (PDT) Received: from localhost ([::1]:46651 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ew7no-00042u-Pl for importer@patchew.org; Wed, 14 Mar 2018 10:54:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53481) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ew7mI-0002fS-L6 for qemu-devel@nongnu.org; Wed, 14 Mar 2018 10:53:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ew7mE-0001AC-1Z for qemu-devel@nongnu.org; Wed, 14 Mar 2018 10:53:18 -0400 Received: from mail-co1nam03on0105.outbound.protection.outlook.com ([104.47.40.105]:27552 helo=NAM03-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ew7mD-00018f-QE for qemu-devel@nongnu.org; Wed, 14 Mar 2018 10:53:13 -0400 Received: from DESKTOP-CS4P60I.corp.microsoft.com (2001:4898:80e8:d::573) by DM5PR21MB0171.namprd21.prod.outlook.com (2603:10b6:3:a5::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.609.2; Wed, 14 Mar 2018 14:53:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=9Ve4pkDYRRWgAhZRX5ArFSVuShaSgV06ikC6TGMQI/8=; b=SLtFx5/MAIYU4+KZ8ioWyBDImafql9Ospv4blaNjJRfEqUUfaA7oceeW6TZbfYlCL/dC3jdL6/0FKOLzJHlJroD6cRY4JI9nXj1J8uLOJtHL0atdZYi4VJ4Qnsbywoy3cLQYniO+Zcm7yUgtCmk9D1I52eVZaCf17inR2GGVemI= To: qemu-devel@nongnu.org Date: Wed, 14 Mar 2018 07:52:41 -0700 Message-Id: <1521039163-138-2-git-send-email-juterry@microsoft.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521039163-138-1-git-send-email-juterry@microsoft.com> References: <1521039163-138-1-git-send-email-juterry@microsoft.com> MIME-Version: 1.0 X-Originating-IP: [2001:4898:80e8:d::573] X-ClientProxiedBy: SN2PR01CA0002.prod.exchangelabs.com (2603:10b6:804:2::12) To DM5PR21MB0171.namprd21.prod.outlook.com (2603:10b6:3:a5::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 5cf0b63f-4f67-4dfd-0ca0-08d589bb4e0e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR21MB0171; X-Microsoft-Exchange-Diagnostics: 1; DM5PR21MB0171; 3:byKwoDC5I0imLwygwGD1BmqVrlmoREIs64m/M6g84j7vX8pfXaS5yglXOcbUpYjex420u2mlwqc03N1DDO3KLN7JSVvZjAiKGWnCfhXa29BL2MOHWWBxD+6zCPPGskd1/GSupnlNTh1+U24/eR8V8om3m6+47HLqcYXqIExiS6+ZU9/WWK8bmZ6cmmjQW0a+yaW4tU0m+HgiOjdgAONJ2u322ZJYPzZv/I+8HgxXp2p7kw0cNRLxY05FgumsoSe1; 25:GbCXFLRHtGknKJS4HmaTq7bRFhgHXFlB4tfGstqHtyueWuGUst7EmFYS0MUJgHGUdCcdm3V9xcjDEyzLlXvB0fYf0Flf0blmdsKKLTkSiqacDNAgsYP4d57NpZ+H08FQ683bARNMLQ6p8cKRXHc5opLl+1qsbdsjyao7h6WSpnU0JsvYHbJVaeWogfBsIA8tLrxe3U5B6eXG6IArKFK5FmM/NCE1l+XeBjnqvLzQaUX5K3goD16MN5/GQuqzAuPx1542DNHiPLsaroDtKZsC/AeZB96UyDm64nytUzNMA0uI0+gIhYl0Ikh6glHUkjAVl2pll1OcunTEHsfjJ+GFKg==; 31:qSDeeqpSj2rR+0mH9Yk/boGlrMp93uUF1ZWeHU0zDQ7qd+Dltly/cvfNQRUJ3tvp7GZjt/+2QkrH9gkuTMehNXMTrew8irFH4Sn23u/VMBykBcVSGAlyXkFTzQNL3a3wvMXTLEdYkLY4HDiX9roCk2/WSH+LSjsTpD4RUnT+EjE/4gk3Ktjn5ZqRv67m5kuK05Zec7lkB85JHYtIbT6I+Tu0M89b5V5VSOlzkxD7TF8= X-MS-TrafficTypeDiagnostic: DM5PR21MB0171: X-Microsoft-Exchange-Diagnostics: 1; DM5PR21MB0171; 20:ov462YCIsbegnrEEL62hUFL9WU71L3M2FeQiBD+XRv0+DiJLG8SVaBAIRko15I6OJ5li9vbI3QEJtFVvScDl13sVc2wsBMuMoTUPPYFU3a3GV4LVeK7c5/PZQfWfdZ8TAR4I3f3uL+0Dsx6WTvH93TFSyTAKpml8/hwrf2NnagduRdN6dZqBM6vh6g0/yccYsAJ6B23zoH0EsFGa5AgDKgE/DYI/tkEP2ggXvbQZrFPLB2NHD0TFNjbs0QC/MjdXlutTf2TsHb2gnWtEqepvI4hhQKTbJ0j+ohp5XGbMxnjHnXq/+b7kaE/S1ghOBDZs9+ZxMOhiwEmfZQ3ZbISCdFa9XFSFuRLn5MFl4bSRzuYeDaOLSwUdRczDP32clB06kfXuuXs6H5rXyz7U5w1YuE1gYIrW2ObjNyCc4t+m0cV6oaNepJ8yhAA0dHYbOiYuzJMxDPu+k8Iu3EY6CQSa97/UtopTTp6EzQwguNHmA+bsZPbaYoZg6BYQHKegJStP; 4:/OkFhoq6CjgTBY6WKRnwBZ1g2W8u3lLpxcPfJOfebU8iKd4KqnIhZoEnQcECvubezWGNXPeMB04Gok8vDVh/goOQlW3sufpeEbesrWGadufxDO94lfwt6ffi3BtJ2lZ1xUeNv+9rqjwcX1Ir+yPwE869oDCoU7YRhsi+GI/weYemmhQzF/D1QaNXQL55scqbnTXlFD9Dqh60Wjw8mPfTwnqCTGJVU7VxiRNpG0kWxz2upCFi6J8D3owL+fTgT1XPB4BxJkt+e4sw3ctvP+Dzrk05mxoD+exme2GVAsKIlAguHr510oLgG5jOcoh54/232DE3bbKz5NRREb08aPmR+ueStYStaze2N6WMFZ0+nP0= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(28532068793085)(89211679590171); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(3231221)(944501260)(52105095)(6055026)(61426038)(61427038)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR21MB0171; BCL:0; PCL:0; RULEID:; SRVR:DM5PR21MB0171; X-Forefront-PRVS: 0611A21987 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6029001)(39860400002)(346002)(366004)(376002)(39380400002)(396003)(189003)(199004)(36756003)(2906002)(22452003)(59450400001)(25786009)(16526019)(46003)(52396003)(16586007)(316002)(86362001)(51416003)(6346003)(8676002)(6486002)(186003)(7696005)(8936002)(52116002)(50226002)(5660300001)(10090500001)(305945005)(386003)(53936002)(105586002)(76176011)(81156014)(81166006)(10290500003)(6116002)(7736002)(68736007)(2351001)(106356001)(2361001)(107886003)(47776003)(4326008)(2950100002)(6666003)(6916009)(478600001)(48376002)(86612001)(97736004)(50466002); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR21MB0171; H:DESKTOP-CS4P60I.corp.microsoft.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=juterry@microsoft.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR21MB0171; 23:fuxZZKbUb57lbBPNvfzjoN9dYQDdZww/nlBfup3gV?= =?us-ascii?Q?eJEbaWOEHttsOALUmL2s9hktrilz+Nz+aFyciH+1PWhDKtnom2s2vDHa73V1?= =?us-ascii?Q?tkSxAPCD2sdtH5a8MWXsfjQlFfDg4tUjtMebzNFkdyRe+3IYvaGYmSk8t5ay?= =?us-ascii?Q?tNR6DvYyljQ5FLWFJ/3sZvhHrEU+HxaYw82foVmYxNjUyVaUvCsiK1fYSsRW?= =?us-ascii?Q?UI1tC2u47lnf8ylq/KJAmXc0tD1oqnW1Rbr7KH9u9Pt6cgcF1SQEi62YMSZ5?= =?us-ascii?Q?vc99hudJg+TUcokeqYvaJ9GbsZIMO5Kv04alw1i53w+mNYlJLKjKof9mjxDk?= =?us-ascii?Q?qsYVAZ8ykuvQ8jSYVZqONhVsU+ulXW6pbCXP3fi9fjUDftfqM+eWx8YhVOZI?= =?us-ascii?Q?XK029W6V0y0oeojMMuwyNF4ZifBtOqZhAYYjJDRQximM48ePc46d24NwL86g?= =?us-ascii?Q?ELERjWuVNrxX+XrxPOK/FZUcqVQljvVkaEp4otUTUd4+2oR/1O92mF7fipba?= =?us-ascii?Q?fjXJ/feViSl1CdR5idq63s7gRu4x4jqrQkuJ9pZElmwQZOO79pWcSU4uu3tW?= =?us-ascii?Q?2NAOb33PODWa4lQ11Ao/GRgPRExQfkCfViRYHK0vhyjo1kJxQcOBvrpjvqvB?= =?us-ascii?Q?R2VtMzknzixBv9KTEIVgo5oHR7xjiZgANUEkFu/kOqQE6WZGJSuUTyFRN7ZH?= =?us-ascii?Q?rcCnWa8t+nTaf4D1qHg3ulJA0dn1fxk4X5LWVGXdDji+pT/gCX7PPlmh7r1A?= =?us-ascii?Q?3oNBL2B3rXdSg/G7aLYR3MOHZTPjngYwkIgN+hd9/Sqc9oF/j9wWT3imU3xE?= =?us-ascii?Q?iseYbhaOI26qmL+9PEJN8nn/66HjiNkbVmyXz2nEcBCJOlmjIJJ5zzU2tpPK?= =?us-ascii?Q?Y7Pz9nBHFiqsP6JPq7Xb+DqXdaxVvCQ8aVKnY7CgyKAv+HMlXEoIA40n/o+x?= =?us-ascii?Q?Dt3coaR0lSPMqFyrCUkKeNCdb5+eEPCe4ZXzQyymQYdbmpvARZsKBW6Mxbr8?= =?us-ascii?Q?ZI4Rv4BXkbs9ZerkMMmTxNg1SoGdt1tV/mDWhsfnQ0Qdh1QrQChG/aHbd2lK?= =?us-ascii?Q?W3ILSbYtlljMS3nnsKvIou8kz7ytfIJXvXJGNobVmSby9M1pTjXgtM1FEmW7?= =?us-ascii?Q?hduixIeLkXHcv4dRRhrWpyxDCgmfpoYxn+BOHQ4yp6vudCyn4SD/eCNbKrVo?= =?us-ascii?Q?RynF9vODlBJNzeg5bjJ2SoENY1R1JUEO2psODdpeHE1NhzwNUBanJHRlvSM3?= =?us-ascii?Q?dOPsPi3aZ0vzcMnK1wQoEelAVdnCNQm9o1yo7pwjAdalRU6nUzcrTHdjSC1q?= =?us-ascii?B?QT09?= X-Microsoft-Antispam-Message-Info: 9n/hW4I8CE0LEw/ZjBCZLlyIVapnRiYQeOEyeO1Viu9VzWtG7LEVK4Ur5UylnjL3s+lA9oKyOfqyw9KR9cr9+Fw2paOvTfzi4hWb51lczFT1FVxxLkNvOaVGIYX2JgqAIa6D4kbBJTpbbvuDyHk/Ns4YNEGO/LZrIQeSu4U+pgrf5vW1XMq6Ll/Jxe/mIHKE X-Microsoft-Exchange-Diagnostics: 1; DM5PR21MB0171; 6:ddYIr7b5UeRQw8iWv8jiO4/xcH5b7zmKd4mvU+QVdmtxJ3j8Z/ECa9OSdYk4m6i28xRutXl+yHCd8tMyN/e5BB8uniTtPoJkH0eS1n9poy4a3aQF7B0phCsux9PemC7rKUyM3Jl0Rjky7CIbkDMDzos+mrUsyWcg6Iu6JRu4MNXR06wSehG5EjbuMHO+yeoodu0GPoDsa/gr3qUqexGc+/wAvmKaVDe9+mKR6+ivltIdt4kiDM4tdAhm2awmYn+gIOUj6Agblb9XRHVM9NZY+V/SuUlZ+VN046UCP7kfpfPls+oE7L2H/SY2tx+MkXwuJR/3Ze1Fc6G3hiDmXcfJyqLkRf4/9HbpslHaGS7OpK+NrMYN/R8HBJNd1GfXNgEk2VUCD/QZJVik8v6EL15nRVmF1Ln+hBh0srPtOxcxGczQ5BfM5naPHfYEf8c5agJUi084Nav3g0XMcWvYxzBXhg==; 5:OX3rXrXfg7w9PMmD94GcwFSjV1eR7GE8C+QdH5B1rOVkcS9cZJ5DlPH/FvIK6rHu14CurBECzUJr7I5cGDoOmjH1D/RKl+Lgt6Wrs6Bw4gE+xn8R7yta3GcRTGb6JaJpGt7TQcG4MLro+Aorbm0By0fXyF7W+2qSV+RUZ/gC6xo=; 24:VT355dyLqXmhgWbHZSkMm70iMeWFKhu8PVWa4pfcap1iVY1o0HP6ixNOX4pnW6gbspOr12+roqEVtrfqxHGD+hROdIvbBv3sK+vRAReDeYM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR21MB0171; 7:EhDL2uWrA9S0XgsX2Lo44oCVEqHLuihyH0a+PTtF4DTnGB2PzFQYQlM4RzqkwKNZ9r3C5ghDLmopghhHlZ+GhOm+lMQs28TK4Pest7VPLfaIc91o/Fc3GVzFdNvs5rubxYhvzvBiT435RjVt+FFY0AAod0KezJF6MaFuImniyj2NDvXnLnkLlKxxURkEEc3q3rdX2CfIUmyJAxDZIJ7DErtrM5ES8Duq5bFuGPNrqjS+pr6f/wrLcQ+4G4vykMGN; 20:hUuDsXErInvMh5U35qHTJqdYC4i0g9oCYhYBwZ1F+4dw/lTlQWpzIGV3oesIu2CgN4L5/+8krkFKtq7+ttMyZ1hc8Ou+tzUwFq/o/sHBzeNy9Fh16/3XoXQjHeZB7yQWZddXBOb9yZhY7knBYov2AMnA+/ppa/XMosXELfO0DQU= X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2018 14:53:09.8921 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5cf0b63f-4f67-4dfd-0ca0-08d589bb4e0e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR21MB0171 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.105 Subject: [Qemu-devel] [PATCH 1/3] WHPX fix WHvGetCapability out WrittenSizeInBytes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: "Justin Terry \(VM\) via Qemu-devel" Reply-To: "Justin Terry \(VM\)" Cc: pbonzini@redhat.com, "Justin Terry \(VM\)" , ehabkost@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This fixes a breaking change to WHvGetCapability to include the 'out' WrittenSizeInBytes introduced in Windows Insider SDK 17110. This specifies on return the safe length to read into the WHV_CAPABILITY structure passed to the call. Signed-off-by: Justin Terry (VM) --- configure | 4 +++- target/i386/whpx-all.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure b/configure index af72fc852e..1ad153cdfb 100755 --- a/configure +++ b/configure @@ -2491,7 +2491,9 @@ if test "$whpx" !=3D "no" ; then #include int main(void) { WHV_CAPABILITY whpx_cap; - WHvGetCapability(WHvCapabilityCodeFeatures, &whpx_cap, sizeof(whpx_cap= )); + UINT32 writtenSize; + WHvGetCapability(WHvCapabilityCodeFeatures, &whpx_cap, sizeof(whpx_cap= ), + &writtenSize); return 0; } EOF diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c index 940bbe590d..2080d58c4c 100644 --- a/target/i386/whpx-all.c +++ b/target/i386/whpx-all.c @@ -1254,6 +1254,7 @@ static int whpx_accel_init(MachineState *ms) int ret; HRESULT hr; WHV_CAPABILITY whpx_cap; + UINT32 whpx_cap_size; WHV_PARTITION_PROPERTY prop; =20 whpx =3D &whpx_global; @@ -1262,7 +1263,7 @@ static int whpx_accel_init(MachineState *ms) whpx->mem_quota =3D ms->ram_size; =20 hr =3D WHvGetCapability(WHvCapabilityCodeHypervisorPresent, &whpx_cap, - sizeof(whpx_cap)); + sizeof(whpx_cap), &whpx_cap_size); if (FAILED(hr) || !whpx_cap.HypervisorPresent) { error_report("WHPX: No accelerator found, hr=3D%08lx", hr); ret =3D -ENOSPC; --=20 2.13.6 From nobody Sat Oct 25 02:31:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521039417317900.0718256496201; Wed, 14 Mar 2018 07:56:57 -0700 (PDT) Received: from localhost ([::1]:46667 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ew7po-0005ve-Hz for importer@patchew.org; Wed, 14 Mar 2018 10:56:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53484) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ew7mI-0002fT-LG for qemu-devel@nongnu.org; Wed, 14 Mar 2018 10:53:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ew7mE-0001AY-Fs for qemu-devel@nongnu.org; Wed, 14 Mar 2018 10:53:18 -0400 Received: from mail-co1nam03on0105.outbound.protection.outlook.com ([104.47.40.105]:27552 helo=NAM03-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ew7mE-00018f-8K for qemu-devel@nongnu.org; Wed, 14 Mar 2018 10:53:14 -0400 Received: from DESKTOP-CS4P60I.corp.microsoft.com (2001:4898:80e8:d::573) by DM5PR21MB0171.namprd21.prod.outlook.com (2603:10b6:3:a5::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.609.2; Wed, 14 Mar 2018 14:53:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=hVg3LUiqHx2kDIgItwk278RFUHRyEl0Eh+oo/8Gi9SQ=; b=WbPNpCIO+rFP7Wp0nnFbi7vdLr1E859BgEwgRd39xpFTAhf/snsEToi0/Lg4XYfHNRvGKt7toY02dNU/6vLPSpTC7kq5oJe9M7Nx3YBCauxFZaJHTU8AsIrywWdrtsJS8hv5JtMcuoT6OiO9iZ2HDq+mZ8/DZx9qV+I6LAB5HDY= To: qemu-devel@nongnu.org Date: Wed, 14 Mar 2018 07:52:42 -0700 Message-Id: <1521039163-138-3-git-send-email-juterry@microsoft.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521039163-138-1-git-send-email-juterry@microsoft.com> References: <1521039163-138-1-git-send-email-juterry@microsoft.com> MIME-Version: 1.0 X-Originating-IP: [2001:4898:80e8:d::573] X-ClientProxiedBy: SN2PR01CA0002.prod.exchangelabs.com (2603:10b6:804:2::12) To DM5PR21MB0171.namprd21.prod.outlook.com (2603:10b6:3:a5::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 6cdc97ab-2527-42cc-70b7-08d589bb4e94 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR21MB0171; X-Microsoft-Exchange-Diagnostics: 1; DM5PR21MB0171; 3:Wv2ofUV4wMEjXnzgnbMF/l7ma6hTNDH0jz+DQ3THxkFEo0jSOlfH19C9OQlfZVh3sqTw9LmQL97iC1XxgTN9bPs/G2QTF8X4nP+i6nenf1Ze/5M9jiclJPR2p/x5h0642z7N9rNcSDTtUd6MVIFv+UZZQjD7ShGSZMBoFxq+1w9BOJGgghjls0yzNffNgBLdaS/MEIegicxebr+1CdJ9xeFKa8F7/CYFIEDWgbfYJd33iHWIS88Qi7TdeyUStuLy; 25:K0Me2tnD6s1anC0+LbvtSLws33LVpWgmhdK+FwARcTAfxbOs4+DInUqw1KLqbh5i1HzJnmjptyRnMm4Gm+mdPNSrpr/M6cCi6s/RYEBU2uvQELrl7J5Da+QAP87gZN3FEdoShuVgs6QJcdQg3vu1Fevt8Yr2kDohaDbcJM5UQ0mpqWc0573Oep3oImJFzLy44n3gJBfgAmU+jisC4gg/ZfASXn59RYZnGD7hDiyRWwXb9KoUl+0wk7tC/ak/SeCmaZL/J8aYXsDXoDX7UpiT+Yk3GNiFn6g1UWqySBSTxpXp+oN12C/AvhzKujd8qwmgWrh6YOCLAgrbAf32e9eDMQ==; 31:bg12qylbe9pOqoXbj/WH4HyXptEJeX4JiYNSV8m1VAQXa29fbFeCij2xhwReMRlD9DoTJR8bJ8UYCDcNAXlm8pq63haqLi1Xs0XAllcKOpL9gISy95p+y/fsPcbRiEiV8UyybGptkSKxOxWflBv4ypjy5ano+Q24aQag1eKf7RrPuWj6s9t4J9ltWNHFEjhkVgPqpQK0wIlZSpwiHNRbM94zw2blLOgW9+r69WV3N2o= X-MS-TrafficTypeDiagnostic: DM5PR21MB0171: X-Microsoft-Exchange-Diagnostics: 1; DM5PR21MB0171; 20:FeduFwS3L4/Sjc30A9Np0rkGHQb4bLQXPr78Gf/mTL9EHlrY1PbnpvPEWz1KwtPjrWD0Nysei7ZacQ7fRcsF2j3+m63SygCCNgZBhbkI8tDRuv4r1kGVFmIPSNEibrYd6mYKJsd4jTU1+Nasn8vXyA7LfgNykkrUO3Io4MNlZcTIBaEtwS3VFyPU7y+1R/HSNoI1Aue4jgiRvn4uIPMqWsNsaxxqEvtLckgpvxmYvUT/kxdeGjhj0LoHDyYcglGRgKQRvhrd6J3hKL3atAmh55CNVOz1cQotqFo/4DakhrUSUEWp01HD74dhqyFHPXD/t3sC8C0Q/M57+EfRbjv55zdUU3g0lHkaGimGf/O1OhKmct5piTqRR2/VWjH4OcvtinZEnepCMBIDuw+KYd9lxw4JVvyp1D/cgApTP7W4Lz2rks0mRKLTiqjVL+/61VFqDkp/lIKgPat1Iv/FCwDOAqNjKdj4FhOGSMnjgi4xR+7zM0dOtbUHLFISwgcOajji; 4:Et6Mk4pJCLn/QesS9s71N38mLRDW6YdKbAm/LdIjXDGxECrH55aQeIBgATdaUfv93rNyH80DkQdhnXRiYYJnehOCpl8EiM76VLsp/JviP9l7rXtY//kWqvaEn1TJ5tyYZdiVEjlFcZg/modF98A8EOA3wAX2KlHhEr7m6f9wqEb09HF2NNmJNIBZTrm1swlYFZJr8h0dm9f0jybfltckDuoa9O4FgAgwflsHjGTfi6bzxu6KTX9kxrjJkvqhCuD3FE8Frqg+y25+sg4Lzvm9jXH/SJW1TRfvnL2y2rIMn7oJd6HsZ/++LCOjsGPhl5noCM3YtzikudHozyqQJNEI4LRc1tD/6hJmL9ts3FQKu7o= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(28532068793085)(89211679590171); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(3231221)(944501260)(52105095)(6055026)(61426038)(61427038)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR21MB0171; BCL:0; PCL:0; RULEID:; SRVR:DM5PR21MB0171; X-Forefront-PRVS: 0611A21987 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6029001)(39860400002)(346002)(366004)(376002)(39380400002)(396003)(189003)(199004)(36756003)(2906002)(22452003)(59450400001)(25786009)(16526019)(46003)(52396003)(16586007)(316002)(86362001)(51416003)(6346003)(8676002)(6486002)(186003)(7696005)(8936002)(52116002)(50226002)(5660300001)(10090500001)(305945005)(386003)(53936002)(105586002)(76176011)(81156014)(81166006)(10290500003)(6116002)(7736002)(68736007)(2351001)(106356001)(2361001)(107886003)(47776003)(4326008)(2950100002)(6666003)(6916009)(478600001)(48376002)(86612001)(97736004)(50466002); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR21MB0171; H:DESKTOP-CS4P60I.corp.microsoft.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=juterry@microsoft.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR21MB0171; 23:I6geoi/BpNnZwNPa22A0lSjEhngvmpDDXn0HZEf8n?= =?us-ascii?Q?hMsptDH+6kTSZ1/8d5mbCBg0Mzwk9cp9e2E+kaIuH5jBL+QdCTJyUbR7SMCa?= =?us-ascii?Q?P9ViIsOqR1sUGQvWuPGCp+iNx+dy9DmTrqfX6z/SY89MYuvJ1d4eESFz0BHp?= =?us-ascii?Q?uqpIisMB3srP2zbsH6WkRipOzCNl/CFESNisoHLmKjGItrwqreLseXHulMKG?= =?us-ascii?Q?VGz6eAgOr3uUXen5hQsrVR5+I995apYOct29L1K9RlAXrpDbhypmwZjGdlsR?= =?us-ascii?Q?D54D/BzidiL4+6zI3ysqS6iOxv8Rftin6N1a9x9gIVV2ZtnZeQOYThKPbX/C?= =?us-ascii?Q?W1cFkgeETUawQ7S2Bdh77AUBHQLWooZE7dw/VA67t9QQnOWzC6DnWXDf2XZb?= =?us-ascii?Q?f3kx3GPlCxctD1w+f6xFnRzsue6a5XgqPm5zC4cdH0RCkEd0dvBeNOY1plTw?= =?us-ascii?Q?TkbDDKIwqCIoLto8Z/8xWSlZVZHjD1t2S+tEub8CmlFicAim7ELH+h6E7hvP?= =?us-ascii?Q?CTlV2EseOnN2JOZb91ACzwk2EIr3oFCXL4GgUtLTv4xJSlFsn91Zh2nvnUVT?= =?us-ascii?Q?bMr6/0ngyM+NCrtv+UVPcKi2x7++OCf4RBTrBirQ6oMy3sLrpk9Fje2ooqVe?= =?us-ascii?Q?ys8td4k+2rcrFzN6WaqTGCm10tNDd3gPDfPSLq6AaB/mmOPAq8EKjsHS+bTc?= =?us-ascii?Q?jhOvv0DZVZdBK5eAslNP89d376u4fNrSlZgGuxGypCwyD26n3At8Fw7Ct7xx?= =?us-ascii?Q?0TqVglYsUR1OsKAm1Y4ZV7upKiEkLVxc7c/85zKRyqgX3Y4KyA0K3Y+9dYHm?= =?us-ascii?Q?w6qFfW41A9iAQfvkIdXrucRBjKGYOVji3X0bXUofnZ00akZKmtV+NTM1VNzG?= =?us-ascii?Q?sk4/hW/pWbFnAMLREWMEcZEP+Zz4ps23QCu8Srhg5OG6vDKU5BP19ykscJfE?= =?us-ascii?Q?ls8NsWYYNzeexnLRMCiuA4bhMIAAtpeGIOtxQlPQ0EsvLRPaU69OWffBLOKx?= =?us-ascii?Q?8CeVKf4/uf/G9QD6Ns21aVYNC58+8qfxI8vRq9zVkbddWHYUPPNmxy0ebp+o?= =?us-ascii?Q?5uDPgxM4/ukuyTW9NNZD86rNbQUgIE8vkH+jg60Lqd4cug9w21yWMpD561D5?= =?us-ascii?Q?6lceVhBRwdvtzIaFc0N9APFE3kFwWF62DghTr+ARokzaFGz4Na99409378X4?= =?us-ascii?Q?Snc3jgVxteIyFL+zPwclqfQRVjVXo57zaH2EzDOiO2fuDFAL5/hWcyaWoHOe?= =?us-ascii?Q?MCR4tbOJPmzxQXcjP44xYCS/CJww2rj6Yx4oZXe8eA79/cAmzOElUmFE42Vi?= =?us-ascii?B?QT09?= X-Microsoft-Antispam-Message-Info: 8KsnFAfzUs2GS6SocZM0l7FkBpipEzPwk9yV0VsM8laMoXJOsXj83wMRtoaaCx5vvcqDHyoHhKEtmQGRU/LvV8YrE4/puQEhxEO3fChHCK2A+BcVYAFmGOJrijfW89+OddSIBq15f6n52VnnHU8uBfI8PZZYXokBI6eTTWA4wtOtIabHSobRMFF6tRLRnHB+ X-Microsoft-Exchange-Diagnostics: 1; DM5PR21MB0171; 6:PyWKoCD2XXAW89aN6kqYlQMf/XtcXqoeeAIRLpHL38Poc8ivLDWaUj01VWFosUbWYLPa0HmhBjdLWu48DVZtkFapq03wBJl/yYv7EGFDPA8h8snes94llMBMvCioohsskr5hZp7HCL9BwTwGS318m5qr7+oFVUK+5FMEioCRDa31HMV+bm+hLySWTl/Sx/BwfEu2ln9vM+SSSz1EWP5gP4jmRneYCDXBHzXxPk8BflbcTI3A6dtpoj+YzDp+5MFpfVWJEWuHXKg91aezPS/hMH2PPubaS6+7vVekD7b2068IDr+s1qVJNQVkSVsYQYzbNtK4gS9Q6HQR7H5oYruo4Tpv8pkyBH4ODoQaIgaSHSzFtUrP6k5VAuRgnReIHwA0ij2XUzXkxbPrLRChUpR1av2AYfaQgWkQ3RWN/NiPfzn0XiNjyx8xPxCW8YwAAXsvEeptkEaaSAHanjQGkiRZtA==; 5:vN2WRnAOBol4scCTNDW5PR1SyRG7dSpXPEgIQT/ZTf+IEVHYJsNUWyzdEwNKODv6EpY3ol0sBrr4Xq/x+CjCuNS4Q9eAxDAxYrUAra53h8wAXsvn4Gc9qNW30iJq2R/GXmVe8NWuj1y6WvE4U5DIGGEh5pfE/2PLSUyPagePgds=; 24:ZhJk2CgPkCkm+ydcwA6flZn5dSQ7jZYQrdvoonlWayiSeBtOfAW4pCdi9vfm5Y72PkoUI2uv3+SKpx6+Cg2ntp7n5cXyoQDUsTTBrEkV20I= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR21MB0171; 7:6tng2UHr8CgGXTfnj77zxjkan6a+GN2+YujTiyev9MJ6zdCFSsfLvO9dTuGBl640L7JQ/lasGW1YVeAZnZLp0uF6TZD+TRydPiTW75M8hxuorMHxBoVhCE5l95FcrULWrwCgwNuTZjoPwqEWQk7/9RnoDbiXpVaQ9ABflt0Z63uzt10jPqk/zjYKJEvc/LoiWfcb8LVMSfa2aX/kJThvXiMt64/D4drzZEvd/cbgdZYOIsCdi35llrdo5x60oj1i; 20:iK814HtjIOfEG+QYegY4zUfxadoa+3xJholVO8E/Qai8iNlqcoesvunzz6NRXtjVEO8+l+ntuZ5SJVSahV/SArBEtzcUZ7waJH2jNyYTdlyRKrHPVRjWD278H/4JE0yl8jHmCYc6zRWe9TViGpQSWTOzz8BKy3RxSOGteEx9F+c= X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2018 14:53:10.7769 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6cdc97ab-2527-42cc-70b7-08d589bb4e94 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR21MB0171 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.105 Subject: [Qemu-devel] [PATCH 2/3] WHPX fix WHvSetPartitionProperty in PropertyCode X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: "Justin Terry \(VM\) via Qemu-devel" Reply-To: "Justin Terry \(VM\)" Cc: pbonzini@redhat.com, "Justin Terry \(VM\)" , ehabkost@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This fixes a breaking change to WHvSetPartitionProperty to pass the 'in' PropertyCode on function invocation introduced in Windows Insider SDK 17110. Usage of this indicates the PropertyCode of the opaque PropertyBuffer passe= d in on function invocation. Also fixes the removal of the PropertyCode parameter from the WHV_PARTITION_PROPERTY struct as it is now passed to the function directly. Signed-off-by: Justin Terry (VM) --- target/i386/whpx-all.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c index 2080d58c4c..63e6e1b6f2 100644 --- a/target/i386/whpx-all.c +++ b/target/i386/whpx-all.c @@ -1278,9 +1278,9 @@ static int whpx_accel_init(MachineState *ms) } =20 memset(&prop, 0, sizeof(WHV_PARTITION_PROPERTY)); - prop.PropertyCode =3D WHvPartitionPropertyCodeProcessorCount; prop.ProcessorCount =3D smp_cpus; hr =3D WHvSetPartitionProperty(whpx->partition, + WHvPartitionPropertyCodeProcessorCount, &prop, sizeof(WHV_PARTITION_PROPERTY)); =20 --=20 2.13.6 From nobody Sat Oct 25 02:31:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521039294999510.5601664605664; Wed, 14 Mar 2018 07:54:54 -0700 (PDT) Received: from localhost ([::1]:46652 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ew7nq-00043l-6y for importer@patchew.org; Wed, 14 Mar 2018 10:54:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53480) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ew7mI-0002fR-KO for qemu-devel@nongnu.org; Wed, 14 Mar 2018 10:53:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ew7mE-0001As-WA for qemu-devel@nongnu.org; Wed, 14 Mar 2018 10:53:18 -0400 Received: from mail-co1nam03on0105.outbound.protection.outlook.com ([104.47.40.105]:27552 helo=NAM03-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ew7mE-00018f-M5 for qemu-devel@nongnu.org; Wed, 14 Mar 2018 10:53:14 -0400 Received: from DESKTOP-CS4P60I.corp.microsoft.com (2001:4898:80e8:d::573) by DM5PR21MB0171.namprd21.prod.outlook.com (2603:10b6:3:a5::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.609.2; Wed, 14 Mar 2018 14:53:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=R4PltNolInWw1oOSqOJmn+T9zjLXkJIcnHzuhNpsjE8=; b=QyP3f1VYC/rWZQ+ViD013qI624xP6k1rVSbCNT4Y1zx6EA2hUKQyQkrE9NRsP4xRsSBSuT5ZTjKhtWTmYynq4N5XJkq9z2wuakuINzEqaP0oBxxp9wNlkMfzK8N3IErkEWixZzpX8mx5dCZDDUvU5wEkJSFlaIJ3Vij3u6VfZ0E= To: qemu-devel@nongnu.org Date: Wed, 14 Mar 2018 07:52:43 -0700 Message-Id: <1521039163-138-4-git-send-email-juterry@microsoft.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521039163-138-1-git-send-email-juterry@microsoft.com> References: <1521039163-138-1-git-send-email-juterry@microsoft.com> MIME-Version: 1.0 X-Originating-IP: [2001:4898:80e8:d::573] X-ClientProxiedBy: SN2PR01CA0002.prod.exchangelabs.com (2603:10b6:804:2::12) To DM5PR21MB0171.namprd21.prod.outlook.com (2603:10b6:3:a5::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 34a54c0d-f087-4b3d-8a5f-08d589bb4f18 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR21MB0171; X-Microsoft-Exchange-Diagnostics: 1; DM5PR21MB0171; 3:+iBC1ySCpgPpIShZEd1gkSVkgiqCY0dRoKGoD+2o028pEhrIddbF8ZBb/CoKVWZDdvhn+gKWOGFs10JZu9m6ixcPVQeby6+E7PN+LOPbJqvMeMdXUcLBKjWLZqn/g4x6uk44RNZ7nYbxrVoo2GAJq3ZhCEznZvWtLgWa1yPsKCMvPDnq5Ekpy+UcsmxP+rAMjxvrf2tJeJ3bzejxfItMk7FCls3BbmmKYY23gN5cF8FcCXmLR3ab4FD7UWzAGC3/; 25:LNrpm8ueoggHegr8Pw4j7lPgBe8SopyDcdEQlri4fn07j2lOZ/58wAyMAGvA3eLVELxOy+JGe516pkZcGvolSkKcuUsRJJfvgrfGcHpypZMRLoCcr0Zvea3kFGwB2+QBfy2maSgduxc1PiD5o0F72UyMa8XTNGYx/rKot/vjYb8Pb0YT9NZJ4vNtzzJq7wD6e8Lnso8gWm5E7fmQjm55KZVCc2kI7HsoFd/Bx5/1houIU6XcPG1DKny3ZlDpAC8lxM+hFCqhcHGpTdcVY7FI9n/KbKmpvcMYTeUR4K3BhBxgzZXmuCNCqo032ATjD9muNG6l6E2uQX6MWErd3wtnqQ==; 31:l7IaCvMC+PRo55HREztKHHJc4k03vjRD5SP67xD+8716G6Pqjz+gH4DJIbr4S0aST76r+0WXdZvmV66KYEZcUyZmwAY/pDs4tso+5dOvyYdHixYNHJMpHMbd2FFrhmLITu2kMlMnkRucAvBOefflKLiTHKf2LX3ct/SpT9gq/WaJplWUv5BHXhKvNk/TlYjyNKVmn35n2+a0aGLdWKt8Ugs1/6/VveWt7F1H/udYwbw= X-MS-TrafficTypeDiagnostic: DM5PR21MB0171: X-Microsoft-Exchange-Diagnostics: 1; DM5PR21MB0171; 20:KoUDaClJR+KZcqRys+Hsu0YMivPIieetL94EPVfXTWeS7A91p5savhcT51vm3o6DI3ZBVu6nsaqu8QH2nkkuv9NJ8Aeold/+X5n5sz/m21YIzQNg/tJqsZ6L5w/NvF6R+pVnNQlCHRJGc47yB2lJcXqCnvBgRQSHXFmU0KjSf5vAYPw6j5pEsEpULUhLyqolk8GQb3kkbXyyK7f6qOKHlB3TaZFYMMBVH1DRzXPrGthEcbjr02dVEPQ+XueiYuoYHZcIR9wNCwvWrgZOL2nub7BMi9l6NmMKJ0suoytxLEBlwaG5TLJGZ4jr6NpJdzWRzUAbJSiG1xmAbAGCZRaFnDK7+nyX2i1sh90SKAYRS+hDobj5usvremr83gaOJOvfhiVi2m9+PdTxKoVbUdzatw4IC+EMNPKxLrolCJM8typQCHCkOFYsnMHuVk5HJdsyuj1RD0DbSBjjEwg62UAxBHbtjQU3Go4T6plZcry+uBTUHR00Hj9s5zeA3VVGkbmn; 4:w1u9n9yIJyMw2HnasEHdLqXLuIJHKDK3bPuIYqGldM82npCidBBJa/ibJOHjtjvmqvXTNs9LbwAat5TfQdstq1q34z1a18UjSiQHuIIwikLXX7JZCMWnnWYn5KUAHWN92AM71FMa/dgi2zxnAGuYCqvWcpTiZyjCiv8RtSSm9UhEWTDpsJiKiprjAKZs4XucgEhAccuoo27JtqRPB8rlqCHsd01XoA6zpf8GDstLEpPU3nWExBBMQRJntbIAUdAZ5dB0MLdciHtO5BPnhesfNXF0StiYtqXSsWeRlqgXI8f6YtmoNUkDGEEdJ11NJ1tfTl7PM7EAKvJPCanajyRIeN3HKsr3rqz5Oj8KGBUQVuE= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(28532068793085)(89211679590171); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(3231221)(944501260)(52105095)(6055026)(61426038)(61427038)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR21MB0171; BCL:0; PCL:0; RULEID:; SRVR:DM5PR21MB0171; X-Forefront-PRVS: 0611A21987 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(346002)(366004)(376002)(39380400002)(396003)(189003)(199004)(36756003)(2906002)(22452003)(59450400001)(25786009)(16526019)(46003)(52396003)(16586007)(316002)(86362001)(51416003)(6346003)(8676002)(6486002)(186003)(7696005)(8936002)(52116002)(50226002)(5660300001)(10090500001)(305945005)(386003)(53936002)(105586002)(76176011)(81156014)(81166006)(10290500003)(6116002)(7736002)(68736007)(2351001)(106356001)(2361001)(107886003)(47776003)(4326008)(2950100002)(6666003)(6916009)(478600001)(48376002)(86612001)(97736004)(50466002); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR21MB0171; H:DESKTOP-CS4P60I.corp.microsoft.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=juterry@microsoft.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR21MB0171; 23:3xZmA2ZycINy8359Y+DPFE4GQKzIYVexjWHmHoO3A?= =?us-ascii?Q?lfnO0o8mDJjtiT2bu3ziad6aeDbeGS2TkqNnhd8Jz1GoGTYeEveiPXscFVi5?= =?us-ascii?Q?gnXVFpS5z5nE1sOnTDO6qOAjPVPF12j0b1TXaHdtREX4eBKrrYX4YWpEJbC/?= =?us-ascii?Q?F3SxkBJirUwOt1sp5M4vUqqRKWvNvTb9RCbK1wLpbDx9zZAfaqYBF53y4uxP?= =?us-ascii?Q?UAqVKjLplrSlcSdenG4UEBzNoD/wJKHTuTtvbDF+/HBeXOILtmHY6qUG9s0q?= =?us-ascii?Q?hrwC0KgOWD0bmHQr7O7QsInGe5sCBbxjZJD23hA/ZQ5HDGjW2EuvCzPmYu8u?= =?us-ascii?Q?8DErS56Gut4YsXRYQ1jfw1QncpMkpal2t5w1mUojCmPZPo6/WAogN2CJdOxV?= =?us-ascii?Q?/DbNG5jVzxOf4y7lSRhAtjDwBF6NZMDWI7V76g2wefMDotpC10WVdv00K55j?= =?us-ascii?Q?tHAGSLVdg9VBnQIwTpuN10AjWzLDg8fRWaohIWuAugbG9ZEwzCI10HcC/unu?= =?us-ascii?Q?8uJ4L/8FEdnk7vi3YqFFR820J2li1Y8Md7RwyE62/mcwjfkVELPt8Fm5A/7m?= =?us-ascii?Q?EpSz98dOnbGSkSuJivOg71k4CgOj1LkJ44ODC5i/UGUHWEL94M5FAIw6FLvt?= =?us-ascii?Q?PVBY5bacpo4gxF5uWZ+l9dT6NZuMo29mdYD1PSYof8AhDbrxCqw2SHo4wQz3?= =?us-ascii?Q?a2pGEI82oeqgaeXjkGJH9n1EgyTaCi5nOQwdokQKQ48DgdzwXv3ggg/mmp2R?= =?us-ascii?Q?NHAmjg+LrDjve6Kvu5rv5rIeWmaqmDI/fwO/5ctJAbHgJwibifPE9j45Kl2U?= =?us-ascii?Q?ioTXsvKDgPjS/dVRLA4qgw+Hsm0bMRM1unf6TBNlY7tEvR3vaSoyWsDD1gek?= =?us-ascii?Q?CEkILWYwrGzbylb775FhmW6dYYv0CiLLbba+UhmKfd0duersUKvCYS1uOHJ1?= =?us-ascii?Q?JRM4tUcY0VXnu67oAcWAqZBbKE8LM5W5phjJ+YVoj++p3EbqI5glnYoIP/Sa?= =?us-ascii?Q?k+Ib0x61oo6fbRJIq2AnZYC9oVvCQh965b4OthD13Y4/YB448+Qzcqij8K1u?= =?us-ascii?Q?H2Jsj/q+hpLLn0xAdyl/PKcwhTtpWF4HDkhmDKDgJEVSuReb7y39153gxK2Q?= =?us-ascii?Q?tgwSa784UFPoaMIf5d5B34TDPPvblKGzIpeV0liLax3SDRgdehGeJLwzp59y?= =?us-ascii?Q?ZGadUAV30k7IyDStnLaCKOGYaEVTPnBJ4soVO4uxYiKktWOWd1SNKY4bN7UZ?= =?us-ascii?Q?bpUJInB6K/W+SJRxDCAGB1gKxXJVSEsRgAxsBdI?= X-Microsoft-Antispam-Message-Info: VZeEPv4IHm0CUZAbrmNlneWZiA+kPSwaAm+79beh5mDSyULIhqA8tKkignAjOBbsV+mR/h/jJJpGoZZHAF+nXIYMTIr7I5NMasDtimtJC0OUhoLLtd2KcHQ52szvjMFBHOhUUxiHOjlIf66zOSHEm91cGPS6aX6nC7XE8NKqOywl/jM50YzLsZb1nnbTMHu9 X-Microsoft-Exchange-Diagnostics: 1; DM5PR21MB0171; 6:ibVgk++ecAt3q6eXlPsvatsWlizEDjsRt530MCP7pZkWGU5c8LPuVNRR+Ycqh4Qfjm8gMt4HDl/jLY8bmOSKzcMkJm5sekCzgiUfKcQP/tFrMwWfflmlZ/Pk2PkdOtSr/ZwaOB2Yn1sLXPVJmTarWw0yGV97b9dSvgt3sh8tr3BiFOSgYyCsHbVzsCzCuiUTvlzXyqEWibWnJUkyrTLefWA4qNlmRzLT5IlvXw5gfSWZOfRko2SwY7Do3/j7sjehvz4OXNDlw2B2UePX96MHmV1RrAXrgYOyFdnzapS0X9Z9MVfEkWF1nNr8H9FNPiyoYrrFFHAHeRoYQbjV7T/mB2Ow5bwgEtEahv/MWwbTYoHFrFsBK98y5uXRyP1VV96lnsu63nR/UIpz9H8HT/ceS7l6OAXg7oJ3l8sa8T1ffx9OFIzkpyq/aufT3nHPgzd7zu0CZW7javejc+o0qu8Vsw==; 5:Cs3Az6ljpPvSBVLpT/E6LHc5aO9RSDBgUAh+Mb/OqlJz0ouQ5XzQ54+cStlGgAc3fLknVAVOrBcWFWWQAbLMi1fPZ4q0VxDOFKczKpI0zkGPa77japcdB7hyF83EDnN8l9SAgNKo2vEvxQgYaXEwqSTVNx1MtvXIxLKCKIW74Fg=; 24:FO8BQweQ1u4ItUOONxzea0lgobHe9bTEzJxYpnIXgROnzlVhRta7BYuU0Jm5aSE3ZNO/QvgBKnD4BPjuB4ZB3uzucVOWOqC3gxZgNIz0m0Y= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR21MB0171; 7:R3W9cn0wK/UFECR1n/jMCBVOUOytpZpy8EzdoBh8xF1NlfA5Va00PseeLF7m4ESQS9gkYhWx3t3GW0VOXoXVWpk9tRphRir85dc/0MbM79vSdCteoPqljwCggg64wfOJsiVG4Kfy+5RdCmqIy/CVeo9h3TSc6v7ANWD+3cRIgXCQbiNqRx3ZJSsz/ZxEjgmfFq5zK84vh9nt7LiBU0MSbxjSUAZZTMNE7jTrj/6Uo5emWSWH5GxZBIQvrnwUUCpO; 20:fKOJlzmZmsSX/1nqJ7VIONgJFObAj5RG/b0DjsuIjlWIs6qJIMjQul3jwkW5I4pDl5BEXS3Zx0PA6ZzdNY/Y/6Vqe9Y16p5amAxDQmXhgIPwdeyf61lRowEjmGEosoJD4NjD60pAW59c7u+BbY2EHuTCKQto4yEtuntXu58d/TM= X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2018 14:53:11.6456 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 34a54c0d-f087-4b3d-8a5f-08d589bb4f18 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR21MB0171 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.105 Subject: [Qemu-devel] [PATCH 3/3] WHPX improve vcpu_post_run perf X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: "Justin Terry \(VM\) via Qemu-devel" Reply-To: "Justin Terry \(VM\)" Cc: pbonzini@redhat.com, "Justin Terry \(VM\)" , ehabkost@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This removes the additional call to WHvGetVirtualProcessorRegisters in whpx_vcpu_post_run now that the WHV_VP_EXIT_CONTEXT is returned in all WHV_RUN_VP_EXIT_CONTEXT structures. Signed-off-by: Justin Terry (VM) --- target/i386/whpx-all.c | 41 +++++++++++------------------------------ 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c index 63e6e1b6f2..63f2b68910 100644 --- a/target/i386/whpx-all.c +++ b/target/i386/whpx-all.c @@ -153,7 +153,7 @@ struct whpx_vcpu { bool interruptable; uint64_t tpr; uint64_t apic_base; - WHV_X64_PENDING_INTERRUPTION_REGISTER interrupt_in_flight; + bool interruption_pending; =20 /* Must be the last field as it may have a tail */ WHV_RUN_VP_EXIT_CONTEXT exit_ctx; @@ -695,7 +695,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu) qemu_mutex_lock_iothread(); =20 /* Inject NMI */ - if (!vcpu->interrupt_in_flight.InterruptionPending && + if (!vcpu->interruption_pending && cpu->interrupt_request & (CPU_INTERRUPT_NMI | CPU_INTERRUPT_SMI)) { if (cpu->interrupt_request & CPU_INTERRUPT_NMI) { cpu->interrupt_request &=3D ~CPU_INTERRUPT_NMI; @@ -724,7 +724,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu) } =20 /* Get pending hard interruption or replay one that was overwritten */ - if (!vcpu->interrupt_in_flight.InterruptionPending && + if (!vcpu->interruption_pending && vcpu->interruptable && (env->eflags & IF_MASK)) { assert(!new_int.InterruptionPending); if (cpu->interrupt_request & CPU_INTERRUPT_HARD) { @@ -781,44 +781,25 @@ static void whpx_vcpu_pre_run(CPUState *cpu) =20 static void whpx_vcpu_post_run(CPUState *cpu) { - HRESULT hr; - struct whpx_state *whpx =3D &whpx_global; struct whpx_vcpu *vcpu =3D get_whpx_vcpu(cpu); struct CPUX86State *env =3D (CPUArchState *)(cpu->env_ptr); X86CPU *x86_cpu =3D X86_CPU(cpu); - WHV_REGISTER_VALUE reg_values[4]; - const WHV_REGISTER_NAME reg_names[4] =3D { - WHvX64RegisterRflags, - WHvX64RegisterCr8, - WHvRegisterPendingInterruption, - WHvRegisterInterruptState, - }; =20 - hr =3D WHvGetVirtualProcessorRegisters(whpx->partition, cpu->cpu_index, - reg_names, 4, reg_values); - if (FAILED(hr)) { - error_report("WHPX: Failed to get interrupt state regusters," - " hr=3D%08lx", hr); - vcpu->interruptable =3D false; - return; - } + env->eflags =3D vcpu->exit_ctx.VpContext.Rflags; =20 - assert(reg_names[0] =3D=3D WHvX64RegisterRflags); - env->eflags =3D reg_values[0].Reg64; - - assert(reg_names[1] =3D=3D WHvX64RegisterCr8); - if (vcpu->tpr !=3D reg_values[1].Reg64) { - vcpu->tpr =3D reg_values[1].Reg64; + uint64_t tpr =3D vcpu->exit_ctx.VpContext.Cr8; + if (vcpu->tpr !=3D tpr) { + vcpu->tpr =3D tpr; qemu_mutex_lock_iothread(); cpu_set_apic_tpr(x86_cpu->apic_state, vcpu->tpr); qemu_mutex_unlock_iothread(); } =20 - assert(reg_names[2] =3D=3D WHvRegisterPendingInterruption); - vcpu->interrupt_in_flight =3D reg_values[2].PendingInterruption; + vcpu->interruption_pending =3D + vcpu->exit_ctx.VpContext.ExecutionState.InterruptionPending; =20 - assert(reg_names[3] =3D=3D WHvRegisterInterruptState); - vcpu->interruptable =3D !reg_values[3].InterruptState.InterruptShadow; + vcpu->interruptable =3D + !vcpu->exit_ctx.VpContext.ExecutionState.InterruptShadow; =20 return; } --=20 2.13.6