diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-29 16:57:41 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-29 16:57:41 -0600 |
| commit | 0893d46014b0300fb8aec92df94effea34d04b61 (patch) | |
| tree | 8b5f36de79a67d397a30ffc2bd6ad97a5711f114 /scripts | |
| parent | 0c77067950e0b158ea7d825cfa7630bfd09b968a (diff) | |
| parent | f8bb056564ed719b2fa5e05028bc70aeb0cc5c6c (diff) | |
| download | qemu-0893d46014b0300fb8aec92df94effea34d04b61.zip qemu-0893d46014b0300fb8aec92df94effea34d04b61.tar.gz qemu-0893d46014b0300fb8aec92df94effea34d04b61.tar.bz2 | |
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>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/kvm/vmxcap | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/kvm/vmxcap b/scripts/kvm/vmxcap index cbe6440..0b23f77 100755 --- a/scripts/kvm/vmxcap +++ b/scripts/kvm/vmxcap @@ -147,6 +147,7 @@ controls = [ 5: 'Enable VPID', 6: 'WBINVD exiting', 7: 'Unrestricted guest', + 9: 'Virtual interrupt delivery', 10: 'PAUSE-loop exiting', 11: 'RDRAND exiting', 12: 'Enable INVPCID', |