Re: [Qemu-devel] [PATCH v4 00/15] uq/master: Introduce basic irqchip support

[Jan Kiszka]

On 2011-12-12 17:51, Jan Kiszka wrote:
> On 2011-12-12 17:37, Marcelo Tosatti wrote:
>> On Thu, Dec 08, 2011 at 12:52:19PM +0100, Jan Kiszka wrote:
>>> Changes in v4:
>>> - rebased of current uq/master
>>> - fixed stupid bugs that broke bisectability and user space irqchip mode
>>> - integrated NMI-over-LINT1 injection logic
>>>
>>> CC: Lai Jiangshan <address@hidden>
>>>
>>> Jan Kiszka (15):
>>>   msi: Generalize msix_supported to msi_supported
>>>   kvm: Move kvmclock into hw/kvm folder
>>>   apic: Stop timer on reset
>>>   apic: Inject external NMI events via LINT1
>>>   apic: Introduce backend/frontend infrastructure for KVM reuse
>>>   apic: Open-code timer save/restore
>>>   i8259: Introduce backend/frontend infrastructure for KVM reuse
>>>   ioapic: Introduce backend/frontend infrastructure for KVM reuse
>>>   memory: Introduce memory_region_init_reservation
>>>   kvm: Introduce core services for in-kernel irqchip support
>>>   kvm: x86: Establish IRQ0 override control
>>>   kvm: x86: Add user space part for in-kernel APIC
>>>   kvm: x86: Add user space part for in-kernel i8259
>>>   kvm: x86: Add user space part for in-kernel IOAPIC
>>>   kvm: Arm in-kernel irqchip support
>>
>> Looks good to me.
>>
>> Any thoughts on the qemu-kvm merge plan? Sounds painful.
> 
> Pain will be where the existing qemu-kvm extensions collide with these
> refactored upstream devices (backend/frontend split specifically).
> That's where we have to merge very carefully. Haven't tried this yet,
> will give it a spin tomorrow or so.

Done yesterday, still seems to work fine. The result can be found at

git://git.kiszka.org/qemu-kvm.git kvm-irqchip-merge

The integration of the upstream irqchip patches was, as expected, not
that hard. But the merge of my earlier refactorings, the
backend/frontend split-up caused some efforts.

I'm not sure what to do with that branch. We could either try to merge
it before pulling in an upstream version that includes the new irqchips.
But that won't work without manual conflict resolution as well. Or the
branch can serve as a reference for re-doing a merge later on.

Jan

-- 
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux