[COMMIT master] qemu-kvm: fix ioapic savevm

From: Juan Quintela quint...@redhat.com We setup old version values in pre_load until patch with adds version_id to post_load got merged Signed-off-by: Juan Quintela quint...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/hw/ioapic.c b/hw/ioapic.c index

[COMMIT master] Add test device

From: Gerd Hoffmann kra...@redhat.com Add a test device which supports the kvmctl ioports, for running the test suite. Usage: qemu -chardev file,path=/log/file/some/where,id=testlog -device testdev,chardev=testlog Signed-off-by: Gerd Hoffmann kra...@redhat.com Signed-off-by: Avi

[COMMIT master] Merge branch 'upstream-merge'

From: Marcelo Tosatti mtosa...@redhat.com * upstream-merge: (128 commits) Fix Linux task preemption on Versatile board pflash_cfi01: Correct debug build, no functional changes. ne2000-isa: Do not free memory owned by qdev alsa: Use proper value when testing returned events in

[COMMIT master] test: Set up a default stack

From: Avi Kivity a...@redhat.com multiboot doesn't give us any stack, so we need to set one up. Signed-off-by: Avi Kivity a...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/kvm/user/test/x86/cstart64.S b/kvm/user/test/x86/cstart64.S index 432a3dc..4f116f9 100644 ---

[COMMIT master] test: Map 4GB of memory

From: Avi Kivity a...@redhat.com Needed so the APIC can be accessed at address 0xfee0. Signed-off-by: Avi Kivity a...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/kvm/user/test/x86/cstart64.S b/kvm/user/test/x86/cstart64.S index 805938b..3f193a3 100644 ---

[COMMIT master] test: Remove smp support from access.c

From: Avi Kivity a...@redhat.com Doesn't do anthing anyway. Signed-off-by: Avi Kivity a...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/kvm/user/test/x86/access.c b/kvm/user/test/x86/access.c index 272a4ef..5eadff8 100644 --- a/kvm/user/test/x86/access.c +++

[COMMIT master] test: use real APIC instead of fake APIC

From: Avi Kivity a...@redhat.com smp temporarily disabled Signed-off-by: Avi Kivity a...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/kvm/user/test/x86/cstart64.S b/kvm/user/test/x86/cstart64.S index 3f193a3..912bcf8 100644 --- a/kvm/user/test/x86/cstart64.S +++

[COMMIT master] test: Add vmcall latency test

From: Avi Kivity a...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/kvm/user/test/x86/vmexit.c b/kvm/user/test/x86/vmexit.c index 364837f..bd1895f 100644 --- a/kvm/user/test/x86/vmexit.c +++ b/kvm/user/test/x86/vmexit.c @@

[COMMIT master] test: port readmode tests to multiboot

From: Avi Kivity a...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/kvm/user/test/x86/realmode.c b/kvm/user/test/x86/realmode.c index f9e303f..9bf6cb0 100644 --- a/kvm/user/test/x86/realmode.c +++

[COMMIT master] test: Mask PIC interrupts before APIC test

From: Avi Kivity a...@redhat.com We aren't ready to handle PIC interrupts, so mask them. Signed-off-by: Avi Kivity a...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/kvm/user/test/x86/apic.c b/kvm/user/test/x86/apic.c index 7794615..b712ef8 100644 ---

[COMMIT master] test: fix realmode test print_serial() direction flag

From: Avi Kivity a...@redhat.com Clear the direction flag to get the correct output. Signed-off-by: Avi Kivity a...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/kvm/user/test/x86/realmode.c b/kvm/user/test/x86/realmode.c index 0db09b8..f9e303f 100644 ---

[COMMIT master] test: Allow adding mode vmexit latency tests

From: Avi Kivity a...@redhat.com Make the latency test run on an array of function pointers, which can be expanded with more tests. Signed-off-by: Avi Kivity a...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/kvm/user/test/x86/vmexit.c b/kvm/user/test/x86/vmexit.c

[COMMIT master] test: add x2apic test

From: Avi Kivity a...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/kvm/user/test/x86/apic.c b/kvm/user/test/x86/apic.c index fdeec4c..504def2 100644 --- a/kvm/user/test/x86/apic.c +++ b/kvm/user/test/x86/apic.c @@ -9,6 +9,7

[COMMIT master] test: vm: map mmio 1:1

From: Avi Kivity a...@redhat.com With this assumption, the apic code will be able to run either before or after the vm is set up. Signed-off-by: Avi Kivity a...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/kvm/user/test/x86/vm.c b/kvm/user/test/x86/vm.c index

[COMMIT master] test: Add fwcfg interface for getting the cpu count

From: Avi Kivity a...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/kvm/user/test/lib/x86/fwcfg.c b/kvm/user/test/lib/x86/fwcfg.c index a9a2ce2..2cf7cec 100644 --- a/kvm/user/test/lib/x86/fwcfg.c +++

[COMMIT master] test: initialize apic/x2apic on all processors

From: Avi Kivity a...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/kvm/user/test/x86/cstart64.S b/kvm/user/test/x86/cstart64.S index a55ad50..54b721f 100644 --- a/kvm/user/test/x86/cstart64.S +++

[COMMIT master] test: add support for the firmware configuration interface

From: Avi Kivity a...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/kvm/user/config-x86-common.mak b/kvm/user/config-x86-common.mak index 2f59bb5..22a18b2 100644 --- a/kvm/user/config-x86-common.mak +++

[COMMIT master] test: Use xapic_write() to enable xapic()

From: Avi Kivity a...@redhat.com apic_write() depends on apic_ops, which is shared among cpus and can be modified if another cpu enabled x2apic. Use xapic_write() which is race-proof. Signed-off-by: Avi Kivity a...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git

[COMMIT master] Remove unused function.

From: Gleb Natapov g...@redhat.com kvm_arch_update_regs_for_sipi() is not used anymore. Signed-off-by: Gleb Natapov g...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/qemu-kvm-ia64.c b/qemu-kvm-ia64.c index 062fbd4..d26c2a9 100644 --- a/qemu-kvm-ia64.c +++

[COMMIT master] compatfd is included before, and it is compiled unconditionally

From: Juan Quintela quint...@redhat.com Signed-off-by: Juan Quintela quint...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/Makefile b/Makefile index 6a9ca7c..88b39bd 100644 --- a/Makefile +++ b/Makefile @@ -78,10 +78,6 @@ block-nested-$(CONFIG_CURL) += curl.o

[COMMIT master] Make cpu runnable after sipi

From: Gleb Natapov g...@redhat.com Signed-off-by: Gleb Natapov g...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/hw/apic.c b/hw/apic.c index 918b28c..5ed5c98 100644 --- a/hw/apic.c +++ b/hw/apic.c @@ -509,8 +509,9 @@ void apic_init_reset(CPUState *env)

[COMMIT master] Remove merge artifacts

From: Juan Quintela quint...@redhat.com CFLAGS and LDFLAGS are defined on config.mak LDFLAGS_BASE is not used anywhere DEPLIBS are not defined anywhere Signed-off-by: Juan Quintela quint...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/Makefile.target

[COMMIT master] test: initialize idt on all processors

From: Avi Kivity a...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/kvm/user/test/x86/cstart64.S b/kvm/user/test/x86/cstart64.S index 278465b..a55ad50 100644 --- a/kvm/user/test/x86/cstart64.S +++

[COMMIT master] gdbstub: x86: Switch 64/32 bit registers dynamically

From: Jan Kiszka jan.kis...@siemens.com Commit 56aebc891674cd2d07b3f64183415697be200084 changed gdbstub in way that debugging 32 or 16-bit guest code is no longer possible with qemu for x86_64 guest CPUs. Since that commit, qemu only provides registers sets for 64-bit, forcing current and

[COMMIT master] qemu-kvm: fix -daemonize

From: Marcelo Tosatti mtosa...@redhat.com Move kvm_init after fork. Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/vl.c b/vl.c index 888d481..88bd3eb 100644 --- a/vl.c +++ b/vl.c @@ -5533,20 +5533,6 @@ int main(int argc, char **argv, char **envp) } } -if

[COMMIT master] test: avoid deleting intermediate .o files

From: Avi Kivity a...@redhat.com If make doesn't see an intermediate file mentioned explicitly, it deletes it after making the target. This silly behaviour causes needless rebuilds. Add all intermediates as explicit dependncies to prevent this behaviour. Signed-off-by: Avi Kivity

[COMMIT master] Introduce libs_softmmu to device assignment code

From: Juan Quintela quint...@redhat.com Signed-off-by: Juan Quintela quint...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/Makefile.target b/Makefile.target index 5fad812..b2a2e45 100644 --- a/Makefile.target +++ b/Makefile.target @@ -217,7 +217,6 @@ obj-i386-y +=

[COMMIT master] Use kvm_cpu_synchronize_state() instead of kvm_arch_(save|load)_regs()

From: Gleb Natapov g...@redhat.com Signed-off-by: Gleb Natapov g...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c index ee678df..6e5bcc5 100644 --- a/qemu-kvm-x86.c +++ b/qemu-kvm-x86.c @@ -1671,10 +1671,9 @@ uint32_t

[COMMIT master] test: add apic_id() accessor

From: Avi Kivity a...@redhat.com apic and x2apic have different formats for the ID register, so we need an accessor for it. Signed-off-by: Avi Kivity a...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/kvm/user/test/lib/x86/apic.c b/kvm/user/test/lib/x86/apic.c index

[COMMIT master] KVM temp hack not needed anymore

From: Juan Quintela quint...@redhat.com Signed-off-by: Juan Quintela quint...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/configure b/configure index 911cac6..5ae8443 100755 --- a/configure +++ b/configure @@ -2076,11 +2076,6 @@ bsd) ;; esac -# this is a temp

[COMMIT master] Test for libpci, not only for header

From: Juan Quintela quint...@redhat.com Signed-off-by: Juan Quintela quint...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/configure b/configure index dcb4625..2d13f6d 100755 --- a/configure +++ b/configure @@ -961,9 +961,9 @@ cat $TMPC EOF #ifndef PCI_VENDOR_ID

[COMMIT master] Use configure way of enabling kvm

From: Juan Quintela quint...@redhat.com Signed-off-by: Juan Quintela quint...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/configure b/configure index edf46ee..7e51644 100755 --- a/configure +++ b/configure @@ -362,19 +362,14 @@ AIX) usb=linux if [ $cpu = i386

[COMMIT master] update qemu-ifup for modern ip route output

From: Dustin Kirkland kirkl...@canonical.com update qemu-ifup for modern ip route output The output from the /sbin/ip utility has changed, adding two more columns, which breaks the qemu-ifup script, as it was depending on the last column being the interface name. Change this from $NF to $5.

[COMMIT master] Print kvm options values as everything else

From: Juan Quintela quint...@redhat.com Signed-off-by: Juan Quintela quint...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/configure b/configure index 7e51644..911cac6 100755 --- a/configure +++ b/configure @@ -2052,6 +2052,9 @@ fi if test $need_offsetof = yes ;

[COMMIT master] Bring ia64 to current arch selection code

From: Juan Quintela quint...@redhat.com Signed-off-by: Juan Quintela quint...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/configure b/configure index fb28e14..edf46ee 100755 --- a/configure +++ b/configure @@ -2264,9 +2264,6 @@ case $target_arch2 in

[COMMIT master] Rename USE_KVM_* to CONFIG_KVM_*

From: Juan Quintela quint...@redhat.com Once there, simplify Makefile.target with new syntax Signed-off-by: Juan Quintela quint...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/Makefile.target b/Makefile.target index b2a2e45..d2444ac 100644 --- a/Makefile.target +++

[COMMIT master] Use compile_prog function in thee missing compilations

From: Juan Quintela quint...@redhat.com Signed-off-by: Juan Quintela quint...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/configure b/configure index 97b0012..dcb4625 100755 --- a/configure +++ b/configure @@ -936,7 +936,7 @@ cat $TMPC EOF #endif int main(void)

[COMMIT master] Move kvm specific tests after main kvm test

From: Juan Quintela quint...@redhat.com Signed-off-by: Juan Quintela quint...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/configure b/configure index d8b2b7b..dc0d677 100755 --- a/configure +++ b/configure @@ -905,76 +905,6 @@ EOF fi

[COMMIT master] vga: move back dirty_log functions to vga.c

From: Juan Quintela quint...@redhat.com Fixes build problems. Signed-off-by: Juan Quintela quint...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/hw/vga-pci.c b/hw/vga-pci.c index c49858c..9bb2d81 100644 --- a/hw/vga-pci.c +++ b/hw/vga-pci.c @@ -28,7 +28,6 @@ #include

[COMMIT master] Remove build-targets-* rules that are always empty

From: Juan Quintela quint...@redhat.com Signed-off-by: Juan Quintela quint...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/Makefile b/Makefile index 88b39bd..1e09953 100644 --- a/Makefile +++ b/Makefile @@ -386,10 +386,3 @@ tarbin: # Include automatically

[COMMIT master] Get CONFIG_CPU_EMULATION back to life

From: Juan Quintela quint...@redhat.com Code compile with --disable-cpu-emulation, and that don't compile tcg. This is the minimal set of changes to get it working Signed-off-by: Juan Quintela quint...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/Makefile.target

[COMMIT master] configure: remove duplicate pkgversion

From: Juan Quintela quint...@redhat.com Signed-off-by: Juan Quintela quint...@redhat.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/configure b/configure index ea83817..f8d7402 100755 --- a/configure +++ b/configure @@ -236,7 +236,6 @@ blobs=yes pkgversion= ($(kvm_version))

[COMMIT master] qemu-kvm: Reindent pc_new_cpu

From: Jan Kiszka jan.kis...@siemens.com ...for better match with upstream. Signed-off-by: Jan Kiszka jan.kis...@siemens.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/hw/pc.c b/hw/pc.c index 7e2a502..b5bef05 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1097,19 +1097,21 @@ int

[COMMIT master] acpi: enable/disable_processor() are used only for TARGET_I386

From: Juan Quintela quint...@redhat.com Fixes a compile warning. Signed-off-by: Juan Quintela quint...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/hw/acpi.c b/hw/acpi.c index 0f80525..ff7bc4a 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -753,6 +753,7 @@ void

[COMMIT master] configure: fix typos in kvm enable options

From: Juan Quintela quint...@redhat.com Signed-off-by: Juan Quintela quint...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/configure b/configure index 6c6cb13..c567ae6 100755 --- a/configure +++ b/configure @@ -709,8 +709,8 @@ echo --disable-kvmdisable KVM

[COMMIT master] qemu-kvm: Fix guest single-stepping

From: Jan Kiszka jan.kis...@siemens.com Hopefully the last regression of 4c0960c0: KVM_SET_GUEST_DEBUG requires properly synchronized guest registers (on x86: eflags) on entry. Signed-off-by: Jan Kiszka jan.kis...@siemens.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git

[COMMIT master] apic: Variable only used when CAP_IRQCHIP is defined

From: Juan Quintela quint...@redhat.com Signed-off-by: Juan Quintela quint...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/hw/apic.c b/hw/apic.c index 5ed5c98..3a2e128 100644 --- a/hw/apic.c +++ b/hw/apic.c @@ -968,9 +968,9 @@ void qemu_kvm_load_lapic(CPUState *env)

[COMMIT master] MCE: Relay UCR MCE to guest

From: Huang Ying ying.hu...@intel.com UCR (uncorrected recovery) MCE is supported in recent Intel CPUs, where some hardware error such as some memory error can be reported without PCC (processor context corrupted). To recover from such MCE, the corresponding memory will be unmapped, and all

[COMMIT master] KVM: SVM: reorganize svm_interrupt_allowed

From: Joerg Roedel joerg.roe...@amd.com This patch reorganizes the logic in svm_interrupt_allowed to make it better to read. This is important because the logic is a lot more complicated with Nested SVM. Signed-off-by: Joerg Roedel joerg.roe...@amd.com Signed-off-by: Marcelo Tosatti

[COMMIT master] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

From: Marcelo Tosatti mtosa...@redhat.com Conflicts: arch/ia64/kvm/kvm-ia64.c arch/powerpc/include/asm/kvm_host.h arch/x86/kvm/Makefile arch/x86/kvm/emulate.c arch/x86/kvm/i8254.c arch/x86/kvm/i8259.c arch/x86/kvm/lapic.c

[COMMIT master] KVM: remove duplicated #include

From: Huang Weiyi weiyi.hu...@gmail.com Remove duplicated #include('s) in arch/x86/kvm/lapic.c Signed-off-by: Huang Weiyi weiyi.hu...@gmail.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 5694997..9c8f901 100644 ---

[COMMIT master] KVM: SVM: don't copy exit_int_info on nested vmrun

From: Joerg Roedel joerg.roe...@amd.com The exit_int_info field is only written by the hardware and never read. So it does not need to be copied on a vmrun emulation. Signed-off-by: Joerg Roedel joerg.roe...@amd.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git

[COMMIT master] KVM: Activate Virtualization On Demand

From: Alexander Graf ag...@suse.de X86 CPUs need to have some magic happening to enable the virtualization extensions on them. This magic can result in unpleasant results for users, like blocking other VMMs from working (vmx) or using invalid TLB entries (svm). Currently KVM activates

[COMMIT master] KVM: SVM: Fix tsc offset adjustment when running nested

From: Joerg Roedel joerg.roe...@amd.com When svm_vcpu_load is called while the vcpu is running in guest mode the tsc adjustment made there is lost on the next emulated #vmexit. This causes the tsc running backwards in the guest. This patch fixes the issue by also adjusting the tsc_offset in the

[COMMIT master] KVM: SVM: Remove remaining occurences of rdtscll

From: Joerg Roedel joerg.roe...@amd.com This patch replaces them with native_read_tsc() which can also be used in expressions and saves a variable on the stack in this case. Signed-off-by: Joerg Roedel joerg.roe...@amd.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git

[COMMIT master] KVM: SVM: Handle tsc in svm_get_msr/svm_set_msr correctly

From: Joerg Roedel joerg.roe...@amd.com When running nested we need to touch the l1 guests tsc_offset. Otherwise changes will be lost or a wrong value be read. Cc: sta...@kernel.org Signed-off-by: Joerg Roedel joerg.roe...@amd.com Signed-off-by: Marcelo Tosatti mtosa...@redhat.com diff --git

[COMMIT master] KVM: s390: fix memsize = 4G

From: Christian Borntraeger borntrae...@de.ibm.com commit 628eb9b8a8f3 KVM: s390: streamline memslot handling introduced kvm_s390_vcpu_get_memsize. This broke guests =4G, since this function returned an int. This patch changes the return value to a long. Signed-off-by: Christian

[COMMIT master] compatfd: complete definition

From: Avi Kivity a...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/compatfd.h b/compatfd.h index 55a111a..06b0b6b 100644 --- a/compatfd.h +++ b/compatfd.h @@ -17,8 +17,25 @@ #include signal.h struct qemu_signalfd_siginfo { -uint32_t ssi_signo; -uint8_t pad[124];

[COMMIT master] Merge branch 'upstream-merge'

From: Avi Kivity a...@redhat.com * upstream-merge: (44 commits) Compile host-utils only once Compile TCG runtime library only once Fix spelling in comment Compile ne2000 only once ioports: remove unused env parameter and compile only once Compile msix only once Compile loader only

[COMMIT master] Make compatfd.c depend on CONFIG_POSIX

From: Avi Kivity a...@redhat.com It does not build on Windows. Signed-off-by: Avi Kivity a...@redhat.com diff --git a/Makefile b/Makefile index 1e09953..25a6df3 100644 --- a/Makefile +++ b/Makefile @@ -67,7 +67,7 @@ block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o

[COMMIT master] Use compatfd.h instead of sys/signalfd.h

From: Avi Kivity a...@redhat.com sys/signalfd.h is not always available, and it too intrusive to conditionally compile the MCE injection support code. Signed-off-by: Avi Kivity a...@redhat.com diff --git a/qemu-kvm.c b/qemu-kvm.c index 0afdb56..99b3f2c 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c

[COMMIT master] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

From: Avi Kivity a...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com -- To unsubscribe from this list: send the line unsubscribe kvm-commits in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html