On Tue, Mar 6, 2012 at 5:53 AM, Peter Maydell <peter.maydell at linaro.org> wrote: > On 5 March 2012 04:21, Rusty Russell <rusty at rustcorp.com.au> wrote: >> diff --git a/linux-headers/asm-arm/kvm.h b/linux-headers/asm-arm/kvm.h >> index ff88ca0..8caa83b 100644 >> --- a/linux-headers/asm-arm/kvm.h >> +++ b/linux-headers/asm-arm/kvm.h >> @@ -55,6 +59,7 @@ struct kvm_regs { >> ? ? ? ? ? ? ? ?__u32 c1_sys; >> ? ? ? ? ? ? ? ?__u32 c2_base0; >> ? ? ? ? ? ? ? ?__u32 c2_base1; >> + ? ? ? ? ? ? ? __u32 c2_control; >> ? ? ? ? ? ? ? ?__u32 c3_dacr; >> ? ? ? ?} cp15; > > Which kernel tree is this in? I checked Christoffer's kvm-a15-patches > branch and Marc's kvm-v3.3-rc1 and kvm-v6-v3.3-rc3 branches and none > of those seem to have this extra field. > This field is present in the v6 branch in arch/arm/include/asm/kvm.h As for the new header import, I am actively working on it. Just have to figure out how to get the necessary platform support on top of the kvm.next tree. > We may not have frozen the ABI here yet but I'm starting to think > we need to be a bit more careful about coordinating updates to it > between kernel trees: QEMU can't track more than one of them... > true...