From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760221AbcLTQmM (ORCPT ); Tue, 20 Dec 2016 11:42:12 -0500 Received: from mail-db5eur01on0095.outbound.protection.outlook.com ([104.47.2.95]:63121 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751892AbcLTQmJ (ORCPT ); Tue, 20 Dec 2016 11:42:09 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rkagan@virtuozzo.com; From: Roman Kagan To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , "K. Y. Srinivasan" , Vitaly Kuznetsov CC: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , , Haiyang Zhang , , , , "Denis V . Lunev" , Roman Kagan Subject: [PATCH 12/15] hyperv: move VMBus connection ids to uapi Date: Tue, 20 Dec 2016 18:55:59 +0300 Message-ID: <20161220155602.6298-13-rkagan@virtuozzo.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161220155602.6298-1-rkagan@virtuozzo.com> References: <20161220155602.6298-1-rkagan@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [195.214.232.10] X-ClientProxiedBy: AM4PR01CA0030.eurprd01.prod.exchangelabs.com (10.164.74.168) To VI1PR0802MB2478.eurprd08.prod.outlook.com (10.175.26.21) X-MS-Office365-Filtering-Correlation-Id: b5116b02-2f14-4c36-3fb8-08d428f0d32c X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:VI1PR0802MB2478; X-Microsoft-Exchange-Diagnostics: 1;VI1PR0802MB2478;3:YyRpsqPwSlR/1g48Yt0Q+qUKPSN06WeUIUh26ymM0rRNNeHY1au4lW3KZNOTEkH4HSIivrAQ+BuvksohVrcbJA9WST7Ne9uVsjY1y79q6Knpdj3ahG8aATJ4jSrXaCZU3oLuQMfwQGS7EL5z6fWsYcGTTIS0icERFmCyuEKFrS+5jg2SlBPgPJWbGZOa51pzcNH0/1m87rmEZRU6BkehiygCzbl2wkCHfK2+48Ru46WWJRfeuhz87j6+kjrltcXQ6m2kJ1SzVEBA9edRWjXPnw==;25:p4OcZ/UL9rv3kJ80kbeWQceidjRzK0H5O++9dg+xUnUP/AVdxcwbHL4/WDiY+T43luT6jllD/yKthYohsoXqxnLMN1nNxkea6bPdBAI7dIDIwAlQx+oTbpPtKis9fSXMrUuW4KwkaVS6BszpYHjcjqDrkIXIhYhLVRHFBtHX4tUlbRbDoIoQE6xiPH+cf0zDimWvNN3S8lnZbAbqsal0aOukbH0YLPmE159shFc/qCss3NWHahwg5IHGtGP0NKm32qPxsB0IQY2NjX3v8T+JkarkIBSOmeQlKAtZfGrPjguibMBxKaVReQkoR9E/dbQW7177ifWCgkfjWfwSaFfgUWbGcbx2QkKAU2um8tTRwmUodX58TiF3WY2cbdWfD2UttCn6LjcKgSyBViuIdE3aX2dSO41Z0Vapbzxj69yWO6NfW8AApid0jrjkFqlIB8nfCmTRno+OlElFGpYU03W+Wg== X-Microsoft-Exchange-Diagnostics: 1;VI1PR0802MB2478;31:5CqB7ZOw2p6HLpT4RWLN74jCXae50kBbycYkKLlFAuRNHGICEJkI7KhYYeH8FnvndqY2Epmo9RXuNlkGt5J7xvDXGDMwSv+ZQD6FH5E6Jh3M+XhIK8c3ESIVpLi90qYrESAPC3oo0Jp7XZB6HwxTW5RxjkSZIDycGuAnQNNsMUdWGjPUgt1CuEVBHZh1m2WLj8CpkhdEJL7o8nGXAGdUv7+3iPyxQpPBE8ci0/csQ+rQGVvUFiQogwhZ0c1N1aeh2vOEnRC2I10xK5O/fL++DA==;20:e6JDXT370dm1pd9QU4nD1ER+1kz9buY/yGbEk+mA+8Tp3zqnQR4QNfpl+94xAyUG8UKT78B9JmzCxMVi1/nbUJPcUlo6Th8zdGCEW/vucuArGCxwQkOCdKNBAHg4scjEOzuxRrNF8AuhSMGPG5vCULX3gO8uaMVi6pq6zNHbI7r5azZ8I67E6VV5s4yiCEXwfOqzfCGiHER0rdS/HG2aXpFGasN2jmXsVw3vJQg2yQ9sIGDZhy4/QMml2rsOwXCM X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6041248)(20161123564025)(20161123555025)(20161123560025)(20161123558021)(20161123562025)(6072148);SRVR:VI1PR0802MB2478;BCL:0;PCL:0;RULEID:;SRVR:VI1PR0802MB2478; X-Microsoft-Exchange-Diagnostics: 1;VI1PR0802MB2478;4:kKdYt2GJNCJwNZS722EbzTrDmMTV0qYy+qAgEk0tCkLjfmom3McmbTOVLOVeiA9U+izlSfHvVl2ewdYFHELhWHdVD5zObUi0ejp4EgKiBlbUxLSRVKVUcgN26dP3B13Qx2xbUQoywRwNY/P9rtibXaYXAtx6ERm1XCoQS3MFZJWzTfNIOEKeql3owfuwymKJ9QqhokW29Zqu+CD9FtK/DQ3c5I/k4jjQdfddZ0oreFJW22KTwSdVzRUest5pBpuMT3ElJIwfRsMlDiTsVahFsTfj3Xgq4/7kk9RhB8+rhoG3CLfj86vzV0TZKBFTDQp0u8PjsQGbEntqytEdY3Wqhhs9PR3EbFBUDEKBm9kXsiWDx0BN5l162pwinMpkIPSJRmrCsDP+z4uGvXgnx/vktAFaAIyLWSaP89+CtM8zMjvu2RC4d6rGUN9m1OP4MGSk5+VZZM5MHxiU02MMavE6tWz0PKQCJXhhEmtFqxiOEd9zj9+AlS22HwZ7xRHB+511FVBkLKSeX185tPmoWbuksS9GR/i8wTF+rxEl6P3akm11AHQk5HxwYGfzFl/FZxrjP7SmNt2fnBII1es1AnbumUyVqEdnQyC5v7Ci5YPS/ko= X-Forefront-PRVS: 0162ACCC24 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(7916002)(39450400003)(199003)(189002)(97736004)(189998001)(101416001)(5001770100001)(4001430100002)(5003940100001)(36756003)(81166006)(47776003)(50986999)(66066001)(1511001)(2950100002)(50466002)(76176999)(5660300001)(81156014)(2906002)(8666005)(305945005)(69596002)(48376002)(7736002)(92566002)(7416002)(106356001)(53416004)(25786008)(6116002)(105586002)(6486002)(2421001)(6506006)(1076002)(3846002)(575784001)(86362001)(4326007)(68736007)(8676002)(50226002)(42186005)(107886002)(2561002)(38730400001)(6512006)(33646002);DIR:OUT;SFP:1102;SCL:1;SRVR:VI1PR0802MB2478;H:rkaganb.sw.ru;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;VI1PR0802MB2478;23:YnmH0Ppqik7FL1eaUHr/vj6wvK8i2f5Z4K4k6x+?= =?us-ascii?Q?NQpo8bBOlwkkH6g4myCsMU+hqCt2DKAo538V1SFJJtEyMUsElNXYALtC28mM?= =?us-ascii?Q?JIVr0SO4IiuJiy9r+m8v9LEbtuqb+5KXKW2Yz+NbwN0n3j3jrgLaPhZAzvM1?= =?us-ascii?Q?ZWUseL3OnDs1bpaELDa50M5mAL1w45gKXWx3Gw0bGtXB9IImlJhUyxOGg1Eo?= =?us-ascii?Q?o6my6MyNbUz6AZz671emQVvwEBLQKrvXHoxB8ofCpkhKw9+bAmQ67nix2+ds?= =?us-ascii?Q?O+L3llNHt6LS3tfTemRneRvZTK+ZHWiaEt2EiVl++5LgYgFgjEolMOPQC8hR?= =?us-ascii?Q?h8ESb+4X5AL3oDtHRmBl5H5ZxAzRIlKOBc3nMsteKex1ztm89QVU99OTUHBz?= =?us-ascii?Q?0RXdwKwWu+gUTCwz2C18x3EIcXT9oAaaXJokV6jjwk4KjvWTcvvVwHRbHaNo?= =?us-ascii?Q?saSlIQbqmAd2LRmLNjHC7MqVeuMB9w9crqzyIU3JzBS1O23oD7pKOdnbWuXv?= =?us-ascii?Q?rzlwShxQBWguqwJNoeObhsDgsbffEX8jhtXL4nvRFW1CAbp1uWNdx7nlxAAc?= =?us-ascii?Q?Sj3zeAbnGhySu0d/JRmTqOOtlBpTOxIgtqh1WYMl4cU7tDYMnf1JYamkZDRk?= =?us-ascii?Q?o9DP4tpaX/ES+97pDwiUcNTXAVFCN3VxZfp6+369M76eXrnhaHsF79qpnHXn?= =?us-ascii?Q?O0PjUqSQK9klfOxVhLq41C+LtPInVWgns87EnTRY96G7erkfjv7oazekUqjy?= =?us-ascii?Q?LLYbfzB7z588ZGrhox6Zq5Qr5TH06OT0UKal1xfOfNwSaKZEzUpqt7SCKOGr?= =?us-ascii?Q?A0RNmE5r+a4yiL4tteOOLFuZDVXydPbp7qL8rINhZrmC6dqUYAEJp14XZolh?= =?us-ascii?Q?BD0Ks+QxTzNq4tuvhEJptUCliwmBj91QASWKhN5qbvGZqh6rai4jserb3pHp?= =?us-ascii?Q?ABg1qsUlHnTW7I6ULl9bx0+la9iEKgqazJr+lO/LETdXSdSK3SxKVyKh3r1W?= =?us-ascii?Q?F9GiX6DWrOUoBW3z1cdLJIrfIdmNkaHRhDdxzyH2lG305mW6Gh0FBAu0L+JE?= =?us-ascii?Q?mqLEShLApsnjK/sU564GxBSyBg//IIev5PZsglBDNkWck1L9S5XT3fkETvO6?= =?us-ascii?Q?f6bo/rb/D2XJIwJ9mCdTSd4uqznPvFxz2BEoFkdLAhbgIDvLzcGIQ00Gpz83?= =?us-ascii?Q?MuLzYgbXpwIygnoY9ytxBkLlseoj1jKSid5oBHMHKfK90KgWqxmRa5+Q6rU5?= =?us-ascii?Q?wPYbLCjV5t9vzOa50KBOTt9/sg6AiptlOtLjrqmO0FPRYGZEU0+o2VcTih66?= =?us-ascii?Q?HfA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;VI1PR0802MB2478;6:5IZQYH2fDa5ZNu+NiN2+9uEgFOk9g2rUPYVn7jf2OBrx+szdNzv794ULQfQwBEFVimzBb/DMarZDEU7c37wGcEDy6k6PgBxjvb4z7+Tl9X9UBtUe+zgMXMubHx3aD5R6Sk9v9HZshWjHYuQxe8UASC9qP2Mt1bYJJReCBw3Ny3SFUGFjCpX3pohI1xRNjyoAbLLcto1NopcWm5fIsSm0/sh2e7mNl+Qv8yZElwJvzfR7mHuzFYYxLycm3ATLHmMBV6/DTdX2boHKlmpZJumVogM/taZZRMKivPd8bfvJOeJPEJxJh9xwoe4RPSgH4hToRwTjQTd2DVjsdxAdscQpIcQZJ0sPbqpGW9BwKoUqYYH1YbQUpsP2mxja7ctllpkKkgr1Aa9q+6RyGAI7jRSOnBDnbVDaDmEBV43Cb+fvZbs=;5:K6+NlAV0tLT0/338vA7Fvja12I+nqJMxVq0oa0EcYYSEGOMUj22kEn/IqTOSISLHsiAdbVQ0jNZ6gC6kfmy6pE6E8eXwOrcUibUIrcm1rdOO7IrGmuq0ehrfpHPtLKG/YDR7F5inCIF0YOgbsiFQd8BcQ/v6n7KFJWfeFizcVD8=;24:w7G5lDUnl5dQnbW36XaTFvbEikkJT9IG0BAgEVK7wh9wbmIzXvpAk37w/KnpcQr7uqoWE0KkErrZUwLfsd1YAtHDvzK748o3h1/rcxHJ1DI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;VI1PR0802MB2478;7:Mwz0eRjNWYKEiIIp4mE/iZgvVq1m8AifIm7o6ONx0UeMS6WaWvP3ITumjavBNKJhtO58wPMEdnoBxKZBhRhId8ZtiGeHPxDdPxbG9U9QATz1sN5CiQpXaG0zwEidjOT4jkS8k8hodbGXDz3xg1mIjXWn10K9WN52izj1olyYABopMmmk1ug7+nFEqdvdrgmjP048Omws8ePL3cNgLCBE97+Pb0kF9mSImrwzHWx9HCyJCRbgrtVBCp9teKS9KDA5Fcvz6FbhNdR6w88PL20fFcNeKGN827f5312Dn6fBBr/UkwqzlsgvjrmH/evdG7a9+7VC/gjjP+OTv8vR1x5hOiO6cww54rPC1wDIwlEhb9IvUIheF2EN8kOP7VVkugzcQQt79L9gkdPNN3mBGDighpEl0c9JcAHetvge+H/ctyQIgsQb0vgWW8ePhHUT0f794TmOLtm5ksNcUCf/pufgKA==;20:3tVvNPPjkTfRGvaPz5TKPVlFt8JgEFhGY1Lf4YZd2bfctKJGx7B/MdjJiOsllTLmyh7ZMzqN+wsdIGw8e+GLwrEFAlq721AxOCeDLDyoKvO/uaEnVqB8AU7CzhQVh0SHRtRmY2aicBj5/JFbO2iX+hHE2Clem9tOSlMAtLEMdKI= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2016 15:56:55.6038 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0802MB2478 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Userspace will need them too. Signed-off-by: Roman Kagan --- arch/x86/include/uapi/asm/hyperv.h | 9 +++++++++ drivers/hv/hyperv_vmbus.h | 10 ---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/arch/x86/include/uapi/asm/hyperv.h b/arch/x86/include/uapi/asm/hyperv.h index e081615..5d6e525 100644 --- a/arch/x86/include/uapi/asm/hyperv.h +++ b/arch/x86/include/uapi/asm/hyperv.h @@ -419,4 +419,13 @@ struct hv_monitor_page { __u8 rsvdz4[1984]; }; +/* VMBus expects pre-established communication with the following IDs */ +#define VMBUS_MESSAGE_CONNECTION_ID 1 +#define VMBUS_MESSAGE_PORT_ID 1 +#define VMBUS_EVENT_CONNECTION_ID 2 +#define VMBUS_EVENT_PORT_ID 2 +#define VMBUS_MONITOR_CONNECTION_ID 3 +#define VMBUS_MONITOR_PORT_ID 3 +#define VMBUS_MESSAGE_SINT 2 + #endif diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h index 7f247f2..c0a65f7 100644 --- a/drivers/hv/hyperv_vmbus.h +++ b/drivers/hv/hyperv_vmbus.h @@ -114,16 +114,6 @@ enum hv_guest_os_microsoft_ids { }; -enum { - VMBUS_MESSAGE_CONNECTION_ID = 1, - VMBUS_MESSAGE_PORT_ID = 1, - VMBUS_EVENT_CONNECTION_ID = 2, - VMBUS_EVENT_PORT_ID = 2, - VMBUS_MONITOR_CONNECTION_ID = 3, - VMBUS_MONITOR_PORT_ID = 3, - VMBUS_MESSAGE_SINT = 2, -}; - /* #defines */ #define HV_PRESENT_BIT 0x80000000 -- 2.9.3