This series basically consists of two halves. The first one applies a few smaller cleanups to qemu-kvm to improve similarity with upstream. This includes the recently discussed removal of -enable-nesting. The second half starts with two device assignment fixes and then applies some refactorings, specifically dropping the libpci dependency and enabling the revert of some qemu-kvm private PCI core changes. The latter is achieved by simplifying the access control management to the passed-through device's config space. That also saves 100 LOC. Note that this series was tested with upstream commit af2be20777 ("Fix fallouts from Linux header inclusion") applied and probably depends on it also mechanically. Please review/merge. CC: Joerg Roedel <Joerg.Roedel@xxxxxxx> Jan Kiszka (13): qemu-kvm: Reduce configure and Makefile.target diff to upstream qemu-kvm: Drop some no longer needed #ifdefs qemu-kvm: Drop -enable-nesting command line switch qemu-kvm: Remove eventfd compat header qemu-kvm: Remove qemu_ram_unmap qemu-kvm: Drop or replace useless device-assignment.h inclusions pci-assign: Fix kvm_deassign_irq handling in assign_irq pci-assign: Update legacy interrupts only if used pci-assign: Drop libpci header dependency pci-assign: Refactor calc_assigned_dev_id pci-assign: Track MSI/MSI-X capability position, clean up related code pci-assign: Generic config space access management qemu-kvm: Resolve PCI upstream diffs Makefile.target | 2 - compat/sys/eventfd.h | 13 -- configure | 29 +--- cpu-common.h | 1 - exec.c | 13 -- hw/device-assignment.c | 450 +++++++++++++++++------------------------------- hw/device-assignment.h | 9 +- hw/pc.c | 1 - hw/pci-hotplug.c | 1 - hw/pci.c | 29 ++-- hw/pci.h | 8 +- hw/pci_regs.h | 7 - kvm-all.c | 4 - qemu-kvm-x86.c | 20 -- qemu-kvm.h | 30 ---- qemu-options.hx | 2 - target-i386/cpuid.c | 3 - target-i386/kvm.c | 2 - vl.c | 6 +- 19 files changed, 182 insertions(+), 448 deletions(-) delete mode 100644 compat/sys/eventfd.h -- 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