[COMMIT master] KVM: ia64: Fix iommu_flags build breakage

From: Avi Kivity a...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/arch/ia64/include/asm/kvm_host.h b/arch/ia64/include/asm/kvm_host.h index 589536f..5f43697 100644 --- a/arch/ia64/include/asm/kvm_host.h +++ b/arch/ia64/include/asm/kvm_host.h @@ -474,6 +474,7 @@ struct

[COMMIT master] Revert Increment version id for CPU save state

From: Avi Kivity a...@redhat.com This reverts commit 7b2e5abac640770ffd15b71e4345114bf10191ab. Breaks live migration. Signed-off-by: Avi Kivity a...@redhat.com diff --git a/target-i386/cpu.h b/target-i386/cpu.h index af0ee18..f054af1 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@

[COMMIT master] Fix ia64 build on kvm_arch_get_supported_cpuid()

From: Jes Sorensen j...@sgi.com kvm_arch_get_supported_cpuid() doesn't belong in qemu-kvm.c as it is just an x86 specific build workaround. Signed-off-by: Jes Sorensen j...@sgi.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c index 8cb6faa..856b70c

[COMMIT master] Don't use a 32-bit bit type as offset argument for kvm dirty tracking

From: Glauber Costa glom...@redhat.com In the call path of kvm_get_dirty_pages_log_range(), its caller kvm_get_dirty_bitmap_cb() passes the target_phys_addr_t both as start_addr and the offset. So, using int will make dirty tracking over 4G fail completely. Signed-off-by: Glauber Costa

[COMMIT master] Add script to make a combined userspace/kernel release

From: Avi Kivity a...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/kvm/scripts/make-combined-release b/kvm/scripts/make-combined-release new file mode 100755 index 000..adef8f6 --- /dev/null +++ b/kvm/scripts/make-combined-release @@ -0,0 +1,36 @@ +#!/usr/bin/python +

[COMMIT master] Move kvm headers from kvm/kernel to kvm/include

From: Avi Kivity a...@redhat.com So we can retire the kvm/kernel/ directory. Signed-off-by: Avi Kivity a...@redhat.com diff --git a/configure b/configure index 4b2ab89..cc7f9f1 100755 --- a/configure +++ b/configure @@ -849,8 +849,8 @@ kvm_cflags= if test $kvm = yes ; then

[COMMIT master] device-assignment: Fix kvm_get_irq_route_gsi() return check

From: Alex Williamson alex.william...@hp.com Use 'r' for the return value since gsi is unsigned. Signed-off-by: Alex Williamson alex.william...@hp.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/hw/device-assignment.c b/hw/device-assignment.c index 0a5f850..853307b 100644 ---

[COMMIT master] Enable dirty logging for all regions during migration

From: Glauber de Oliveira Costa glom...@redhat.com In current calculations, we are not activating dirty logging for all regions, leading migration to fail. This problem was already raised by Yaniv Kamay a while ago. The proposed solution at the time (not merged), was a calculation to convert from

[COMMIT master] Adjust nr_cpu_ids check

From: Avi Kivity a...@redhat.com nr_cpu_ids was introduced in 2.6.21, not 2.6.28. Signed-off-by: Avi Kivity a...@redhat.com diff --git a/external-module-compat-comm.h b/external-module-compat-comm.h index e1e203c..f6975e0 100644 --- a/external-module-compat-comm.h +++