]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 14df77a c3ebd3b)
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 10 Sep 2012 17:51:44 +0000 (12:51 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 10 Sep 2012 17:51:44 +0000 (12:51 -0500)
* qemu-kvm/uq/master:
  kvm: i386: Add classic PCI device assignment
  kvm: i386: Add services required for PCI device assignment
  kvm: Introduce kvm_has_intx_set_mask
  kvm: Introduce kvm_irqchip_update_msi_route
  kvm: Clean up irqfd API
  qemu: Use valgrind annotations to mark kvm guest memory as defined

1  2 
configure patch | diff1 | diff2 | blob | history

diff --cc configure
Simple merge
Qemu copy for testing