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

diff --cc hw/apic_common.c
Simple merge

diff --cc hw/pc.c
Simple merge

diff --cc qemu-config.c
Simple merge

diff --cc qemu-options.hx
Simple merge