Re: [Qemu-devel] [PATCH v3 2/5] drivers/hv: Move VMBus hypercall codes into Hyper-V UAPI header

[Andrey Smetanin]

On 02/12/2016 12:46 AM, Paolo Bonzini wrote:
> On 11/02/2016 14:44, Andrey Smetanin wrote:
> > VMBus hypercall codes inside Hyper-V UAPI header will
> > be used by QEMU to implement VMBus host devices support.
> >
> > Signed-off-by: Andrey Smetanin <address@hidden>
> > Acked-by: K. Y. Srinivasan <address@hidden>
> > Reviewed-by: Roman Kagan <address@hidden>
> > CC: Gleb Natapov <address@hidden>
> > CC: Paolo Bonzini <address@hidden>
> > CC: Joerg Roedel <address@hidden>
> > CC: "K. Y. Srinivasan" <address@hidden>
> > CC: Haiyang Zhang <address@hidden>
> > CC: Roman Kagan <address@hidden>
> > CC: Denis V. Lunev <address@hidden>
> > CC: address@hidden
> > ---
> >   arch/x86/include/uapi/asm/hyperv.h | 2 ++
> >   drivers/hv/connection.c            | 2 +-
> >   drivers/hv/hv.c                    | 2 +-
> >   drivers/hv/hyperv_vmbus.h          | 6 ------
> >   4 files changed, 4 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/connection.c b/drivers/hv/connection.c
> > index fa86b2c..84700c6 100644
> > --- a/drivers/hv/connection.c
> > +++ b/drivers/hv/connection.c
> > @@ -485,5 +485,5 @@ void vmbus_set_event(struct vmbus_channel *channel)
> >                         (child_relid >> 5));
> >         }
> >
> > -       hv_do_hypercall(HVCALL_SIGNAL_EVENT, channel->sig_event, NULL);
> > +       hv_do_hypercall(HV_X64_HCALL_SIGNAL_EVENT, channel->sig_event, NULL);
>
> What tree does this apply to?
next-20160211
> Paolo
>
> >   }
> > diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
> > index ccb335f..48388dc 100644
> > --- a/drivers/hv/hv.c
> > +++ b/drivers/hv/hv.c
> > @@ -337,7 +337,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 = hv_do_hypercall(HVCALL_POST_MESSAGE, aligned_msg, NULL);
> > +       status = hv_do_hypercall(HV_X64_HCALL_POST_MESSAGE, aligned_msg, NULL);
> >
> >         put_cpu();
> >         return status & 0xFFFF;
> > diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
> > index b9ea7f5..1dabaa4 100644
> > --- a/drivers/hv/hyperv_vmbus.h
> > +++ b/drivers/hv/hyperv_vmbus.h
> > @@ -256,12 +256,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;