| Message ID | 1452595842-20880-3-git-send-email-asmetanin@virtuozzo.com |
|---|---|
| State | New |
| Headers | show |
> -----Original Message----- > From: Andrey Smetanin [mailto:asmetanin@virtuozzo.com] > Sent: Tuesday, January 12, 2016 2:51 AM > To: kvm@vger.kernel.org > Cc: Gleb Natapov <gleb@kernel.org>; Paolo Bonzini > <pbonzini@redhat.com>; Joerg Roedel <joro@8bytes.org>; KY Srinivasan > <kys@microsoft.com>; Haiyang Zhang <haiyangz@microsoft.com>; Roman > Kagan <rkagan@virtuozzo.com>; Denis V. Lunev <den@openvz.org>; qemu- > devel@nongnu.org > Subject: [PATCH v1 2/5] drivers/hv: Move VMBus hypercall codes into Hyper- > V UAPI header > > VMBus hypercall codes inside Hyper-V UAPI header will > be used by QEMU to implement VMBus host devices support. > > Signed-off-by: Andrey Smetanin <asmetanin@virtuozzo.com> > Reviewed-by: Roman Kagan <rkagan@virtuozzo.com> > CC: Gleb Natapov <gleb@kernel.org> > CC: Paolo Bonzini <pbonzini@redhat.com> > CC: Joerg Roedel <joro@8bytes.org> > CC: "K. Y. Srinivasan" <kys@microsoft.com> > CC: Haiyang Zhang <haiyangz@microsoft.com> > CC: Roman Kagan <rkagan@virtuozzo.com> > CC: Denis V. Lunev <den@openvz.org> > CC: qemu-devel@nongnu.org Acked-by: K. Y. Srinivasan <kys@microsoft.com> > > --- > arch/x86/include/uapi/asm/hyperv.h | 2 ++ > drivers/hv/hv.c | 5 +++-- > drivers/hv/hyperv_vmbus.h | 6 ------ > 3 files changed, 5 insertions(+), 8 deletions(-) > > diff --git a/arch/x86/include/uapi/asm/hyperv.h > b/arch/x86/include/uapi/asm/hyperv.h > index 0c50fab..bc1c8a9 100644 > --- a/arch/x86/include/uapi/asm/hyperv.h > +++ b/arch/x86/include/uapi/asm/hyperv.h > @@ -227,6 +227,8 @@ > > /* Declare the various hypercall operations. */ > #define HV_X64_HCALL_NOTIFY_LONG_SPIN_WAIT 0x0008 > +#define HV_X64_HCALL_POST_MESSAGE 0x005c > +#define HV_X64_HCALL_SIGNAL_EVENT 0x005d > > #define HV_X64_MSR_APIC_ASSIST_PAGE_ENABLE 0x00000001 > #define HV_X64_MSR_APIC_ASSIST_PAGE_ADDRESS_SHIFT 12 > diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c > index 6341be8..56437d5 100644 > --- a/drivers/hv/hv.c > +++ b/drivers/hv/hv.c > @@ -329,7 +329,7 @@ int hv_post_message(union hv_connection_id > connection_id, > aligned_msg->payload_size = payload_size; > memcpy((void *)aligned_msg->payload, payload, payload_size); > > - status = do_hypercall(HVCALL_POST_MESSAGE, aligned_msg, NULL) > + status = do_hypercall(HV_X64_HCALL_POST_MESSAGE, > aligned_msg, NULL) > & 0xFFFF; > > put_cpu(); > @@ -347,7 +347,8 @@ u16 hv_signal_event(void *con_id) > { > u16 status; > > - status = (do_hypercall(HVCALL_SIGNAL_EVENT, con_id, NULL) & > 0xFFFF); > + status = (do_hypercall(HV_X64_HCALL_SIGNAL_EVENT, con_id, > NULL) > + & 0xFFFF); > > return status; > } > diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h > index 678663e..36cad1f 100644 > --- a/drivers/hv/hyperv_vmbus.h > +++ b/drivers/hv/hyperv_vmbus.h > @@ -251,12 +251,6 @@ struct hv_monitor_page { > u8 rsvdz4[1984]; > }; > > -/* Declare the various hypercall operations. */ > -enum hv_call_code { > - HVCALL_POST_MESSAGE = 0x005c, > - HVCALL_SIGNAL_EVENT = 0x005d, > -}; > - > /* Definition of the hv_post_message hypercall input structure. */ > struct hv_input_post_message { > union hv_connection_id connectionid; > -- > 2.4.3
diff --git a/arch/x86/include/uapi/asm/hyperv.h b/arch/x86/include/uapi/asm/hyperv.h index 0c50fab..bc1c8a9 100644 --- a/arch/x86/include/uapi/asm/hyperv.h +++ b/arch/x86/include/uapi/asm/hyperv.h @@ -227,6 +227,8 @@ /* Declare the various hypercall operations. */ #define HV_X64_HCALL_NOTIFY_LONG_SPIN_WAIT 0x0008 +#define HV_X64_HCALL_POST_MESSAGE 0x005c +#define HV_X64_HCALL_SIGNAL_EVENT 0x005d #define HV_X64_MSR_APIC_ASSIST_PAGE_ENABLE 0x00000001 #define HV_X64_MSR_APIC_ASSIST_PAGE_ADDRESS_SHIFT 12 diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c index 6341be8..56437d5 100644 --- a/drivers/hv/hv.c +++ b/drivers/hv/hv.c @@ -329,7 +329,7 @@ int hv_post_message(union hv_connection_id connection_id, aligned_msg->payload_size = payload_size; memcpy((void *)aligned_msg->payload, payload, payload_size); - status = do_hypercall(HVCALL_POST_MESSAGE, aligned_msg, NULL) + status = do_hypercall(HV_X64_HCALL_POST_MESSAGE, aligned_msg, NULL) & 0xFFFF; put_cpu(); @@ -347,7 +347,8 @@ u16 hv_signal_event(void *con_id) { u16 status; - status = (do_hypercall(HVCALL_SIGNAL_EVENT, con_id, NULL) & 0xFFFF); + status = (do_hypercall(HV_X64_HCALL_SIGNAL_EVENT, con_id, NULL) + & 0xFFFF); return status; } diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h index 678663e..36cad1f 100644 --- a/drivers/hv/hyperv_vmbus.h +++ b/drivers/hv/hyperv_vmbus.h @@ -251,12 +251,6 @@ struct hv_monitor_page { u8 rsvdz4[1984]; }; -/* Declare the various hypercall operations. */ -enum hv_call_code { - HVCALL_POST_MESSAGE = 0x005c, - HVCALL_SIGNAL_EVENT = 0x005d, -}; - /* Definition of the hv_post_message hypercall input structure. */ struct hv_input_post_message { union hv_connection_id connectionid;