From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Graf Subject: Re: [PATCH 1/3] QEMU kvm: Syncing linux headers to 3.2.0-rc1 Date: Mon, 19 Dec 2011 14:51:27 +0100 Message-ID: <64B748A0-9246-40B8-93C5-816CD54128E1@suse.de> References: <20111204182541.28487.68163.sendpatchset@oc5400248562.ibm.com> <20111204182555.28487.78641.sendpatchset@oc5400248562.ibm.com> Mime-Version: 1.0 (Apple Message framework v1084) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8BIT Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org, Avi Kivity , Marcelo Tosatti , Jan Kiszka , Srivatsa Vaddagiri , Suzuki Poulose To: Raghavendra K T Return-path: Received: from cantor2.suse.de ([195.135.220.15]:46002 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752677Ab1LSNva convert rfc822-to-8bit (ORCPT ); Mon, 19 Dec 2011 08:51:30 -0500 In-Reply-To: <20111204182555.28487.78641.sendpatchset@oc5400248562.ibm.com> Sender: kvm-owner@vger.kernel.org List-ID: On 04.12.2011, at 19:25, Raghavendra K T wrote: > Update the kvm kernel headers to the 3.2.0-rc1 post using > scripts/update-linux-headers.sh script. > > Signed-off-by: Raghavendra K T > --- > diff --git a/linux-headers/asm-powerpc/kvm.h b/linux-headers/asm-powerpc/kvm.h > index fb3fddc..08fe69e 100644 > --- a/linux-headers/asm-powerpc/kvm.h > +++ b/linux-headers/asm-powerpc/kvm.h > @@ -149,6 +149,12 @@ struct kvm_regs { > #define KVM_SREGS_E_UPDATE_DBSR (1 << 3) > > /* > + * Book3S special bits to indicate contents in the struct by maintaining > + * backwards compatibility with older structs. If adding a new field, > + * please make sure to add a flag for that new field */ > +#define KVM_SREGS_S_HIOR (1 << 0) > + > +/* > * In KVM_SET_SREGS, reserved/pad fields must be left untouched from a > * previous KVM_GET_REGS. > * > @@ -170,9 +176,11 @@ struct kvm_sregs { > } ppc64; > struct { > __u32 sr[16]; > - __u64 ibat[8]; > - __u64 dbat[8]; > + __u64 ibat[8]; > + __u64 dbat[8]; > } ppc32; > + __u64 flags; /* KVM_SREGS_S_ */ > + __u64 hior; > } s; > struct { > union { > @@ -292,41 +300,4 @@ struct kvm_allocate_rma { > __u64 rma_size; > }; > > -struct kvm_book3e_206_tlb_entry { > - __u32 mas8; > - __u32 mas1; > - __u64 mas2; > - __u64 mas7_3; > -}; > - > -struct kvm_book3e_206_tlb_params { > - /* > - * For mmu types KVM_MMU_FSL_BOOKE_NOHV and KVM_MMU_FSL_BOOKE_HV: > - * > - * - The number of ways of TLB0 must be a power of two between 2 and > - * 16. > - * - TLB1 must be fully associative. > - * - The size of TLB0 must be a multiple of the number of ways, and > - * the number of sets must be a power of two. > - * - The size of TLB1 may not exceed 64 entries. > - * - TLB0 supports 4 KiB pages. > - * - The page sizes supported by TLB1 are as indicated by > - * TLB1CFG (if MMUCFG[MAVN] = 0) or TLB1PS (if MMUCFG[MAVN] = 1) > - * as returned by KVM_GET_SREGS. > - * - TLB2 and TLB3 are reserved, and their entries in tlb_sizes[] > - * and tlb_ways[] must be zero. > - * > - * tlb_ways[n] = tlb_sizes[n] means the array is fully associative. > - * > - * KVM will adjust TLBnCFG based on the sizes configured here, > - * though arrays greater than 2048 entries will have TLBnCFG[NENTRY] > - * set to zero. > - */ > - __u32 tlb_sizes[4]; > - __u32 tlb_ways[4]; > - __u32 reserved[8]; > -}; > - > -#define KVM_ONE_REG_PPC_HIOR KVM_ONE_REG_PPC | 0x100 > - > #endif /* __LINUX_KVM_POWERPC_H */ > diff --git a/linux-headers/asm-x86/hyperv.h b/linux-headers/asm-x86/hyperv.h > index 5df477a..b80420b 100644 > --- a/linux-headers/asm-x86/hyperv.h > +++ b/linux-headers/asm-x86/hyperv.h > @@ -189,5 +189,6 @@ > #define HV_STATUS_INVALID_HYPERCALL_CODE 2 > #define HV_STATUS_INVALID_HYPERCALL_INPUT 3 > #define HV_STATUS_INVALID_ALIGNMENT 4 > +#define HV_STATUS_INSUFFICIENT_BUFFERS 19 > > #endif > diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h > index a8761d3..07bd557 100644 > --- a/linux-headers/linux/kvm.h > +++ b/linux-headers/linux/kvm.h > @@ -371,6 +371,7 @@ struct kvm_s390_psw { > #define KVM_S390_INT_VIRTIO 0xffff2603u > #define KVM_S390_INT_SERVICE 0xffff2401u > #define KVM_S390_INT_EMERGENCY 0xffff1201u > +#define KVM_S390_INT_EXTERNAL_CALL 0xffff1202u > > struct kvm_s390_interrupt { > __u32 type; > @@ -556,8 +557,7 @@ struct kvm_ppc_pvinfo { > #define KVM_CAP_MAX_VCPUS 66 /* returns max vcpus per vm */ > #define KVM_CAP_PPC_HIOR 67 > #define KVM_CAP_PPC_PAPR 68 > -#define KVM_CAP_SW_TLB 69 > -#define KVM_CAP_ONE_REG 70 > +#define KVM_CAP_S390_GMAP 71 > > #ifdef KVM_CAP_IRQ_ROUTING > > @@ -637,49 +637,6 @@ struct kvm_clock_data { > __u32 pad[9]; > }; > > -#define KVM_MMU_FSL_BOOKE_NOHV 0 > -#define KVM_MMU_FSL_BOOKE_HV 1 > - > -struct kvm_config_tlb { > - __u64 params; > - __u64 array; > - __u32 mmu_type; > - __u32 array_len; > -}; > - > -struct kvm_dirty_tlb { > - __u64 bitmap; > - __u32 num_dirty; > -}; > - > -/* Available with KVM_CAP_ONE_REG */ > - > -#define KVM_ONE_REG_GENERIC 0x0000000000000000ULL You're removing definitions here, indicating that something is going wrong :). Alex From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49774) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rcdcs-0002uG-U2 for qemu-devel@nongnu.org; Mon, 19 Dec 2011 08:51:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rcdco-0005VJ-MS for qemu-devel@nongnu.org; Mon, 19 Dec 2011 08:51:34 -0500 Received: from cantor2.suse.de ([195.135.220.15]:46003 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rcdco-0005VF-AN for qemu-devel@nongnu.org; Mon, 19 Dec 2011 08:51:30 -0500 Mime-Version: 1.0 (Apple Message framework v1084) Content-Type: text/plain; charset=us-ascii From: Alexander Graf In-Reply-To: <20111204182555.28487.78641.sendpatchset@oc5400248562.ibm.com> Date: Mon, 19 Dec 2011 14:51:27 +0100 Content-Transfer-Encoding: quoted-printable Message-Id: <64B748A0-9246-40B8-93C5-816CD54128E1@suse.de> References: <20111204182541.28487.68163.sendpatchset@oc5400248562.ibm.com> <20111204182555.28487.78641.sendpatchset@oc5400248562.ibm.com> Subject: Re: [Qemu-devel] [PATCH 1/3] QEMU kvm: Syncing linux headers to 3.2.0-rc1 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Raghavendra K T Cc: kvm@vger.kernel.org, Jan Kiszka , Marcelo Tosatti , Srivatsa Vaddagiri , qemu-devel@nongnu.org, Suzuki Poulose , Avi Kivity On 04.12.2011, at 19:25, Raghavendra K T wrote: > Update the kvm kernel headers to the 3.2.0-rc1 post using > scripts/update-linux-headers.sh script. >=20 > Signed-off-by: Raghavendra K T > --- > diff --git a/linux-headers/asm-powerpc/kvm.h = b/linux-headers/asm-powerpc/kvm.h > index fb3fddc..08fe69e 100644 > --- a/linux-headers/asm-powerpc/kvm.h > +++ b/linux-headers/asm-powerpc/kvm.h > @@ -149,6 +149,12 @@ struct kvm_regs { > #define KVM_SREGS_E_UPDATE_DBSR (1 << 3) >=20 > /* > + * Book3S special bits to indicate contents in the struct by = maintaining > + * backwards compatibility with older structs. If adding a new field, > + * please make sure to add a flag for that new field */ > +#define KVM_SREGS_S_HIOR (1 << 0) > + > +/* > * In KVM_SET_SREGS, reserved/pad fields must be left untouched from a > * previous KVM_GET_REGS. > * > @@ -170,9 +176,11 @@ struct kvm_sregs { > } ppc64; > struct { > __u32 sr[16]; > - __u64 ibat[8]; > - __u64 dbat[8]; > + __u64 ibat[8];=20 > + __u64 dbat[8];=20 > } ppc32; > + __u64 flags; /* KVM_SREGS_S_ */ > + __u64 hior; > } s; > struct { > union { > @@ -292,41 +300,4 @@ struct kvm_allocate_rma { > __u64 rma_size; > }; >=20 > -struct kvm_book3e_206_tlb_entry { > - __u32 mas8; > - __u32 mas1; > - __u64 mas2; > - __u64 mas7_3; > -}; > - > -struct kvm_book3e_206_tlb_params { > - /* > - * For mmu types KVM_MMU_FSL_BOOKE_NOHV and = KVM_MMU_FSL_BOOKE_HV: > - * > - * - The number of ways of TLB0 must be a power of two between 2 = and > - * 16. > - * - TLB1 must be fully associative. > - * - The size of TLB0 must be a multiple of the number of ways, = and > - * the number of sets must be a power of two. > - * - The size of TLB1 may not exceed 64 entries. > - * - TLB0 supports 4 KiB pages. > - * - The page sizes supported by TLB1 are as indicated by > - * TLB1CFG (if MMUCFG[MAVN] =3D 0) or TLB1PS (if MMUCFG[MAVN] = =3D 1) > - * as returned by KVM_GET_SREGS. > - * - TLB2 and TLB3 are reserved, and their entries in = tlb_sizes[] > - * and tlb_ways[] must be zero. > - * > - * tlb_ways[n] =3D tlb_sizes[n] means the array is fully = associative. > - * > - * KVM will adjust TLBnCFG based on the sizes configured here, > - * though arrays greater than 2048 entries will have = TLBnCFG[NENTRY] > - * set to zero. > - */ > - __u32 tlb_sizes[4]; > - __u32 tlb_ways[4]; > - __u32 reserved[8]; > -}; > - > -#define KVM_ONE_REG_PPC_HIOR KVM_ONE_REG_PPC | 0x100 > - > #endif /* __LINUX_KVM_POWERPC_H */ > diff --git a/linux-headers/asm-x86/hyperv.h = b/linux-headers/asm-x86/hyperv.h > index 5df477a..b80420b 100644 > --- a/linux-headers/asm-x86/hyperv.h > +++ b/linux-headers/asm-x86/hyperv.h > @@ -189,5 +189,6 @@ > #define HV_STATUS_INVALID_HYPERCALL_CODE 2 > #define HV_STATUS_INVALID_HYPERCALL_INPUT 3 > #define HV_STATUS_INVALID_ALIGNMENT 4 > +#define HV_STATUS_INSUFFICIENT_BUFFERS 19 >=20 > #endif > diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h > index a8761d3..07bd557 100644 > --- a/linux-headers/linux/kvm.h > +++ b/linux-headers/linux/kvm.h > @@ -371,6 +371,7 @@ struct kvm_s390_psw { > #define KVM_S390_INT_VIRTIO 0xffff2603u > #define KVM_S390_INT_SERVICE 0xffff2401u > #define KVM_S390_INT_EMERGENCY 0xffff1201u > +#define KVM_S390_INT_EXTERNAL_CALL 0xffff1202u >=20 > struct kvm_s390_interrupt { > __u32 type; > @@ -556,8 +557,7 @@ struct kvm_ppc_pvinfo { > #define KVM_CAP_MAX_VCPUS 66 /* returns max vcpus per vm */ > #define KVM_CAP_PPC_HIOR 67 > #define KVM_CAP_PPC_PAPR 68 > -#define KVM_CAP_SW_TLB 69 > -#define KVM_CAP_ONE_REG 70 > +#define KVM_CAP_S390_GMAP 71 >=20 > #ifdef KVM_CAP_IRQ_ROUTING >=20 > @@ -637,49 +637,6 @@ struct kvm_clock_data { > __u32 pad[9]; > }; >=20 > -#define KVM_MMU_FSL_BOOKE_NOHV 0 > -#define KVM_MMU_FSL_BOOKE_HV 1 > - > -struct kvm_config_tlb { > - __u64 params; > - __u64 array; > - __u32 mmu_type; > - __u32 array_len; > -}; > - > -struct kvm_dirty_tlb { > - __u64 bitmap; > - __u32 num_dirty; > -}; > - > -/* Available with KVM_CAP_ONE_REG */ > - > -#define KVM_ONE_REG_GENERIC 0x0000000000000000ULL You're removing definitions here, indicating that something is going = wrong :). Alex