OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity
qemu-e2k/include/sysemu
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
..
arch_init.h audio: look for the ISA and PCI buses 2013-04-29 12:16:57 -05:00
balloon.h softmmu: move include files to include/sysemu/ 2012-12-19 08:32:45 +01:00
blockdev.h blockdev: Keep a copy of DriveInfo.serial 2013-03-15 16:07:49 +01:00
bt.h sysemu: avoid proliferation of include/ subdirectories 2013-04-15 18:19:25 +02:00
char.h chardev: fix CHR_EVENT_OPENED events for mux chardevs 2013-07-30 18:48:21 -05:00
cpus.h cpus.c: Drop unnecessary set_cpu_log() 2013-02-16 10:45:19 +00:00
device_tree.h device_tree: Add qemu_devtree_setprop_sized_cells() utility functions 2013-07-19 12:58:46 +01:00
dma.h dma: keep a device alive while it has SGLists 2013-07-04 17:42:30 +02:00
dump.h dump: rebase from host-private RAMBlock offsets to guest-physical addresses 2013-08-08 11:01:46 -04:00
kvm.h Merge remote-tracking branch 'qemu-kvm/uq/master' into stable-1.5 2013-08-29 17:21:51 -05:00
memory_mapping.h dump: rebase from host-private RAMBlock offsets to guest-physical addresses 2013-08-08 11:01:46 -04:00
os-posix.h Add option to mlock qemu and guest memory 2013-04-22 08:52:23 -05:00
os-win32.h Add option to mlock qemu and guest memory 2013-04-22 08:52:23 -05:00
qtest.h accel: change {xen, kvm, tcg, qtest}_allowed from int to bool 2013-02-01 15:08:02 -06:00
rng-random.h sysemu: avoid proliferation of include/ subdirectories 2013-04-15 18:19:25 +02:00
rng.h Trivial grammar and spelling fixes 2013-05-01 20:55:21 +04:00
seccomp.h softmmu: move include files to include/sysemu/ 2012-12-19 08:32:45 +01:00
sysemu.h aio / timers: Convert rtc_clock to be a QEMUClockType 2013-08-22 19:14:24 +02:00
tpm.h tpm: reorganize headers and split hardware part 2013-04-15 18:19:25 +02:00
tpm_backend.h Move TPM passthrough specific command line options to backend structure 2013-04-23 10:40:40 -05:00
tpm_backend_int.h tpm: reorganize headers and split hardware part 2013-04-15 18:19:25 +02:00
watchdog.h hw: move headers to include/ 2013-04-08 18:13:10 +02:00
xen-mapcache.h softmmu: move include files to include/sysemu/ 2012-12-19 08:32:45 +01:00