| Message ID | 1445853060-24201-4-git-send-email-asmetanin@virtuozzo.com |
|---|---|
| State | New |
| Headers | show |
On 26 October 2015 at 09:50, Andrey Smetanin <asmetanin@virtuozzo.com> wrote: > Signed-off-by: Andrey Smetanin <asmetanin@virtuozzo.com> > Reviewed-by: Roman Kagan <rkagan@virtuozzo.com> > Signed-off-by: Denis V. Lunev <den@openvz.org> > CC: Vitaly Kuznetsov <vkuznets@redhat.com> > CC: "K. Y. Srinivasan" <kys@microsoft.com> > CC: Gleb Natapov <gleb@kernel.org> > CC: Paolo Bonzini <pbonzini@redhat.com> > CC: Roman Kagan <rkagan@virtuozzo.com> > CC: Denis V. Lunev <den@openvz.org> > CC: kvm@vger.kernel.org > CC: virtualization@lists.linux-foundation.org > > --- > linux-headers/linux/kvm.h | 8 ++++++++ > 1 file changed, 8 insertions(+) Hi. Changes to linux-headers/ should only be made as part of an automated update from a mainline Linux kernel tree using the scripts/update-linux-headers.sh script. This patch looks like maybe it was a manual edit ? thanks -- PMM
On 10/26/2015 01:03 PM, Peter Maydell wrote: > On 26 October 2015 at 09:50, Andrey Smetanin <asmetanin@virtuozzo.com> wrote: >> Signed-off-by: Andrey Smetanin <asmetanin@virtuozzo.com> >> Reviewed-by: Roman Kagan <rkagan@virtuozzo.com> >> Signed-off-by: Denis V. Lunev <den@openvz.org> >> CC: Vitaly Kuznetsov <vkuznets@redhat.com> >> CC: "K. Y. Srinivasan" <kys@microsoft.com> >> CC: Gleb Natapov <gleb@kernel.org> >> CC: Paolo Bonzini <pbonzini@redhat.com> >> CC: Roman Kagan <rkagan@virtuozzo.com> >> CC: Denis V. Lunev <den@openvz.org> >> CC: kvm@vger.kernel.org >> CC: virtualization@lists.linux-foundation.org >> >> --- >> linux-headers/linux/kvm.h | 8 ++++++++ >> 1 file changed, 8 insertions(+) > Hi. Changes to linux-headers/ should only be made as part of > an automated update from a mainline Linux kernel tree using > the scripts/update-linux-headers.sh script. This patch looks > like maybe it was a manual edit ? > > thanks > -- PMM yep. We know and have discussed this with Paolo already. Kernel stuff is in progress at the moment. The patch is presented to interested people to allow to compile and run. Actual merge will be performed with proper sync when kernel will be in rc3 or 4 stage and the patch will be dropped. The same applies for patch 5. Den
On 26 October 2015 at 10:12, Denis V. Lunev <den@openvz.org> wrote: > On 10/26/2015 01:03 PM, Peter Maydell wrote: >> Hi. Changes to linux-headers/ should only be made as part of >> an automated update from a mainline Linux kernel tree using >> the scripts/update-linux-headers.sh script. This patch looks >> like maybe it was a manual edit ? > yep. We know and have discussed this with Paolo already. > Kernel stuff is in progress at the moment. The patch > is presented to interested people to allow to compile and > run. > > Actual merge will be performed with proper sync > when kernel will be in rc3 or 4 stage and the patch will be > dropped. OK, cool. It's best to tag the series as 'RFC' rather than 'PATCH' in that case, as a reminder that it can't be applied just yet. thanks -- PMM
On 26/10/2015 11:16, Peter Maydell wrote: > On 26 October 2015 at 10:12, Denis V. Lunev <den@openvz.org> wrote: >> On 10/26/2015 01:03 PM, Peter Maydell wrote: >>> Hi. Changes to linux-headers/ should only be made as part of >>> an automated update from a mainline Linux kernel tree using >>> the scripts/update-linux-headers.sh script. This patch looks >>> like maybe it was a manual edit ? > >> yep. We know and have discussed this with Paolo already. >> Kernel stuff is in progress at the moment. The patch >> is presented to interested people to allow to compile and >> run. >> >> Actual merge will be performed with proper sync >> when kernel will be in rc3 or 4 stage and the patch will be >> dropped. > > OK, cool. It's best to tag the series as 'RFC' rather than > 'PATCH' in that case, as a reminder that it can't be applied > just yet. I'm still going to apply it to a branch for now, so it's not strictly RFC. I'm not sending a pull request, however, until I rebase the branch, and then it will just go away. Paolo
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h index dcc410e..0bff588 100644 --- a/linux-headers/linux/kvm.h +++ b/linux-headers/linux/kvm.h @@ -831,6 +831,7 @@ struct kvm_ppc_smmu_info { #define KVM_CAP_GUEST_DEBUG_HW_WPS 120 #define KVM_CAP_SPLIT_IRQCHIP 121 #define KVM_CAP_IOEVENTFD_ANY_LENGTH 122 +#define KVM_CAP_HYPERV_SYNIC 123 #ifdef KVM_CAP_IRQ_ROUTING @@ -854,10 +855,16 @@ struct kvm_irq_routing_s390_adapter { __u32 adapter_id; }; +struct kvm_irq_routing_hv_sint { + __u32 vcpu; + __u32 sint; +}; + /* gsi routing entry types */ #define KVM_IRQ_ROUTING_IRQCHIP 1 #define KVM_IRQ_ROUTING_MSI 2 #define KVM_IRQ_ROUTING_S390_ADAPTER 3 +#define KVM_IRQ_ROUTING_HV_SINT 4 struct kvm_irq_routing_entry { __u32 gsi; @@ -868,6 +875,7 @@ struct kvm_irq_routing_entry { struct kvm_irq_routing_irqchip irqchip; struct kvm_irq_routing_msi msi; struct kvm_irq_routing_s390_adapter adapter; + struct kvm_irq_routing_hv_sint hv_sint; __u32 pad[8]; } u; };