From mboxrd@z Thu Jan 1 00:00:00 1970 From: 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> References: <20161220155602.6298-1-rkagan@virtuozzo.com> Mime-Version: 1.0 Content-Type: text/plain Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , , Haiyang Zhang , , , , "Denis V . Lunev" , Roman Kagan To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , "K. Y. Srinivasan" , Vitaly Kuznetsov Return-path: In-Reply-To: <20161220155602.6298-1-rkagan@virtuozzo.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.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