« Previous | Next » 

Revision 0893d460

ID0893d46014b0300fb8aec92df94effea34d04b61

Added by Anthony Liguori about 11 years ago

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 <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted