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
arch_memory_mapping.c
cc_helper_template.h
cc_helper.c
cpu-qom.h
cpu.c
cpu.h
excp_helper.c
fpu_helper.c
helper.c
helper.h
hyperv.c
hyperv.h
int_helper.c
ioport-user.c
kvm_i386.h
kvm-stub.c
kvm.c
machine.c
Makefile.objs
mem_helper.c
misc_helper.c
ops_sse_header.h
ops_sse.h
seg_helper.c
shift_helper_template.h
smm_helper.c
svm_helper.c
svm.h
TODO
topology.h
translate.c