From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: Re: [PATCH v4 1/4] kvm: Update kernel headers against kvm.git Date: Thu, 5 Apr 2012 12:44:32 +0300 Message-ID: <20120405094432.GA28808@redhat.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Avi Kivity , Marcelo Tosatti , kvm@vger.kernel.org, Alex Williamson To: Jan Kiszka Return-path: Received: from mx1.redhat.com ([209.132.183.28]:44481 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753965Ab2DEJoS (ORCPT ); Thu, 5 Apr 2012 05:44:18 -0400 Content-Disposition: inline In-Reply-To: Sender: kvm-owner@vger.kernel.org List-ID: On Thu, Mar 08, 2012 at 11:10:24AM +0100, Jan Kiszka wrote: > Required for INTx masking / host IRQ sharing support of assigned > devices. > > Corresponding kvm.git hash: 186195928e > > Signed-off-by: Jan Kiszka Acked-by: Michael S. Tsirkin > --- > linux-headers/asm-s390/kvm.h | 2 ++ > linux-headers/linux/kvm.h | 6 ++++++ > 2 files changed, 8 insertions(+), 0 deletions(-) > > diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h > index 9acbde4..9607667 100644 > --- a/linux-headers/asm-s390/kvm.h > +++ b/linux-headers/asm-s390/kvm.h > @@ -44,10 +44,12 @@ struct kvm_guest_debug_arch { > #define KVM_SYNC_PREFIX (1UL << 0) > #define KVM_SYNC_GPRS (1UL << 1) > #define KVM_SYNC_ACRS (1UL << 2) > +#define KVM_SYNC_CRS (1UL << 3) > /* definition of registers in kvm_run */ > struct kvm_sync_regs { > __u64 prefix; /* prefix register */ > __u64 gprs[16]; /* general purpose registers */ > __u32 acrs[16]; /* access registers */ > + __u64 crs[16]; /* control registers */ > }; > #endif > diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h > index f6b5343..cf7b098 100644 > --- a/linux-headers/linux/kvm.h > +++ b/linux-headers/linux/kvm.h > @@ -588,6 +588,7 @@ struct kvm_ppc_pvinfo { > #define KVM_CAP_TSC_DEADLINE_TIMER 72 > #define KVM_CAP_S390_UCONTROL 73 > #define KVM_CAP_SYNC_REGS 74 > +#define KVM_CAP_PCI_2_3 75 > > #ifdef KVM_CAP_IRQ_ROUTING > > @@ -784,6 +785,9 @@ struct kvm_s390_ucas_mapping { > /* Available with KVM_CAP_TSC_CONTROL */ > #define KVM_SET_TSC_KHZ _IO(KVMIO, 0xa2) > #define KVM_GET_TSC_KHZ _IO(KVMIO, 0xa3) > +/* Available with KVM_CAP_PCI_2_3 */ > +#define KVM_ASSIGN_SET_INTX_MASK _IOW(KVMIO, 0xa4, \ > + struct kvm_assigned_pci_dev) > > /* > * ioctls for vcpu fds > @@ -857,6 +861,8 @@ struct kvm_s390_ucas_mapping { > #define KVM_SET_ONE_REG _IOW(KVMIO, 0xac, struct kvm_one_reg) > > #define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0) > +#define KVM_DEV_ASSIGN_PCI_2_3 (1 << 1) > +#define KVM_DEV_ASSIGN_MASK_INTX (1 << 2) > > struct kvm_assigned_pci_dev { > __u32 assigned_dev_id; > -- > 1.7.3.4