On Thu, Aug 20, 2015 at 02:54:31PM -0700, Eduardo Habkost wrote: > Machine class names should use the "-machine" suffix to allow > class-name-based machine class lookup to work. Rename the the pseries > machine classes using the MACHINE_TYPE_NAME macro. > > Cc: Alexander Graf <ag...@suse.de> > Cc: qemu-...@nongnu.org > Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
I'm also happy to take this through by spapr-next tree if that's
useful to do.
> ---
> hw/ppc/spapr.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index bf0c64f..012b6ed 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -1925,7 +1925,7 @@ static void spapr_machine_2_1_class_init(ObjectClass
> *oc, void *data)
> }
>
> static const TypeInfo spapr_machine_2_1_info = {
> - .name = TYPE_SPAPR_MACHINE "2.1",
> + .name = MACHINE_TYPE_NAME("pseries-2.1"),
> .parent = TYPE_SPAPR_MACHINE,
> .class_init = spapr_machine_2_1_class_init,
> .instance_init = spapr_machine_2_1_instance_init,
> @@ -1945,7 +1945,7 @@ static void spapr_machine_2_2_class_init(ObjectClass
> *oc, void *data)
> }
>
> static const TypeInfo spapr_machine_2_2_info = {
> - .name = TYPE_SPAPR_MACHINE "2.2",
> + .name = MACHINE_TYPE_NAME("pseries-2.2"),
> .parent = TYPE_SPAPR_MACHINE,
> .class_init = spapr_machine_2_2_class_init,
> .instance_init = spapr_machine_2_2_instance_init,
> @@ -1965,7 +1965,7 @@ static void spapr_machine_2_3_class_init(ObjectClass
> *oc, void *data)
> }
>
> static const TypeInfo spapr_machine_2_3_info = {
> - .name = TYPE_SPAPR_MACHINE "2.3",
> + .name = MACHINE_TYPE_NAME("pseries-2.3"),
> .parent = TYPE_SPAPR_MACHINE,
> .class_init = spapr_machine_2_3_class_init,
> .instance_init = spapr_machine_2_3_instance_init,
> @@ -1982,7 +1982,7 @@ static void spapr_machine_2_4_class_init(ObjectClass
> *oc, void *data)
> }
>
> static const TypeInfo spapr_machine_2_4_info = {
> - .name = TYPE_SPAPR_MACHINE "2.4",
> + .name = MACHINE_TYPE_NAME("pseries-2.4"),
> .parent = TYPE_SPAPR_MACHINE,
> .class_init = spapr_machine_2_4_class_init,
> };
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
pgpveDoe6lMv8.pgp
Description: PGP signature
