The second round of merging qemu-kvm with upstream. This part stops after switching to upstreams kvm_init implementation. To achieve this, various small cleanups and refactorings are applied, the irq0 override management is simplified and the kvm_context fields are migrated into KVMState. Please review/merge. Jan Kiszka (16): qemu-kvm: Drop kvm_cpu_register_phys_memory_client wrapper qemu-kvm: Drop kvm_inject_interrupt Revert "qemu-kvm-x86: consider the irq0override flag in kvm_arch_init_irq_routing" qemu-kvm: Drop IRQ0 override test from ioapic_set_irq qemu-kvm: Clean up IRQ0 override configuration qemu-kvm: Refactor irqchip and routing initialization qemu-kvm: Fold kvm_get_gsi_count into kvm_create_irqchip qemu-kvm: Make some private functions static qemu-kvm: Implement kvm_has_pit_state2 in upstream style qemu-kvm: Fold kvm_set_irq_level into kvm_set_irq qemu-kvm: Remove kvm_context from public interfaces qemu-kvm: Fold kvm_set_boot_vcpu_id into kvm_set_boot_cpu_id qemu-kvm: Remove handle_io_window qemu-kvm: Merge kvm_context into KVMState qemu-kvm: Use KVM-optimized interrupt handler qemu-kvm: Use upstream kvm_init exec.c | 2 - hw/device-assignment.c | 21 ++- hw/i8254-kvm.c | 12 +- hw/i8254.c | 4 +- hw/i8259.c | 4 +- hw/ioapic.c | 7 +- hw/pc.c | 2 +- hw/pcspk.c | 4 +- kvm-all.c | 48 ++++-- kvm-stub.c | 10 + kvm.h | 17 +- monitor.c | 5 +- qemu-kvm-x86.c | 51 +++--- qemu-kvm.c | 461 ++++++++++++++---------------------------------- qemu-kvm.h | 166 ++---------------- sysemu.h | 1 - target-i386/kvm.c | 8 +- vl.c | 1 - 18 files changed, 257 insertions(+), 567 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html