| Message ID | 1516694904-64879-15-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | generalize parsing of cpu_model (part 4) | expand |
On Tue, Jan 23, 2018 at 09:08:13AM +0100, Igor Mammedov wrote: > it will be used for providing to cpu name resolving class for > parsing cpu model for system and user emulation code. > > Along with change add target to null-machine test, so > that when switch to CPU_RESOLVING_TYPE happens, > test would ensure that null-mchine usecase still works. > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > CC: Laurent Vivier <laurent@vivier.eu> > CC: David Gibson <david@gibson.dropbear.id.au> > CC: Alexander Graf <agraf@suse.de> > CC: qemu-ppc@nongnu.org > --- > target/ppc/cpu.h | 1 + > tests/machine-none-test.c | 3 +++ > 2 files changed, 4 insertions(+) > > diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h > index 603a38c..d5f2f3d 100644 > --- a/target/ppc/cpu.h > +++ b/target/ppc/cpu.h > @@ -1380,6 +1380,7 @@ int ppc_dcr_write (ppc_dcr_t *dcr_env, int dcrn, uint32_t val); > > #define POWERPC_CPU_TYPE_SUFFIX "-" TYPE_POWERPC_CPU > #define POWERPC_CPU_TYPE_NAME(model) model POWERPC_CPU_TYPE_SUFFIX > +#define CPU_RESOLVING_TYPE TYPE_POWERPC_CPU > > #define cpu_signal_handler cpu_ppc_signal_handler > #define cpu_list ppc_cpu_list > diff --git a/tests/machine-none-test.c b/tests/machine-none-test.c > index 160aa13..052b8c0 100644 > --- a/tests/machine-none-test.c > +++ b/tests/machine-none-test.c > @@ -41,6 +41,9 @@ static struct arch2cpu cpus_map[] = { > { "moxie", "MoxieLite" }, > { "nios2", "FIXME" }, > { "or1k", "or1200" }, > + { "ppc", "604" }, > + { "ppc64", "power8e_v2.1" }, > + { "ppcemb", "440epb" }, > }; > > static const char *get_cpu_model_by_arch(const char *arch)
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 603a38c..d5f2f3d 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1380,6 +1380,7 @@ int ppc_dcr_write (ppc_dcr_t *dcr_env, int dcrn, uint32_t val); #define POWERPC_CPU_TYPE_SUFFIX "-" TYPE_POWERPC_CPU #define POWERPC_CPU_TYPE_NAME(model) model POWERPC_CPU_TYPE_SUFFIX +#define CPU_RESOLVING_TYPE TYPE_POWERPC_CPU #define cpu_signal_handler cpu_ppc_signal_handler #define cpu_list ppc_cpu_list diff --git a/tests/machine-none-test.c b/tests/machine-none-test.c index 160aa13..052b8c0 100644 --- a/tests/machine-none-test.c +++ b/tests/machine-none-test.c @@ -41,6 +41,9 @@ static struct arch2cpu cpus_map[] = { { "moxie", "MoxieLite" }, { "nios2", "FIXME" }, { "or1k", "or1200" }, + { "ppc", "604" }, + { "ppc64", "power8e_v2.1" }, + { "ppcemb", "440epb" }, }; static const char *get_cpu_model_by_arch(const char *arch)
it will be used for providing to cpu name resolving class for parsing cpu model for system and user emulation code. Along with change add target to null-machine test, so that when switch to CPU_RESOLVING_TYPE happens, test would ensure that null-mchine usecase still works. Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- CC: Laurent Vivier <laurent@vivier.eu> CC: David Gibson <david@gibson.dropbear.id.au> CC: Alexander Graf <agraf@suse.de> CC: qemu-ppc@nongnu.org --- target/ppc/cpu.h | 1 + tests/machine-none-test.c | 3 +++ 2 files changed, 4 insertions(+)