From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:35105) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULzJI-0000xf-Pv for qemu-devel@nongnu.org; Sat, 30 Mar 2013 13:11:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULzJE-0003wN-CH for qemu-devel@nongnu.org; Sat, 30 Mar 2013 13:11:20 -0400 From: Stuart Yoder Date: Sat, 30 Mar 2013 11:40:49 -0500 Message-ID: <1364661649-2399-1-git-send-email-stuart.yoder@freescale.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH] PPC: e500: advertise 4.2 MPIC only if KVM supports EPR List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: agraf@suse.de Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Stuart Yoder From: Stuart Yoder Signed-off-by: Stuart Yoder --- hw/ppc/e500plat.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c index 25ac4b1..2cd7cad 100644 --- a/hw/ppc/e500plat.c +++ b/hw/ppc/e500plat.c @@ -16,6 +16,7 @@ #include "sysemu/device_tree.h" #include "hw/pci/pci.h" #include "hw/openpic.h" +#include "sysemu/kvm.h" static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt) { @@ -48,6 +49,10 @@ static void e500plat_init(QEMUMachineInitArgs *args) .mpic_version = OPENPIC_MODEL_FSL_MPIC_42, }; + if (kvm_enabled() && !kvm_check_extension(kvm_state, KVM_CAP_PPC_EPR)) { + params.mpic_version = OPENPIC_MODEL_FSL_MPIC_20; + } + ppce500_init(¶ms); } -- 1.7.9.7