| Message ID | 20180327043741.7705-3-david@gibson.dropbear.id.au |
|---|---|
| State | New |
| Headers | show |
| Series | target/ppc: Assorted cpu cleanups (esp. hash64 MMU) | expand |
On 27.03.2018 06:37, David Gibson wrote: > 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> > --- > target/ppc/translate_init.c | 9 +-------- > 1 file changed, 1 insertion(+), 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) { > Reviewed-by: Thomas Huth <thuth@redhat.com>
On Tue, 27 Mar 2018 15:37:31 +1100 David Gibson <david@gibson.dropbear.id.au> wrote: > 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: Greg Kurz <groug@kaod.org> > target/ppc/translate_init.c | 9 +-------- > 1 file changed, 1 insertion(+), 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) {
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) {
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> --- target/ppc/translate_init.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)