On 01/03/12 15:46, Christoffer Dall wrote:
> On Thu, Mar 1, 2012 at 3:19 AM, Peter Maydell <peter.maydell at linaro.org> wrote:
>> On 1 March 2012 01:32, Rusty Russell <rusty at rustcorp.com.au> wrote:
>>> I realise this header is a local commit, but it needs this to compile
>>> since commit 1529ae1bc61a15e9a243dcbad70c95dfcdd1f0c5 (KVM: Update
>>> headers (except HIOR mess)).
>>>
>>> Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
>>>
>>> diff --git a/linux-headers/asm-arm/kvm.h b/linux-headers/asm-arm/kvm.h
>>> index ff88ca0..260c000 100644
>>> --- a/linux-headers/asm-arm/kvm.h
>>> +++ b/linux-headers/asm-arm/kvm.h
>>> @@ -72,4 +72,6 @@ struct kvm_guest_debug_arch {
>>> struct kvm_debug_exit_arch {
>>> };
>>>
>>> +struct kvm_sync_regs {
>>> +};
>>> #endif /* __ARM_KVM_H__ */
>>
>> Ideally I'd like this as a kernel header commit that we can
>> import, but if that's really not going to happen soon I can
>> commit the local fix to qemu.
>>
> I can definitely try to make this happen properly over the weekend,
> but I was unsure if we want to rebase Catalin's tree with LPAE support
> on kvm.next, the other way around, or... I mean, there will be no good
> base to apply the KVM patch series on top of afterwards, but do we in
> that case simply wait for LPAE support to be upstreamed (which we may
> have to wait for anyhow?)?
LPAE has hit mainline during the 3.3 merge window, and I'm running KVM
with 3.3-rc3 at the moment.
M.
--
Jazz is not dead. It just smells funny...
