]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45e6cee d281084)
qMerge remote-tracking branch 'awilliam/tags/vfio-pci-for-qemu-20121210.0' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 13 Dec 2012 17:40:23 +0000 (11:40 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 13 Dec 2012 17:40:23 +0000 (11:40 -0600)
vfio-pci: fix kvm disabled path

* awilliam/tags/vfio-pci-for-qemu-20121210.0:
  vfio-pci: Don't use kvm_irqchip_in_kernel

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Trivial merge
Qemu copy for testing