The following changes since commit 75b4a94628c5035b5c350eff4a4edf923b5dc33a: pci-assign: Drop kvm_assigned_irq::host_irq initialization (2012-06-01 20:51:10 -0300) are available in the git repository at: git://git.kiszka.org/qemu-kvm.git queues/qemu-merge This is the back-merge of post-1.1 upstream master with latest kvm changes into qemu-kvm. It switches to upstream MSI/MSI-X handling and replaces the MSI-X masking notifier with upstream's MSI vector notifier. The switch of the latter feature is done in a single merge as creating intermediate steps would have required the writing of quite a bit of temporary code. Please test and merge. Anthony Liguori (4): Update version for 1.1.0 release Update version to open the 1.2 development branch Merge remote-tracking branch 'kwolf/for-anthony' into staging Merge remote-tracking branch 'qemu-kvm/uq/master' into staging Avi Kivity (1): kvm: update vmxcap for EPT A/D, INVPCID, RDRAND, VMFUNC Christian Borntraeger (1): virtio-blk: Fix geometry sector calculation Daniel Verkamp (1): ahci: SATA FIS is 20 bytes, not 0x20 Jan Kiszka (33): Introduce MSIMessage structure kvm: Refactor KVMState::max_gsi to gsi_count kvm: Introduce basic MSI support for in-kernel irqchips pc: Enable MSI support at APIC level kvm: Update kernel headers kvm: Enable in-kernel irqchip support by default kvm: x86: Wire up MSI support for in-kernel irqchip kvm: Add support for direct MSI injections msix: Introduce vector notifiers kvm: Rename kvm_irqchip_add_route to kvm_irqchip_add_irq_route kvm: Introduce kvm_irqchip_add_msi_route kvm: Publicize kvm_irqchip_release_virq kvm: Make kvm_irqchip_commit_routes an internal service msix: Factor out msix_get_message msix: Invoke msix_handle_mask_update on msix_mask_all kvm: Introduce kvm_irqchip_add/remove_irqfd kvm: Enable use of kvm_irqchip_in_kernel in hwlib code msix: Add msix_nr_vectors_allocated virtio/vhost: Add support for KVM in-kernel MSI injection Merge commit '4e2e4e6355959a1af011167b0db5ac7ffd3adf94' Merge commit '04fa27f5ae5f025424bb7b88d3453c46e8900102' Merge commit '08a82ac01cb5409480128f8e1f144557d99b74a3' Merge commit 'ffb8d4296e01f0ead3ba81b08a34637c5bbff0da' Merge commit '4a3adebb1854d48f0c67958e164c6b2f29d44064' Merge commit '287d55c6769c3a38e9083b103cb148fb38858b3a' into queues/qemu-merge qemu-kvm: Drop redundant MSI hooks Merge commit 'bc4caf49c7fee6d1e063df32ca7554e5b98bfc89' into queues/qemu-merge Merge commit '5b5f1330da2d7e5b5cbde8c60738774b2bd8692f' into queues/qemu-merge Merge commit '7d37d351dffee60fc7048bbfd8573421f15eb724' into queues/qemu-merge Merge commit '8cc9b43f7c5f826b39af4b012ad89bb55faac29c' into queues/qemu-merge qemu-kvm: Drop redundant MSI-X hooks qemu-kvm: Drop unused kvm_msi_message_* services qemu-kvm: Remove unused kvm stubs Jason Wang (1): Revert "rtl8139: do the network/host communication only in normal operating mode" Jim Meyering (1): block: prevent snapshot mode $TMPDIR symlink attack MORITA Kazutaka (1): sheepdog: fix return value of do_load_save_vm_state Peter A. G. Crosthwaite (1): target-microblaze: lwx/swx: first implementation Stefan Weil (1): virtio: Fix compiler warning for non Linux hosts VERSION | 2 +- block/sheepdog.c | 10 +- hw/apic.c | 3 + hw/device-assignment.c | 18 +-- hw/ide/ahci.c | 4 +- hw/kvm/apic.c | 34 +++++- hw/msi.c | 127 -------------------- hw/msi.h | 6 +- hw/msix.c | 263 ++++++++++++++--------------------------- hw/msix.h | 8 +- hw/pc.c | 13 -- hw/pc_piix.c | 14 +-- hw/pci.c | 1 - hw/pci.h | 25 +--- hw/virtio-blk.c | 21 +++- hw/virtio-pci.c | 132 ++++++++++++++------- hw/virtio-pci.h | 6 + hw/xen.h | 10 -- hw/xen_apic.c | 5 + kvm-all.c | 253 +++++++++++++++++++++++++++++++++++----- kvm-stub.c | 35 ++---- kvm.h | 36 ++---- linux-headers/linux/kvm.h | 38 ++++++ qemu-common.h | 1 + qemu-kvm.c | 88 +------------- scripts/kvm/vmxcap | 13 ++ target-microblaze/cpu.c | 1 + target-microblaze/cpu.h | 4 + target-microblaze/helper.c | 2 + target-microblaze/translate.c | 62 +++++++++- 30 files changed, 648 insertions(+), 587 deletions(-) -- Siemens AG, Corporate Technology, CT T DE IT 1 Corporate Competence Center Embedded Linux -- 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