From patchwork Mon Feb 26 17:13:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis V. Lunev\" via" X-Patchwork-Id: 10242839 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BE183602A0 for ; Mon, 26 Feb 2018 17:17:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B3CF029F07 for ; Mon, 26 Feb 2018 17:17:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A8BF429F6A; Mon, 26 Feb 2018 17:17:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 98E5329F07 for ; Mon, 26 Feb 2018 17:17:52 +0000 (UTC) Received: from localhost ([::1]:60478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqMPP-0001of-Sj for patchwork-qemu-devel@patchwork.kernel.org; Mon, 26 Feb 2018 12:17:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46368) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqMLu-0007K9-FA for qemu-devel@nongnu.org; Mon, 26 Feb 2018 12:14:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eqMLq-0004ed-LY for qemu-devel@nongnu.org; Mon, 26 Feb 2018 12:14:14 -0500 Received: from mail-sn1nam02on0130.outbound.protection.outlook.com ([104.47.36.130]:17056 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 1eqMLq-0004eC-FW for qemu-devel@nongnu.org; Mon, 26 Feb 2018 12:14:10 -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=oFKtjGnFsSRQT1HexaXKQ93w4BFtx2tzawM8aklzYcc=; b=m9iuKYPhSncT1LHreR7JuUwNoKV1s+z7ympCiufYRptgKcIuMTxI10Tf8MFD8Q5G/5cegGn5X6TN5Y2rxG89dJ6LJEOMRM3afEu3Ovd9wrAIduht87KvRLsnS8g1uRKpu6Pv6O/AF8lgWDduey1r/Js5drcAQp1X1LxR/gseCSI= 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:08 +0000 To: qemu-devel@nongnu.org Date: Mon, 26 Feb 2018 09:13:33 -0800 Message-Id: <1519665216-1078-6-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: caf5eb23-bf18-4ac9-2b90-08d57d3c5948 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:euvh9HH16YHZvCIkcwOTl61sEIIhX9LByhXqTY7026ZDIdhy9g77ykp6WBjnOrCgBstLzEcyMbHJKpgwPb8AtP3mo8aGSUEZx9bwB1mBDBq4VzwaOGgBFzbIWrelDv5/bR4+/3b59kmIwmDRIf52uNRCD9qG/5+/E3Q9xh0ukne9NM7nzYSLvcfFGSgGZU5jbJQFguVHjynFER5zdN1VCV7lum2WZNdfIjKwP4rwyw0guDNd6jIpapfOYb8y21Ym; 25:IyARn6wfJEIPDtF80TgHedMP98GGTQsxFxbSc6w6DB74vCagMagma2EiD9RXHU1RSdk3NWk9VYqyl69gP7nfgRM8LNjhBt0ylNzt++eFoMja1ddDEmU7BBeKL6IcpgkrDaB/ZA3nH29L749ByReTKsrkaDCFcpLQV1RyoqHOqqjUjlZGQ5u+uQHkA7CEhdwm/d2O9IcseZm9AmaIVwYbizPBiONrggqT/+07ffUqdOF1Cc+K6WvMmcuLQXlCuxKfmO5W9cgLcohXEEz6ipfOxUoz98j0GhnGJqaQXlEDWBOnGC76t4q+oxF5d0eYDksID+SPSAnuQevjw7kWlWf38g==; 31:0JAnsO30Y9xBYou5hwd0aqY0AmvZ1GLIVwIllKqNofdfvyordJc1T67tMnfsi0mkEoLCzrhqD65xquerZMeCFy5QCVDoY8XWdhUd5YjDe/aV1ssIUHjNoHQGmbON/vsMD+J+hP1acqvwaVEcvopFOEOPM1siZ8jb0lSJestmUMuhyyuBfMlJV4TNA+l+q+p7cN5FfX4JFgX7xIS9tPR44CbhSKBPy6DA1aYxacTMu2M= X-MS-TrafficTypeDiagnostic: CY4PR21MB0168: X-Microsoft-Exchange-Diagnostics: 1; CY4PR21MB0168; 20:Nw0tq55M6hZQ4luw4T9CfxD85o9TC6e5XIfvutzV95hc+isJbkVvxwDVGfuch0YODWu62ys6qtriIrWK6QaSmVML7DnbD4lxqJCVeYUvurNiXsVaOvdTBh83zv4egeI8GJ4mgPfWQOsYqTxo5O2br79rroj1IWGyfmiOzeYLuD0QyXkgIXGtJZu/luo3FPL0xxJg1CK2MXNBTjtAoy2AZ3PViKjakf/Cnul/Bcm5/bQb4LZ0+OOqCteYWAy/Wbl2JCEyyQ+h4rweOWO2NH32dGxevETx96nGG/HMtbDlaapGAc+fr20LQ2WEHlBEYHGGJ6EnTkc1MIVrVXWs1SOQMA4trTZj5QARAQqO5YQHDNz1TB2XWb3d+5t7N4/swuibZ9Knj602GOOaA2CE45IW7eFiFFwgVItx0lvnpnQ1KRiXnMSgZhnCG42/YBMYPasv1XTeMZMM+j1zQo6pSO6VlqAeaAQMv5uRe29v7LQoQJRGtjIfY5TZC86vtdAn4ang; 4:/ixZjb+0HWEh9FqAKO4pbRIUc4TjOlMuAN9r7iV3qIHEe5QcEZokyQP1tuNnpfqfzSoEaxEmMD5isKjyMk3VsdW9DuR9h+zLwRXR3hak9POGecQUVW/0UqiamBei0XrSwd8jSZe5Ydhxy9ySrS1M/G1CE4scJAOYGXzcP9tZSl82KdtPxfeETaIFDpMlx5jqbUp3OOjKT6L9MczLJ5fAYZMqWosguETPmVaNk9+qYgsGxCNpW7aF6xQUuWi8eNqg3HgGuY/pI/dcRffxmwJ4c0XKGPVZ8u4LnKZzHIFWHmSHYsmOAix7v5MmXNEJBIxZiCd3hzG5uegRLbKux8V2h6mtm41uonIAdIw9yyP4ON4= 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:PKOHnvpUz/nMCdaNbWhmCaySmDGXsxLlMogOOPOKO?= =?us-ascii?Q?7kichoBGSbyJ36OD8CYxGMVikD3nsRyznB/jzbmyQW59E/Re5otViqsXav+y?= =?us-ascii?Q?HBieTHZeGC0l6cjVv/DooII9GblZvxVYDjcBvUHk/TgiEJSKXijF+HVnQEP9?= =?us-ascii?Q?KabE1ZxlDe/5oYG5ZwUXiP/w2nrtE17Ry3p+86vsSwdjh1rhZjPvnw/W2lyr?= =?us-ascii?Q?BvZnFYdy+vyR35YVfW9uJ0z1BnyY+oOUx0HrTWKHjKCAl3k2MoEiACyoFLsM?= =?us-ascii?Q?7ZJ7aHPrMXHw6yY1AlFkjgMmEeH0Mjg1fEqHhIZyKNf80XaAre52Xnqc+cDV?= =?us-ascii?Q?Cfonudmqlz+rKreCTgN5/u1bx6DdYrFXItBnpIywdzfZxDJ/dcWlgwjnqBG0?= =?us-ascii?Q?MAwTZl8WSm5/w4y9iYXeHVIfG3mkd4WY10/t1sNviLZ3XAAmDr/LnFmZ6O+P?= =?us-ascii?Q?DNg0kgvXH7TMWq+gs9JO1iq+eUucYiidNXFOtEgPR1Fe5/k8pu5Uqas90030?= =?us-ascii?Q?aSSYvzhVWhQPolGhPm6FTLRaoHrgIK6a+K5mzbDOR2wcgjO2gJXXxwK5VY0G?= =?us-ascii?Q?oiycdfvsNip2GpvVa1LwcSz4b7U5iA6vn+SWD9dUBaGzShKEjjW7G48rhYFG?= =?us-ascii?Q?qz7OdBboU8U12Sb5WXQFQFVpwoOuSJeyLubU1KJE1wZhH/oOHoIapaFqD+cA?= =?us-ascii?Q?TEUOqI/qmHXq91E54PfY17wcSpInWgPRkFqUkZWIkqiiuAU5KCTtEXCAZ4iI?= =?us-ascii?Q?PBvV1E7SrCxXFCbOMEgkGuNaJ4SRxc85RSxIvDvv/Zm3dsaK+Mp9l86O/a+k?= =?us-ascii?Q?vtRM/+YQuUpIciWgPXIG3zFSPYv1LkzVpvL97TXPWhWHV7CLk9wkxVFlaFwy?= =?us-ascii?Q?ZMLGwS9YT/Gfh9ZU/mXPstPPs9Ovt5IFDoqsuCf6XP1r+Ps1JpKz7QXuEEIW?= =?us-ascii?Q?GifkcZLhjNG9A6QHVb0XJPGOBGLyQPV0OPQl1r1X+4AnLZyzb0UZ6XumZ7NW?= =?us-ascii?Q?DtA8S4G4AMIcwvu2NvVxeg5rDgiun8wTPc9waea8RYC2gDewNMCNB0BO4ADq?= =?us-ascii?Q?16Ly9TJU+rTgxui9HhB0pzOlxAIgw3P1E6Y0m5z0ZuVOM2Swy10bWPafRuh1?= =?us-ascii?Q?OoRswXCtg3Mz1/sZnoyJdro83MOUnfT7X68E9wwqP3R6OVxNgVZwu/VhFs6P?= =?us-ascii?Q?AH27ssASexJdDLW6pfcFQJ8EHAqvWqdkA9eKq6J8XJlG2LfsWl2pc/xhFPhm?= =?us-ascii?Q?39COh9tb3Sn5urKXG0=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR21MB0168; 6:CEeK72MSUrGiK2Zyd/j9mBww3+qt/Vt46kYszrlV6dwfFV4Vd7rxPONTkEiG8KtBWN8qHAHXjn5QdjVKqVbFExEkg/G0T7I8x3VB4hYIn2bak8cIoXmn4uBFC0aJH3FiQ02dJj6lWErDX0FVs+OSVm4QI43OAyJxiKFJ7FbXMobhLno2g51fSRUsq0wCRG9w3pxvc5la0z23aeiTG9C6JnaXi87FLc0oudv33nsi2c3hKxX/EfXwJk+0z151seN+WOXpySOU2pmaxyS1lurZLO/Ce6ushBXzVm2dStdCTZ8fstIcgYi6yG1wzQerR7B+bco5zETzC7fcLUaiV++Tdbf8ATqzP6Mlo/oqidBY6wk=; 5:VSlvLlLDOMN5IvNR7g51JFw8bOnVc6Dcz5WqSoPGza9gYo5v5/kq2dCjgobcUV+y/LyB6lOhpKa3hSBhdfmKTxxg+8ANbw4U98UbH0NdteKHIxbrJzTx7ReM4Wb+iURTQ1x++gfSx1y6g7KEVM06UcGlghTH53RuCAY57/NFDR8=; 24:RyDdMSFIUSaydqibfnNlXQbyscs/Rb15snwrLAk382RjVLiQm57ghDbPENt8m+KqHQMwPTFn6ARdF1vzkug018TQQJuFKuaxdoFNFWR8E4M=; 7:UbjPJ/ib8ziTf4ivx0qVG2b0o+0d4EXTmWkrzHz9VO/zHuhnHTJccO8e47sxhw0gvj/Kl+JGn28Arzz3B3rlfy5RoK9j4q0DYpdAWUX578YUPOiYWiBHNy8ujP36VZkVg4B68YNB5b1aD1i+EtAX0Fj3kn/DF5QNLcf1w7+F+twWuBa1ZBMTu76guosd69nIK5zvRDZ24Vs9/r41tSlwDMnIxzPmKSIDAYy+hPXeoINT0IQ0mQNjwFNhXM7wp1P/ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2018 17:14:08.7161 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: caf5eb23-bf18-4ac9-2b90-08d57d3c5948 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.130 Subject: [Qemu-devel] [PATCH 5/8] Fix WHPX typo in 'mmio' 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: "Denis V. Lunev\" via" Reply-To: "Justin Terry \(VM\)" Cc: pbonzini@redhat.com, "Justin Terry \(VM\)" , ehabkost@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Renames the usage of 'memio' to 'mmio' in the emulator callbacks. Signed-off-by: Justin Terry (VM) --- target/i386/whpx-all.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c index 74a8f4d599..7e58d5f68c 100644 --- a/target/i386/whpx-all.c +++ b/target/i386/whpx-all.c @@ -527,7 +527,7 @@ static HRESULT CALLBACK whpx_emu_ioport_callback( return S_OK; } -static HRESULT CALLBACK whpx_emu_memio_callback( +static HRESULT CALLBACK whpx_emu_mmio_callback( void *ctx, WHV_EMULATOR_MEMORY_ACCESS_INFO *ma) { @@ -610,7 +610,7 @@ static HRESULT CALLBACK whpx_emu_translate_callback( static const WHV_EMULATOR_CALLBACKS whpx_emu_callbacks = { .Size = sizeof(WHV_EMULATOR_CALLBACKS), .WHvEmulatorIoPortCallback = whpx_emu_ioport_callback, - .WHvEmulatorMemoryCallback = whpx_emu_memio_callback, + .WHvEmulatorMemoryCallback = whpx_emu_mmio_callback, .WHvEmulatorGetVirtualProcessorRegisters = whpx_emu_getreg_callback, .WHvEmulatorSetVirtualProcessorRegisters = whpx_emu_setreg_callback, .WHvEmulatorTranslateGvaPage = whpx_emu_translate_callback,