* 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> |
||
|---|---|---|
| .. | ||
| kvm | ||
| qemu-guest-agent | ||
| tracetool | ||
| analyse-9p-simpletrace.py | ||
| check-qerror.sh | ||
| checkpatch.pl | ||
| create_config | ||
| feature_to_c.sh | ||
| get_maintainer.pl | ||
| gtester-cat | ||
| hxtool | ||
| make-release | ||
| make_device_config.sh | ||
| ordereddict.py | ||
| qapi-commands.py | ||
| qapi-types.py | ||
| qapi-visit.py | ||
| qapi.py | ||
| qemu-binfmt-conf.sh | ||
| qemu-gdb.py | ||
| qtest | ||
| refresh-pxe-roms.sh | ||
| signrom.py | ||
| simpletrace.py | ||
| texi2pod.pl | ||
| tracetool.py | ||
| update-linux-headers.sh | ||