mirror_qemu/hw/misc
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
..
macio aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
Makefile.objs introduce a new qom device to deal with panicked event 2013-04-30 10:30:01 -05:00
a9scu.c hw/m*: pass owner to memory_region_init* functions 2013-07-04 17:42:48 +02:00
applesmc.c devices: Associate devices to their logical category 2013-07-29 10:37:09 -05:00
arm_l2x0.c arm_l2x0: QOM cast cleanup 2013-07-29 21:06:58 +02:00
arm_sysctl.c aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
cbus.c arm: fix location of some include files 2013-04-15 15:16:01 +02:00
debugexit.c devices: Associate devices to their logical category 2013-07-29 10:37:09 -05:00
eccmemctl.c eccmemctl: QOM cast cleanup 2013-07-29 21:06:58 +02:00
exynos4210_pmu.c exynos4210_pmu: QOM cast cleanup 2013-07-29 21:06:58 +02:00
imx_ccm.c imx_ccm: QOM cast cleanup 2013-07-29 21:06:05 +02:00
ivshmem.c devices: Associate devices to their logical category 2013-07-29 10:37:09 -05:00
lm32_sys.c lm32_sys: QOM cast cleanup 2013-07-29 21:06:58 +02:00
max111x.c hw: move target-independent files to subdirectories 2013-04-08 18:13:12 +02:00
milkymist-hpdmc.c milkymist-hpdmc: QOM cast cleanup 2013-07-29 21:06:58 +02:00
milkymist-pfpu.c milkymist-pfpu: QOM cast cleanup 2013-07-29 21:06:58 +02:00
mst_fpga.c mst_fpga: QOM cast cleanup 2013-07-29 21:06:59 +02:00
omap_clk.c hw: move other devices to hw/misc/, configure with default-configs/ 2013-04-08 18:13:16 +02:00
omap_gpmc.c memory: add owner argument to initialization functions 2013-07-04 17:42:44 +02:00
omap_l4.c memory: add owner argument to initialization functions 2013-07-04 17:42:44 +02:00
omap_sdrc.c memory: add owner argument to initialization functions 2013-07-04 17:42:44 +02:00
omap_tap.c memory: add owner argument to initialization functions 2013-07-04 17:42:44 +02:00
pc-testdev.c devices: Associate devices to their logical category 2013-07-29 10:37:09 -05:00
pci-testdev.c devices: Associate devices to their logical category 2013-07-29 10:37:09 -05:00
puv3_pm.c puv3_pm: QOM cast cleanup 2013-07-29 21:06:59 +02:00
pvpanic.c hw/misc: make pvpanic known to user 2013-08-12 11:20:57 -05:00
pxa2xx_pcmcia.c memory: add owner argument to initialization functions 2013-07-04 17:42:44 +02:00
sga.c devices: Associate devices to their logical category 2013-07-29 10:37:09 -05:00
slavio_misc.c slavio_misc: QOM cast cleanup for APCState 2013-07-29 21:06:59 +02:00
tmp105.c hw: move private headers to hw/ subdirectories. 2013-04-08 18:13:16 +02:00
tmp105.h hw: move private headers to hw/ subdirectories. 2013-04-08 18:13:16 +02:00
vfio.c Merge remote-tracking branch 'qemu-kvm/uq/master' into stable-1.5 2013-08-29 17:21:51 -05:00
vmport.c cpu: Replace cpu_single_env with CPUState current_cpu 2013-07-09 21:20:28 +02:00
zynq_slcr.c zynq_slcr: QOM cast cleanup 2013-07-29 21:06:59 +02:00