[Qemu-devel] [PATCH] spapr: exit gentfully when CPU doesn't support requested compat mode

[Greg Kurz]

QEMU currently aborts if the user asks something unrealistic like power9
compat mode with a POWER8 CPU for example. Since this isn't a bug in QEMU,
there's no point in aborting. The same goes with the other possible error
paths in ppc_set_compat_all(). Let's just terminate QEMU instead.

Reported-by: Andrea Bolognani <abolo...@redhat.com>
Signed-off-by: Greg Kurz <gr...@kaod.org>
---
 hw/ppc/spapr.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index b2217f39eeea..d0cc124935c0 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1345,7 +1345,7 @@ static void ppc_spapr_reset(void)
         spapr_ovec_cleanup(spapr->ov5_cas);
         spapr->ov5_cas = spapr_ovec_new();
 
-        ppc_set_compat_all(spapr->max_compat_pvr, &error_abort);
+        ppc_set_compat_all(spapr->max_compat_pvr, &error_fatal);
     }
 
     fdt = spapr_build_fdt(spapr, rtas_addr, spapr->rtas_size);