mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
b5d54bd421
qemu/hw
History
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
..
9pfs virtio-9p-device: Avoid freeing uninitialized memory 2013-08-01 11:18:24 -05:00
acpi aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
alpha aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
arm aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
audio aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
block aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
bt aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
char Merge remote-tracking branch 'stefanha/block' into staging 2013-08-26 09:19:50 -05:00
core pc,pci,virtio fixes and cleanups 2013-08-29 17:19:19 -05:00
cpu default-configs: Fix A9MP and A15MP config names 2013-08-20 14:54:32 +01:00
cris memory: add owner argument to initialization functions 2013-07-04 17:42:44 +02:00
display aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
dma aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
gpio gpio/zaurus: QOM cast cleanup 2013-07-29 21:06:57 +02:00
i2c exynos4210_i2c: QOM cast cleanup 2013-07-29 21:07:02 +02:00
i386 Merge remote-tracking branch 'qemu-kvm/uq/master' into stable-1.5 2013-08-29 17:21:51 -05:00
ide aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
input aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
intc aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
isa i82378: Cleanup implementation 2013-07-31 23:25:41 +02:00
lm32 lm32_juart: QOM cast cleanup 2013-07-29 21:06:28 +02:00
m68k memory: add owner argument to initialization functions 2013-07-04 17:42:44 +02:00
microblaze microblaze: Fix latent bug with default DTB lookup 2013-07-09 13:38:58 -05:00
mips aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
misc Merge remote-tracking branch 'qemu-kvm/uq/master' into stable-1.5 2013-08-29 17:21:51 -05:00
moxie memory: add owner argument to initialization functions 2013-07-04 17:42:44 +02:00
net aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
nvram fw_cfg: the I/O port variant expects little-endian 2013-08-07 12:48:15 -05:00
openrisc Merge remote-tracking branch 'stefanha/block' into staging 2013-08-26 09:19:50 -05:00
pci pcie_port: Turn PCIEPort and PCIESlot into abstract QOM types 2013-07-29 20:45:24 +02:00
pci-bridge i82801b11: Fix i82801b11 PCI host bridge config space 2013-08-12 12:07:12 +03:00
pci-host pci-host/prep: Set isa_mem_base in the PCI host bridge 2013-07-31 23:25:27 +02:00
ppc pc,pci,virtio fixes and cleanups 2013-08-29 17:19:19 -05:00
s390x s390x: Rename 'dprintf' to 'DPRINTF' 2013-07-29 19:33:54 -05:00
scsi spapr: Rename 'dprintf' to 'DPRINTF' 2013-07-29 19:56:46 -05:00
sd aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
sh4 sh4: unbreak r2d 2013-07-25 08:12:27 -05:00
sparc sun4: Don't prematurely explode QEMUMachineInitArgs 2013-08-21 23:19:27 +03:00
sparc64 pc,pci,virtio fixes and cleanups 2013-08-29 17:19:19 -05:00
ssi xilinx_spi: QOM cast cleanup 2013-07-29 21:07:01 +02:00
timer aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
tpm aio / timers: Untangle include files 2013-08-22 19:10:27 +02:00
unicore32 memory: add owner argument to initialization functions 2013-07-04 17:42:44 +02:00
usb aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
virtio Merge remote-tracking branch 'qemu-kvm/uq/master' into stable-1.5 2013-08-29 17:21:51 -05:00
watchdog aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
xen devices: Associate devices to their logical category 2013-07-29 10:37:09 -05:00
xtensa aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
Makefile.objs virtio: simplify Makefile conditionals 2013-04-19 16:18:11 +02:00