| commit | 0893d46014b0300fb8aec92df94effea34d04b61 | |
| author | Anthony Liguori <aliguori@us.ibm.com> | |
| Tue, 29 Jan 2013 22:57:41 +0000 (29 16:57 -0600) | ||
| committer | Anthony Liguori <aliguori@us.ibm.com> | |
| Tue, 29 Jan 2013 22:57:41 +0000 (29 16:57 -0600) | ||
| tree | 8b5f36de79a67d397a30ffc2bd6ad97a5711f114 | treesnapshot (tar.gz zip) |
| parent | 0c77067950e0b158ea7d825cfa7630bfd09b968a | commitdiff |
| parent | f8bb056564ed719b2fa5e05028bc70aeb0cc5c6c | commitdiff |
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>
* 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>
| target-i386/kvm.c | diff1 | diff2 | blobhistory |