Skip to content
Snippets Groups Projects
  1. Sep 02, 2013
  2. Aug 30, 2013
  3. Aug 29, 2013
    • Anthony Liguori's avatar
      Merge remote-tracking branch 'qemu-kvm/uq/master' into stable-1.5 · b5d54bd4
      Anthony Liguori authored
      
      * qemu-kvm/uq/master:
        kvm-stub: fix compilation
        kvm: shorten the parameter list for get_real_device()
        kvm: i386: fix LAPIC TSC deadline timer save/restore
        kvm-all.c: max_cpus should not exceed KVM vcpu limit
        kvm: Simplify kvm_handle_io
        kvm: x86: fix setting IA32_FEATURE_CONTROL with nested VMX disabled
        kvm: add KVM_IRQFD_FLAG_RESAMPLE support
        kvm: migrate vPMU state
        target-i386: remove tabs from target-i386/cpu.h
        Initialize IA32_FEATURE_CONTROL MSR in reset and migration
      
      Conflicts:
      	target-i386/cpu.h
      	target-i386/kvm.c
      
      aliguori: fixup trivial conflicts due to whitespace and added cpu
                argument
      
      Signed-off-by: default avatarAnthony Liguori <anthony@codemonkey.ws>
      b5d54bd4
Loading