diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2018-03-23 12:55:04 +1100 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2018-04-27 18:05:22 +1000 |
| commit | 197600ecc4f81b9be5e233d8a1cbf42a48cdd371 (patch) | |
| tree | 52147ba395760a5946f8cb58c299ebbd602ce33e | |
| parent | e850da556d69363e6846ab00ddcbf7cb55203981 (diff) | |
| download | focaccia-qemu-197600ecc4f81b9be5e233d8a1cbf42a48cdd371.tar.gz focaccia-qemu-197600ecc4f81b9be5e233d8a1cbf42a48cdd371.zip | |
target/ppc: Simplify cpu valid check in ppc_cpu_realize
The #if isn't necessary, because there's a suitable one inside ppc_cpu_is_valid(). We've already filtered for suitable cpu models in the functions that search and register them. So by the time we get to realize having an invalid one indicates a code error, not a user error, so an assert() is more appropriate than error_setg(). Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Greg Kurz <groug@kaod.org>
| -rw-r--r-- | target/ppc/translate_init.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c index 56b80a204a..2ae718242a 100644 --- a/target/ppc/translate_init.c +++ b/target/ppc/translate_init.c @@ -9749,14 +9749,7 @@ static void ppc_cpu_realize(DeviceState *dev, Error **errp) } } -#if defined(TARGET_PPCEMB) - if (!ppc_cpu_is_valid(pcc)) { - error_setg(errp, "CPU does not possess a BookE or 4xx MMU. " - "Please use qemu-system-ppc or qemu-system-ppc64 instead " - "or choose another CPU model."); - goto unrealize; - } -#endif + assert(ppc_cpu_is_valid(pcc)); create_ppc_opcodes(cpu, &local_err); if (local_err != NULL) { |