Anthony Liguori b5d54bd421 Merge remote-tracking branch 'qemu-kvm/uq/master' into stable-1.5 ... * qemu-kvm/uq/master: kvm-stub: fix compilation kvm: shorten the parameter list for get_real_device() kvm: i386: fix LAPIC TSC deadline timer save/restore kvm-all.c: max_cpus should not exceed KVM vcpu limit kvm: Simplify kvm_handle_io kvm: x86: fix setting IA32_FEATURE_CONTROL with nested VMX disabled kvm: add KVM_IRQFD_FLAG_RESAMPLE support kvm: migrate vPMU state target-i386: remove tabs from target-i386/cpu.h Initialize IA32_FEATURE_CONTROL MSR in reset and migration Conflicts: target-i386/cpu.h target-i386/kvm.c aliguori: fixup trivial conflicts due to whitespace and added cpu argument Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>		2013-08-29 17:21:51 -05:00
..
kvm	Merge remote-tracking branch 'qemu-kvm/uq/master' into stable-1.5	2013-08-29 17:21:51 -05:00
kvmvapic.c	kvmvapic: QOM cast cleanup	2013-07-29 21:07:02 +02:00
Makefile.objs	pc_sysfw: do not make it a device anymore	2013-08-12 09:31:14 -05:00
multiboot.c	multiboot: Calculate upper_mem in the ROM	2013-06-28 14:01:52 -05:00
multiboot.h
pc_piix.c	pc_piix: Kill pc_init1() memory region args	2013-08-21 23:30:22 +03:00
pc_q35.c	pc: pc_compat_1_4() now can call pc_compat_1_5()	2013-08-21 23:30:22 +03:00
pc_sysfw.c	pc_sysfw: do not make it a device anymore	2013-08-12 09:31:14 -05:00
pc.c	Convert stderr message calling error_get_pretty() to error_report()	2013-08-20 11:51:59 -04:00
smbios.c
xen_domainbuild.c	aio / timers: Switch entire codebase to the new timer API	2013-08-22 19:14:24 +02:00
xen_domainbuild.h
xen_machine_pv.c