KVM updates for the 3.7 merge window