]> git.proxmox.com Git - qemu.git/commit
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0c77067 f8bb056)
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 29 Jan 2013 22:57:41 +0000 (16:57 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 29 Jan 2013 22:57:41 +0000 (16:57 -0600)
commit0893d46014b0300fb8aec92df94effea34d04b61
tree8b5f36de79a67d397a30ffc2bd6ad97a5711f114tree
parent0c77067950e0b158ea7d825cfa7630bfd09b968acommit | diff
parentf8bb056564ed719b2fa5e05028bc70aeb0cc5c6ccommit | diff
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>
target-i386/kvm.c diff1 | diff2 | blob | history
Qemu copy for testing