]> git.proxmox.com Git - qemu.git/commit
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 16 Feb 2012 00:41:28 +0000 (18:41 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 16 Feb 2012 00:41:28 +0000 (18:41 -0600)
commit6c263e26a5c162a8cd79e32bb82422697db5c57c
treede3955b0d0d026c74e05f1342e7dac75b3c6ab78
parentcf5cfe0471eb3693401f390bc467413d14dce368
parenta4aecd2819fd31641ab62472e3385073043521fb
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

* qemu-kvm/uq/master:
  apic: Fix legacy vmstate loading for KVM
  kvm: Implement kvm_irqchip_in_kernel like kvm_enabled
  kvm: Allow to set shadow MMU size
hw/apic_common.c
hw/pc.c
qemu-config.c
qemu-options.hx