[COMMIT master] Fix msi compilation with kvm disabled

From: Glauber Costa glom...@redhat.com Signed-off-by: Glauber Costa glom...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/hw/msix.c b/hw/msix.c index b6f3948..8636f69 100644 --- a/hw/msix.c +++ b/hw/msix.c @@ -63,6 +63,7 @@ /* Flag for interrupt controller to declare MSI-X

[COMMIT master] Move extboot to other optionroms

From: Jan Kiszka jan.kis...@siemens.com This unbreaks out-of-tree builds and reduces the differences to upstream's top-level Makefile. Signed-off-by: Jan Kiszka jan.kis...@siemens.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/Makefile b/Makefile index eb64886..fc40431 100644 ---

[COMMIT master] Fix segfault in msix_save

From: Michael S. Tsirkin m...@redhat.com This fixes segfault reported by Kevin Wolf, and simplifies the code in msix_save. Reported-by: Kevin Wolf kw...@redhat.com Signed-off-by: Michael S. Tsirkin m...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/hw/msix.c b/hw/msix.c

[COMMIT master] Surround kvm_set_boot_id() function with kvm_enabled

From: Glauber Costa glom...@redhat.com Otherwise, compilation breaks with kvm disabled. Signed-off-by: Glauber Costa glom...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/hw/pc.c b/hw/pc.c index cf84416..afab0ad 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1131,7 +1131,9 @@ static

[COMMIT master] net: re-instate some lost vnet_hdr code

From: Mark McLoughlin mar...@redhat.com Merge commit 211eb5f301 lost the code we had in tap_send_packet() to handle the case of the tapfd having IF_VNET_HDR enabled, but the NIC code not having support for virtio_net_hdr. In this case, we just strip off the header before passing it to the NIC.

[COMMIT master] virtio: mark msi vectors used on load

From: Michael S. Tsirkin m...@redhat.com Usage of msi vectors is controlled by the guest and so needs to be restored on load. Do this for msi vectors used by the virtio device. Signed-off-by: Michael S. Tsirkin m...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git

[COMMIT master] msi: clean used vectors state on load

From: Michael S. Tsirkin m...@redhat.com Clean up msix vector usage state on load. Since guest might have control over it through the device, the device will have to load this state from file. Signed-off-by: Michael S. Tsirkin m...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git

[COMMIT master] virtio: remove control vector save

From: Michael S. Tsirkin m...@redhat.com control vector is already saved/restored by virtio-pci, it does not need to be done in virtio. Signed-off-by: Michael S. Tsirkin m...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/hw/virtio.c b/hw/virtio.c index 843be86..41e7ca2

[COMMIT master] Update source link

From: Avi Kivity a...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/linux-2.6 b/linux-2.6 index c696f86..be5ef0d 16 --- a/linux-2.6 +++ b/linux-2.6 @@ -1 +1 @@ -Subproject commit c696f86c0256888a4afbb03493d4e473148603df +Subproject commit

[COMMIT master] Compatibility for MSR_FAM10H_MMIO_CONF_BASE and MSR_AMD64_NB_CFG

From: Avi Kivity a...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/x86/external-module-compat.h b/x86/external-module-compat.h index 6dfe1ff..8f7c4ff 100644 --- a/x86/external-module-compat.h +++ b/x86/external-module-compat.h @@ -477,6 +477,14 @@ struct kvm_desc_ptr {

[COMMIT master] KVM: No need to kick cpu if not in a guest mode.

From: Gleb Natapov g...@redhat.com This will save a couple of IPIs. Signed-off-by: Gleb Natapov g...@redhat.com Acked-by: Marcelo Tosatti mtosa...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 95fa45c..e3d9040 100644 ---

[COMMIT master] KVM: Add trace points in irqchip code

From: Gleb Natapov g...@redhat.com Add tracepoint in msi/ioapic/pic set_irq() functions, in IPI sending and in the point where IRQ is placed into apic's IRR. Signed-off-by: Gleb Natapov g...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/arch/x86/kvm/i8259.c