qemu-e2k/target-i386
Anthony Liguori 0893d46014 Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
* qemu-kvm/uq/master:
  target-i386: kvm: prevent buffer overflow if -cpu foo, [x]level is too big
  vmxcap: bit 9 of VMX_PROCBASED_CTLS2 is 'virtual interrupt delivery'

Conflicts:
	target-i386/kvm.c

Trivial merge resolution due to lack of context.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-01-29 16:57:41 -06:00
..
arch_dump.c exec: change RAM list to a TAILQ 2012-12-20 23:08:47 +01:00
arch_memory_mapping.c target-i386: fix bits 39:32 of the final physical address when using 4M page 2013-01-09 15:12:20 -02:00
cc_helper_template.h
cc_helper.c x86: Implement SMEP and SMAP 2012-10-01 08:04:22 -05:00
cpu-qom.h qom: move include files to include/qom/ 2012-12-19 08:31:32 +01:00
cpu.c target-i386: Remove setting tsc-frequency from x86_def_t 2013-01-27 14:34:27 +01:00
cpu.h target-i386: Remove vendor_override field from CPUX86State 2013-01-27 14:34:27 +01:00
excp_helper.c softmmu: move include files to include/sysemu/ 2012-12-19 08:32:45 +01:00
fpu_helper.c exec: move include files to include/exec/ 2012-12-19 08:31:31 +01:00
helper.c target-i386: Use switch in check_hw_breakpoints() 2013-01-15 09:23:50 +01:00
helper.h exec: move include files to include/exec/ 2012-12-19 08:31:31 +01:00
hyperv.c
hyperv.h
int_helper.c misc: move include files to include/qemu/ 2012-12-19 08:32:39 +01:00
ioport-user.c exec: move include files to include/exec/ 2012-12-19 08:31:31 +01:00
kvm_i386.h softmmu: move include files to include/sysemu/ 2012-12-19 08:32:45 +01:00
kvm-stub.c
kvm.c Merge remote-tracking branch 'qemu-kvm/uq/master' into staging 2013-01-29 16:57:41 -06:00
machine.c target-i386: Define DR7 bit field constants 2013-01-15 09:14:35 +01:00
Makefile.objs x86: switch to AREG0 free mode 2012-08-14 19:01:26 +00:00
mem_helper.c exec: move include files to include/exec/ 2012-12-19 08:31:31 +01:00
misc_helper.c target-i386: Use switch in check_hw_breakpoints() 2013-01-15 09:23:50 +01:00
ops_sse_header.h
ops_sse.h
seg_helper.c target-i386: Introduce hw_{local,global}_breakpoint_enabled() 2013-01-15 09:14:48 +01:00
shift_helper_template.h
smm_helper.c cpu_dump_state: move DUMP_FPU and DUMP_CCOP flags from x86-only to generic 2012-10-05 15:04:43 +01:00
svm_helper.c exec: move include files to include/exec/ 2012-12-19 08:31:31 +01:00
svm.h
TODO
topology.h target-i386: Topology & APIC ID utility functions 2013-01-27 14:34:27 +01:00
translate.c exec: move include files to include/exec/ 2012-12-19 08:31:31 +01:00