From patchwork Mon Feb 26 17:13:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cameron Esfahani via X-Patchwork-Id: 877994 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=nongnu.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=microsoft.com header.i=@microsoft.com header.b="cYPGdrws"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zqpNf0Dqcz9s1d for ; Tue, 27 Feb 2018 04:14:57 +1100 (AEDT) Received: from localhost ([::1]:60456 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqMMZ-0007LR-JV for incoming@patchwork.ozlabs.org; Mon, 26 Feb 2018 12:14:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46323) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqMLr-0007IP-RU for qemu-devel@nongnu.org; Mon, 26 Feb 2018 12:14:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eqMLo-0004dA-1K for qemu-devel@nongnu.org; Mon, 26 Feb 2018 12:14:11 -0500 Received: from mail-sn1nam02on0115.outbound.protection.outlook.com ([104.47.36.115]:20112 helo=NAM02-SN1-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 1eqMLn-0004c7-Rf for qemu-devel@nongnu.org; Mon, 26 Feb 2018 12:14:07 -0500 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=wcNkVN89RhhGbxC9++l3UwTKyXzUp+xSLnXiS6kD4os=; b=cYPGdrws1CIl3+YjQB+JEEOQRSIWqxLi0+wbAsYBRKVay5DBOK7SVQMnyymGXYWn5OvVPxeVKObnFZAaY9vnnCOwkfrKW6k4R2ixVOV7vaeoq8PO7RcRKWgo7m2KJCm5uga4TsHQc2r1EQK1eXPxWqb+HeF9Hoeis4Ifdo6iCoI= Received: from DESKTOP-CS4P60I.corp.microsoft.com (2001:4898:80e8:9::75b) by CY4PR21MB0168.namprd21.prod.outlook.com (2603:10b6:903:b9::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.2; Mon, 26 Feb 2018 17:14:05 +0000 To: qemu-devel@nongnu.org Date: Mon, 26 Feb 2018 09:13:29 -0800 Message-Id: <1519665216-1078-2-git-send-email-juterry@microsoft.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519665216-1078-1-git-send-email-juterry@microsoft.com> References: <1519665216-1078-1-git-send-email-juterry@microsoft.com> MIME-Version: 1.0 X-Originating-IP: [2001:4898:80e8:9::75b] X-ClientProxiedBy: DM5PR1401CA0003.namprd14.prod.outlook.com (2603:10b6:4:4a::13) To CY4PR21MB0168.namprd21.prod.outlook.com (2603:10b6:903:b9::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 9c32ca98-e645-45a3-c906-08d57d3c5744 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7193020); SRVR:CY4PR21MB0168; X-Microsoft-Exchange-Diagnostics: 1; CY4PR21MB0168; 3:i+DXkjdmnFyUJUwF0aA40ag1r4y9NdC4v54PCteEKfdqGKcqsniebvtdMcjuNKwZDFcFa+lRQWGeIT/SgGQx/r20JjpH8myExNni2k3YAKCNS0i2HwVv777RllJ9f9BxekmUmj5NL6zL93qcSYgTqbTKRmyojdyS2E/X+icK0ogrl6uox4v99Kt/eRrDrmJeBbNvJvYnVlc7/C1ohi2L3m6O+zBaYny1oN7HSKjavHmCE569BuuikYk3ablu3/5T; 25:2r84eSaZSA1Hqtm/FHEd0gTA4rvuE4DqIrs6UQDK+dRULoZW9eBrfNcM9LngUBeVmbkEHCRIlnsJE7zcKvhWfWVzJ9QGmHf8Nn1FqFixNiGCQLP/L6Pp1xcyNvSZv1vAE9HBNqmjiywA7JI3i2j9wsqwZa6QowJ1G3Ntj73jVmiOZh0VfYy1Kw987X+jTnAna7zQ8l6p5SIz+Jk+A6voODSL0IK3kRRyapW1QJcGLRq17KPiJJX1CYESt2iuAOSgu3kv7L+4id0zl43YiTrEym2YPKicx0kxSux+TFavhnHccM5HYK1uuFZrcx2TbdEIIcmoq0epjK5JzodKQu2FvA==; 31:8IMpm1ESeJsiGrZuaksz3PJ8H0JG9G5I++zVereHaxeQrXpFVBxm5jgHYblGMlsC2+wQ3NFq75kCabWQ5kAEDGlANGsOOSd+70p191Hs7YoRn/zjNKXky26mgvbMuc4NiwMGqOX6POIGEqhVGD2d63Zccswkne6ZiI0iFUhU94LvCNpO+zyP++U0/xmshQpaYtBIut28VoF5CdsY8i5G4Ivz2RYKhLFAiICUl5yiICY= X-MS-TrafficTypeDiagnostic: CY4PR21MB0168: X-Microsoft-Exchange-Diagnostics: 1; CY4PR21MB0168; 20:BQP51aJ2VtiXw65RA4uPWBdQuxARKGVi0EfVfajXUlusvtJ9dNk7tuKqEyn/WZyzUrKzpAWdzVVc5t9xWRU3P2gpgugCdVo9rLD44iJmqCAVk6rZ2yWtEaCqpBS4ptnY2bdvoP/4LghzRHYRm9UjNHu/28Lp1MXoj85vkU3N2jbwuSbep8/ndDVSo+Rp2cr+pMtR4bhRjNevv4HhkSyLdI6UZeZ1+ohqhCjh06UhvFwwgt2+g8fp9HYJsRFc4uf+VKOCRNeTGdVi1PwDx7oJPkvfWZ7hBfv5ANZu2ZyLydnnpmFgjKSTujndyqbIeF9GeY3FblUiWx44kFaRa5PRPUxmIRBz2H22MMkNIJWgKg3KKgToHLJ1eOhgzgwPnl40z1KXL4BWHyBnt9L1CSBPcrbt4k1YmP5OLFKJRSOu0RqbWcDqbMv9hlgoy+B6fvAqXCTrI4CsfONMAgBm5WB2XASqP/1zxUNNyPf7AIwvu3+DRmuaOUBQpdRcb74MFzJU; 4:dcZX3kKWWpROEHvMaEaGg/ZMMGYpzVPnUIIVluBWoC6q8Vy6h5J8abCMyIuSVwImqclgBFuGfFF/oU5DWOabWo8F89igWrmYhqB0ztLLqxyzZq1jsH3Ag8j+j0dMeHqaElsEs26T2xtqtg09cKnxgfSfoDZFPDs7RJwPt5io/ZwIktVHSi4ug36DHuktIN3Ae8PBhXFWjfaGA8UYWlxNU5jALR24IbFX0AcODdTmlrdU0wYNUNsBc5RzUbmwBgHmcbJ0WeYXX25iix/SHpWVAwI/uCi9LhQ0I0bnlqZQDVmVu3sqaz37fiDgQjiujjZWo/oUahYO0dtmKUmUa6rKrh4jdOBFEkIvAFeLZggY994= 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)(6040501)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3231220)(944501187)(52105095)(3002001)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:CY4PR21MB0168; BCL:0; PCL:0; RULEID:; SRVR:CY4PR21MB0168; X-Forefront-PRVS: 05954A7C45 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(396003)(39860400002)(366004)(346002)(39380400002)(189003)(199004)(5660300001)(36756003)(53936002)(10290500003)(7736002)(6116002)(105586002)(478600001)(6666003)(8936002)(8676002)(81166006)(47776003)(2950100002)(81156014)(50226002)(10090500001)(6916009)(106356001)(2906002)(52396003)(50466002)(51416003)(6486002)(48376002)(52116002)(7696005)(97736004)(76176011)(68736007)(86612001)(6346003)(107886003)(386003)(25786009)(86362001)(22452003)(2351001)(2361001)(316002)(305945005)(16526019)(59450400001)(4326008)(186003)(16586007); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR21MB0168; H:DESKTOP-CS4P60I.corp.microsoft.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; 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; CY4PR21MB0168; 23:lfgqi72czGRPcICE3Tv68Db2C4kyodzZtl/w2Oxff?= copvABHMqUmgylJOEuYdQoX/ruf3dexRN3A4IB8bnZM5qjz/iTC3imtnR1DFgjeCt4/NHixsA8PhvU3uIWHnx19UCKVDjAUksnITcoOP3nuet9L0w/+xEHQyyJLbnDCIGPw7J2WkZG96GImODnpAevTKUADqktoYr3HgioD6gNX4JK1ifKOIN+lkdaFIOWo29Uy0L5Mt7sqaj83k0ZTovPX/UZuAH+DOQbOXL3x5QVFcG4a6JEHPBhQe8z3w/RQxvopT2RVX0NxeDILzxAmJBYKorsm2aS3Krk+Jbzhfg1pcc2SfgVnvpHZ6sY00yjdKiFzv446uykqeqdAO7q4y2Ag9XQjTx6TzxUg2nlNbC+n+HuzbKT8JfY7yW+O0RiSdhnVQGyr15Uk0Uyo1nHI++PDUOTITGrUdMOrRpkhKGdz65/Qcn7+G70jIk8xdXfWG1bVKuKnJqfumcSNjLAxWbYp5b3idVCaEm+KGCDPPuH799PCT4uN2VQvxGuQSSTP5lKmKL5CPDfeLJFIAPdFdLw2kFamk7Mt/qBm1r755kMIJ7kWX0ykR3Mxbu+xsH76KLE4hQxAJ7notQwnKH+XszIa1lWOGCrjj/u9Gtc/SI6/g6NhEl1zsXH2/X851kZfXW5oEvN4cgCC6dD18SiX5eFlMNBXE5UU0/w2bTkF6yrtB2SkoviaE9CH9XaHDclwz5jtT2QUPF3Y90BDW/Vi2Vzw+LQ83iZhq6Xa+xNqRfqRLJyN4UkDCLSO1iixvC3Uq4l2Kfo47O7R/hXFaoGL39mVdexBd3oN1ptXQjlTYJ15Y1MNAbEfMQQObj+hu/gJ3luhiinKGS3SgUUoIxo9hGph07rsr9BnAOF3tPE9FMzH5gRbHS36pqiMX5igxMoKUu7RsLshSpUTTudRA1CUJRfTWqDCVylyalkCOuWV1cmTt91t42vAQL7n9T1ayxrgtYdiX82oc4cRwHN3P0j3d3gc2ETJpR48r0iAbvrDfAwFCKak9RWQTNjI074fbFRrbjeXWBhF+wd1oWwbpD1WRheWMGrrcmgl+D0/2tvVqohTo0duG1EN1os6wzFMGLwUFbv6ZTPjoueSvYVdxiM4XysMdYcv+dVIcygcaVDdnkkRYujv+whgZK1jJKw/brlH5zToVcQQ3msUsbGEOqgWNZY3F4WaJo7A5Ms0jUcMUNv80acovlDbXt75Xk9RuteHVOc= X-Microsoft-Exchange-Diagnostics: 1; CY4PR21MB0168; 6:bwJTshTcFLyTCajBgUbjbpfDYmMfjOC64A/T7dYDl6pdla9oVVCDX08Hk2LIkfq9mYWUyAZGUvPNw5OV8zhbIxaiSOMTUDkvrZS15PUaGjMz3jkHiUCR5uU1+A/3mXnFt0/ib1k+SoZ0m62fPXmOCfIUlwkt4V2vgLvPvgORHVM838uAqZXIRjbcjTtEN0TsRCQgoKy5Ne0PwYu5E16fizuey3wTAwMmfh1vu9+SluWUtIvjO0gn0vFLpcPLC/oovFuAMigxjm4+ChA5WGo5tP6ciCSPdQzfR/IO2eNmh/GB+QCDNV2mpX7s16J+tlaZbjltZreE+wz8Mo+qpJFVTEFlWzjdY2kH57b1MWcWfjk=; 5:OdAe2yI6WzMLCnGB7RApgMLLQFXAEhCRZtjvA6/lGGzYS4zzGSQz5BzeulrUJ7duOdBxMX+X7EdD2JRJkgIyn1C4siYhU4AfcFxOZQXjK03PJZ8RtV/qky4CVhTfpuMI6DRxVvswDdnWbMQAU2HDR+v04fOAa9IxuIL1SB+QLxU=; 24:vxmaL5OY3EZ02f+LAZoMW+ZUOvw/r1YeegvvYvIKgLPpuseQ0Vq23rqZPirEfckdIMg8XRlfQ7L0VilxPJo7UNLQpK8v5+ljRT0dmVhTYy0=; 7:YLPhQ1xs9CEDko82bMOe1JUMPRNc9KhktxI7ESLXH2vf3yOFaIAINxkrlU1sPqm2vrx9zNsn4ENxranwn7UQ7IecNgX20moDG44AcjcIQxmte35SeoSrHo0HuEZomnqdVKeZw8dOTPgcdediJ+DnCA2mXXeDOwNNRCMILVqhycijpygqNSqNmyljtImgTstIU9t8BFmI9cVAUGGVAjZZg0r3bDPIC9ikfLq8hPSD7OYfbs89xVp3r15rdNsJSlUn SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2018 17:14:05.3364 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9c32ca98-e645-45a3-c906-08d57d3c5744 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0168 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.115 Subject: [Qemu-devel] [PATCH 1/8] Fixing WHPX casing to match SDK 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: , X-Patchwork-Original-From: "Justin Terry \(VM\) via Qemu-devel" From: Cameron Esfahani via Reply-To: "Justin Terry \(VM\)" Cc: pbonzini@redhat.com, "Justin Terry \(VM\)" , ehabkost@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Fixes an issue where the SDK that was releases had a different casing for the *.h and *.lib files causing a build break if linked directly from Windows Kits. Signed-off-by: Justin Terry (VM) --- configure | 10 +++++----- target/i386/whpx-all.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 39f3a43001..220b9ce52b 100755 --- a/configure +++ b/configure @@ -2475,20 +2475,20 @@ fi if test "$whpx" != "no" ; then cat > $TMPC << EOF #include -#include -#include +#include +#include int main(void) { WHV_CAPABILITY whpx_cap; WHvGetCapability(WHvCapabilityCodeFeatures, &whpx_cap, sizeof(whpx_cap)); return 0; } EOF - if compile_prog "" "-lwinhvplatform -lwinhvemulation" ; then - libs_softmmu="$libs_softmmu -lwinhvplatform -lwinhvemulation" + if compile_prog "" "-lWinHvPlatform -lWinHvEmulation" ; then + libs_softmmu="$libs_softmmu -lWinHvPlatform -lWinHvEmulation" whpx="yes" else if test "$whpx" = "yes"; then - feature_not_found "winhvplatform" "winhvemulation is not installed" + feature_not_found "WinHvPlatform" "WinHvEmulation is not installed" fi whpx="no" fi diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c index 0015b27509..eeee43e187 100644 --- a/target/i386/whpx-all.c +++ b/target/i386/whpx-all.c @@ -26,8 +26,8 @@ #include "qapi/error.h" #include "migration/blocker.h" -#include -#include +#include +#include struct whpx_state { uint64_t mem_quota;