From patchwork Tue Jun 6 18:19:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Kagan X-Patchwork-Id: 9769527 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 6980F60364 for ; Tue, 6 Jun 2017 18:22:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 675512654B for ; Tue, 6 Jun 2017 18:22:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5BFC527FB8; Tue, 6 Jun 2017 18:22:59 +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 DDA372654B for ; Tue, 6 Jun 2017 18:22:58 +0000 (UTC) Received: from localhost ([::1]:39631 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIJ85-0007HP-Ul for patchwork-qemu-devel@patchwork.kernel.org; Tue, 06 Jun 2017 14:22:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47318) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIJ5G-0005ff-Mp for qemu-devel@nongnu.org; Tue, 06 Jun 2017 14:20:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIJ5C-0007BQ-PK for qemu-devel@nongnu.org; Tue, 06 Jun 2017 14:20:02 -0400 Received: from mail-eopbgr30133.outbound.protection.outlook.com ([40.107.3.133]:4192 helo=EUR03-AM5-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 1dIJ5C-00075V-HV for qemu-devel@nongnu.org; Tue, 06 Jun 2017 14:19:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=kGV/2FGouIpgrt6oGn93s4hFfbR4zm8YT1X4GygUbS4=; b=LNnjdwW3N1V3qgu9j2tbUmugaklF6yNodCu9bFAcaRqQNehg35ndRvwfyYO4XxUwWZaXluOhYOBBnn4YhrJ2ctk1wa8+awEbH9mWnYqms0eFn7Ra/DmjI2IyjQk4uKmaLRLQricvMh/kOumxXC4DGsbJ4T+KppC2hSXVtEHcDL8= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none; nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from rkaganb.sw.ru (195.214.232.6) by VI1PR08MB0847.eurprd08.prod.outlook.com (2a01:111:e400:5a05::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1143.10; Tue, 6 Jun 2017 18:19:54 +0000 From: Roman Kagan To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 21:19:27 +0300 Message-Id: <20170606181948.16238-3-rkagan@virtuozzo.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170606181948.16238-1-rkagan@virtuozzo.com> References: <20170606181948.16238-1-rkagan@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: DB6PR1001CA0042.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:4:55::28) To VI1PR08MB0847.eurprd08.prod.outlook.com (2a01:111:e400:5a05::17) X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR08MB0847: X-MS-Office365-Filtering-Correlation-Id: d1a8f962-0486-4764-ae8c-08d4ad08a20c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:VI1PR08MB0847; X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0847; 3:E4zcDIUlGBEr/kkj+0jSGiU6pZ7t/A/qR1c+CblD1hgE8wyH68sdEagFbuGe7aXOHS00SLudEMC1qdZ8BBHrjaU+QXg2G5RstiEhIahS5Wjzvd+ebgMm8gtvneJcBdNMfyU7GGBeKGmKrEdLFnpRnWe+R/iVfDSzxZWLrLejrmR/WRvLjfmsaFf0G3TRldfKJDuAbmuFERIVHF6HdYh5Cdh+C6/vWq2oSgZj+DDsbHNrKVxrUrzrtsaoMyulhZVf+D6HVILoP7Zi90jRvXAFNDbYBTiZh0GB3cGhVB2LKGJrImnywTl4DUI41Cg3bzOHcSZZcBCq0lp0CEiTeMsHOw==; 25:4IGzbWyVzQs8/vM+z/98Z+E7Sl8BDFr2sqq+xHzU7FlMza3T+JOPji1+oAW9PVOfYraNyJnxtseNfGyaRRFjpoKqG10XwsFirbuoovuLM9a2pdVmqteqi3LuZM3/Dfzq/eUdS5p5gQ2yZVeCYaPfC2PzZQZ1NIzoByYGmr0SC13I3z3eszThTvgo7Q3QQRg0xgfCmlvtzZhcfbXzIsJLXaEIVWD4qYXtz8A65fDVaj0n5zXa+NpOaDvfQtj39NXAPxwNrrYuoQLy9muy69lJJ0OtGD4z9F0dXvbssFNRDrqelxXt8oUVuTeQLj1Zw+P7b50jewJOvdeyFXykClu64t/QJKLRvsKkuYzaJWOEm0sunBJiZGJ1eUtyINmnNZo0EOCQTaBCim+ujcN7uU1EXVwm9R0x432hETrQZMrc8koW3jHngPYP62vFGVknv99oZzPD64wnCEHPj4sGNriFD5owYZ84zfjRSjIDWmPZsok= X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0847; 31:JD+nWkVoXPMZNJ6/wYgTgylTfTIa0agmNZdxqsx5/YVEFOJSymp26sBiB2+poge2gDIIU5+TxVWaZ7Hh1WopogdWK0aHFmKTPRGZWbxbG1YP4c66xhyhL4b2fF03bGCUCwrIWwjhWQ5dMEmfY5y4ENfdKLLnzEPaVvO8D9DiHPPnhH8WNT1Qlb2YemZ2qp0lU7aVC4eF0U+BGGGq4xN5jVi+Y+Z7VBf5yOcqYOovCMQ=; 20:vKQRqnyEZWzXUUu/AtqTKAtb/4ZHclajv4XqdJZoL/5hgK4U/oaUrMkx37r+WbtvBTsoQsxwA1kJSUWpr4pyN4lSCdOfSZbQF0HtK1TUUkzQRq/uY6862wjM61n3n0QZ4zYpaIruCjzkHRrhOofXiUHc4slaXGsznjolBRmfqR/JVgCm1j98/PJ/HAxXbeyasnACajT7GzTplsdcwSY+w3JAD8yN/U6sDl2W37I6S1WlrHec5hBV6rmLLzGBz/rYPaKrilwLqsPG+t/j8WpwdmI7AURTF+yllqBt79OpzAZFEMnloaSEocQ7gVZXjHowAcHH+fUTNk8VLgOyjAiVgiy+XJn9MHQ/mlIbmBhz1Zax5XG1/7/vdlH/+Q8RsXEo2o2gEVB1XvkMumxiXLy1BQ58PvstLQ9/oWPt9TCs0/8= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(100000703101)(100105400095)(6041248)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123564025)(20161123555025)(20161123562025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:VI1PR08MB0847; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:VI1PR08MB0847; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR08MB0847; 4:YhREa4+O2jSWPIq0uaFOhXG6xpHijx3rUKWaQ8FLMV?= =?us-ascii?Q?YLFjY+jyhp7l5F/4okDj79IWOIojiIKL8Gm09ISB+76XAHtOguKko3LQ1dnp?= =?us-ascii?Q?Jk2rVvMP2WN61IMO1v849Dk6XDD2P4FQdLnYhZK9PvnnTfZsLeHUQMkciH34?= =?us-ascii?Q?Gg25oEzlLC12mGiIbXjPOlTNCLXGDgTnPmRnHd5r0nxnpj8PvP50gAitkozO?= =?us-ascii?Q?foYltyV0D2VLLT68JJZJCv/d129ksiK+gc7BBKvKUcbdJr2GnAV0Xy7q5g0Q?= =?us-ascii?Q?VH34FgU7pXLiwRwBXaCvSTyaHVcZeFCyUI6SeTXipfMZkdnzBBZirf4HHyYj?= =?us-ascii?Q?bCtJiWI628jR3hlZq9eFzwhcNULi/6x2uBBdmvABMIjjzEVnqeNVBorssTOB?= =?us-ascii?Q?l9guRV21XRQmEKw4h/zzgXJr/GojC5IZ00eKSntOLvZtIbafb0Kmpvjrc4sT?= =?us-ascii?Q?NBsJRF6qfJ5aGvcybFyLHaCc2cwRIJO58w30RrXJAAsD8YfrJlhKxnh3b+SD?= =?us-ascii?Q?Ms29np5HuLw1m4iLmzH72JUt0clqxEG44ukZDMrQgD/fZhjR0uH2lFFQ6PNw?= =?us-ascii?Q?OnFOyr4cLuS6UB24qg/LeUx9NwMd0DT1v/gwEfqBvpJwFM70rdcmARjFB/9G?= =?us-ascii?Q?Tz++Ko64fazm8HYS4MZfkeS+3shoyN4gHMVPHY5PDtUhKXACRbuAcTRogWVA?= =?us-ascii?Q?B6B092XKfrIj8fdF3/Ebd5NJW6pn1lbuMXxJIaljJNNSN3Rq5S4F8n1UaFvj?= =?us-ascii?Q?pqWH9V1hiAIXoD4rY1Ylvm7kMvtiqic1ePCFcXA1Q1QafhACM3nDnVWiI1Fo?= =?us-ascii?Q?QLIPrCP9+fYzwlBl1RVvhUX6ibMc26qkFToqzWLhzZlQ4/XvpiC/zJw14A/6?= =?us-ascii?Q?gucsAGtpL2I/lssROckhRh/q1ZAjPKYw/wTHlXMkwT5M2Df1M6kkI8I0VVNt?= =?us-ascii?Q?n5XbEkVYZNVnZXIrCaMj5febbeAy8K+NDYIeyGJtuQVea5MdAWEzdAWXRUH7?= =?us-ascii?Q?mYMC1/OedAMn+JzGnjgSDQShCAagpSPffL8JGdXFJ9EROi3b8G2vbh62FeoM?= =?us-ascii?Q?IzV1rzSggzQtOORvm9GybFz36QJA9LtNPHvRxaS2828Scs2L+Dy4yt5FGNUQ?= =?us-ascii?Q?TAWtJdFu8txLpKZnf2Zi5fn4I1hq2D?= X-Forefront-PRVS: 033054F29A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(39410400002)(39400400002)(39840400002)(39450400003)(48376002)(33646002)(15650500001)(36756003)(47776003)(6486002)(478600001)(66066001)(5003940100001)(2361001)(2906002)(5660300001)(2351001)(50226002)(81166006)(8676002)(25786009)(230783001)(1076002)(6512007)(6916009)(53416004)(76176999)(42186005)(189998001)(38730400002)(53936002)(4326008)(50986999)(107886003)(7736002)(110136004)(6666003)(6116002)(3846002)(54906002)(2950100002)(86362001)(6506006)(305945005); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR08MB0847; H:rkaganb.sw.ru; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR08MB0847; 23:uT4UNJfVkf6tpr3uQHU5lAZGoF0etOg6zpf+vHKyN?= =?us-ascii?Q?lP0ZEgYa0wnS6m416bFLZxlgCma0k9sG1ZTeU2fNN2iX6eSjSrFudnfrBQIZ?= =?us-ascii?Q?UmuRlIGJJYbY30IKGMLOWhtUWgKRNIPH1lFXX7ZVwIRK0T5a4TCIA1C3ISe9?= =?us-ascii?Q?gXPQ5MyUFq8mIa9xNMA5WZ/6EAw+evVs9XYiuDdQDMg/w1ji/V5M/pTmPYrg?= =?us-ascii?Q?3Wd06sUbuI0kH3y01ZGkijBzCIkBbmGJN3B6yrvKYY7xHbMEMsDQfyv5S0sV?= =?us-ascii?Q?aZOShc0iaJgJY3xh3DsAFM0t9XbH8+/acaa6FZdDRa+P0qNqrPyDPuN86R+M?= =?us-ascii?Q?f5QjbfuCWg7I0MnlU+nf3H55kvYa0wl8K3YXKqQC9uY9s9MtSd05ol1JIDje?= =?us-ascii?Q?qmGH6+DSoX804TXAbny4oJq9h7QedsfkS9AGYtofnHZOJwxbaYIegJZoZpk+?= =?us-ascii?Q?JD4Q6bWOsgOSM5SyLFMmRaB4uLb3mUY3aKQ0kD7LSQaMhafatKTl4nabLPuL?= =?us-ascii?Q?dGwmtv1hNAqLttw/ubQcd2uZP55RNExeTMsvOpADoI35uWA8F2+BFGhwJncU?= =?us-ascii?Q?9JoOArhHppQf9n5SvawVNDnpyCcLN2wXYBrG3LY9MA7QPw2FSzX+1P2KEMbz?= =?us-ascii?Q?2aLYNWhIyi9v7f41v6/VN54lLJcAyjBLLtCMFs5gA2HyV1ZuGy7yZfV+CuNM?= =?us-ascii?Q?DmAiMIIisR6yidv2OEAMj7o2krBETOSoU1u2kkTWiHWCIBzVTyMRsrlB0QpY?= =?us-ascii?Q?x5SdLGSQ/P7fuJd34A1UBy0/jKcAgx5elZYEidsdLKkh3Hsxcq9gDVfoJtfu?= =?us-ascii?Q?/naeLiki0j6H0bNk7BYHWAuAp0rnaLd282K6kNrxn33kZdMFcBDqxP2i0BNf?= =?us-ascii?Q?CpBLPbsgpWYvZEH8BNUgCiwnGjseHlbh0WGXzz815JCht24QtKkqweePeU/T?= =?us-ascii?Q?PJZtGBtu262fpqu19mk7tbtTe8hRI3MM95tChzq4hkfcWebiUs2ZM0F4vCnp?= =?us-ascii?Q?w/FH51tqD49TBCs41iFVeqfv1V2vWpj6aR1EAtPn7xkRuVbQT1vhiTa91ucs?= =?us-ascii?Q?+1pGPLWRhbM8BYzW+hx/LjkbQQOH7tyWed0voOQfJOKSKlcllTg6mXrJt1qK?= =?us-ascii?Q?XsRd2zI6OI7IO3L4zKWgwkgp3bFIdFl?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0847; 6:qB2z9MbESMPEE0Rzj5H3BB+Tl5IbhTuefuEvX2SQv7iUH7U8lWmUy0EXXjvlhi+ktdV9Bj18XYDEI1aBOIY6RLXGXnoVLh+TffX5eR9Vh+pE1d5XKFtft5TVq5tpRHf+tsA3OjQoY6Dfns/uNS685Wq1a5bxMjRwhfLEOm9nWKmP2bHr7E4+k98rUm2niI13l+YvOmGWs6U2X9YG5NdXkwOuFCf+89lD7pt7gu8jZebC443Oi02neRtRita2AmiF0upsZzWs+stSem5Yb31akWNpW/o6e+h1ECp0R5LerIzIl2kZhzAfgC9Qx0S8HEnb81iAECGn30B6ABs7i9xkvBGT8CM1AELBsad/wCoHDiEYR7U0QVHjJnpp4wmNmFcfVLoJ2eUQIFyz6p1t8xLQ2SKD3tUvUDpYZSsvodmKiYf6Us+pIpYrvpQ7bji1y+DLCtgzPP9LPlkjyLkVAeUNo2aFobq3/KWqJUtpWtZ/647Dwr3zj2S8epxpBa2HS8EcLgSTJnA/NCxHuG+0zRT2cA== X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0847; 5:WDu3bVRYyzkF0nZ86seNapZnTHwTt8ivWPMNHeUN9+YZVOofb5SD4VT6C0suYjpJHEY4VcXDNvXkWmCFXFovKy5sqRjIGR8gde/TBntrooBS5DqHH+6HXUg98GL9+gh538xT9Aj5aDw/f1cPJ6xK7f0Rq/UZVV1qVnCm17i1H5tDn+AOoVzNSWsWNQjkudi3GHJGu9yg4uZ3q/NaudLogEMJkdvEsJrVKgTHC+tHQ8lvZ0bzsCOjeyk8xbDUnQ2/e2ghjtQcBS3st6RN/itjr8zU1I8iQElSd3+QUGpDYiBvYkGpDBPclor6zB5dmX4i8+d1tl98C2TJioznHDvUsIegtRQOWOB07P+9mqEhExUgcUEi0cI2QOuv+LURbfiixORB48v/rRnJ2fUD+kDc0f6Bo0QlHbdam+8PYprs5tbQvF2TxQiQxgVFvXaxSH7R47O3+inVZt8O4Rc1p1oIJD+jucQ04e5HKvmKZrYS3O8G3p1k0G4T8g79u0LgV4qo; 24:mBIZyepauAfRp0X2pequ821pnBuyaXaoNj8pYXC99yrPvu2Ga1/mhA01BkPAp3qkzuE8kxrY2j8DAwNh1Gqr87yzhfmC+E4Q2ELgi/kWB1k= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0847; 7:6/GjQg4SKSnt1aELfNLcD884YBl6gLvNmz9FT2XSx8q5DxpVDMSxLvKUAhSIvHZCG2iuqJ0kKKtqWFlnXjSKul/x9AuYcptwBhUsdwgTQWZa9mGIUvHDjOawBEQQ3Pa9VriTzoCsQ6+v2RJClPqlShWsgPVwI8pVUrHsy2JUmHOojswfE4Q3MTNfGFzHIdyRnZVxmdQZnBNlr6wuHczsVpGfxLzUnZ7JagDyPlqUulVLTKsP6ziXU6aElJHoIsHONWO3bcNuNJvxNlght/04/xbXpdQexYoIvjDluVU4BqIUviHRTx7IIpC64PcF34iopZAG4fZ+Co4DfnA+9nHafQ==; 20:v18NNq8Mh/h7pX/znpqlYTeWNplSPnA9qT8YzGiQ0U7ow/NgOydCHkvQKC3zwNGHi3D76oB8YgejXBWLFnqbRlAVCtIJVReFhtAi9TKUIUhaRhU7YOasskdWZJOpe4gXGWZYtzXvTK7DdoDGStt0KewUdUxli0Um8ODuwVQRa08= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2017 18:19:54.8822 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB0847 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.3.133 Subject: [Qemu-devel] [PATCH 02/23] update-linux-headers: prepare for hyperv.h removal 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: , Cc: Paolo Bonzini , Evgeny Yakovlev , Eduardo Habkost , "Denis V . Lunev" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP All definitions related to Hyper-V emulation are now taken from the QEMU own header, so the one imported from the kernel is no longer needed. Unfortunately it's included by kvm_para.h. So, until this is fixed in the kernel, teach the header harvesting script to substitute kernel's hyperv.h with a dummy. Signed-off-by: Roman Kagan --- scripts/update-linux-headers.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh index 2f906c4..ad80fe3 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -104,7 +104,9 @@ for arch in $ARCHLIST; do cp "$tmpdir/include/asm/unistd-common.h" "$output/linux-headers/asm-arm/" fi if [ $arch = x86 ]; then - cp_portable "$tmpdir/include/asm/hyperv.h" "$output/include/standard-headers/asm-x86/" + cat <<-EOF >"$output/include/standard-headers/asm-x86/hyperv.h" + /* this is a temporary placeholder until kvm_para.h stops including it */ + EOF cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-x86/" cp "$tmpdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x86/" cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x86/"