From: Roman Kagan <rkagan@virtuozzo.com>
To: Paolo Bonzini <pbonzini@redhat.com>,
        =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= <rkrcmar@redhat.com>,
        "K. Y. Srinivasan" <kys@microsoft.com>,
        Vitaly Kuznetsov <vkuznets@redhat.com>
CC: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>, <x86@kernel.org>,
        Haiyang Zhang <haiyangz@microsoft.com>, <kvm@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>, <devel@linuxdriverproject.org>,
        "Denis V . Lunev" <den@openvz.org>, Roman Kagan <rkagan@virtuozzo.com>
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>
In-Reply-To: <20161220155602.6298-1-rkagan@virtuozzo.com>
References: <20161220155602.6298-1-rkagan@virtuozzo.com>
MIME-Version: 1.0
Content-Type: text/plain
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1360
Lines: 49

Userspace will need them too.

Signed-off-by: Roman Kagan <rkagan@virtuozzo.com>
---
 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