Re: [Qemu-devel] [PATCH 06/10] s390-virtio: Rename machine class name to use MACHINE_TYPE_NAME

[David Gibson <david@gibson.dropbear.id.au>]

[-- Attachment #1: Type: text/plain, Size: 1694 bytes --]

On Thu, Aug 20, 2015 at 02:54:32PM -0700, Eduardo Habkost wrote:
> Machine class names should use the "-machine" suffix to allow
> class-name-based machine class lookup to work. Rename the s390-virtio
> machine class using the MACHINE_TYPE_NAME macro.
> 
> Cc: Alexander Graf <agraf@suse.de>
> Cc: Richard Henderson <rth@twiddle.net>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  hw/s390x/s390-virtio.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c
> index 1284e77..43d6ccb 100644
> --- a/hw/s390x/s390-virtio.c
> +++ b/hw/s390x/s390-virtio.c
> @@ -52,7 +52,8 @@
>  
>  #define MAX_BLK_DEVS                    10
>  #define ZIPL_FILENAME                   "s390-zipl.rom"
> -#define TYPE_S390_MACHINE               "s390-machine"
> +#define S390_MACHINE                    "s390-virtio"
> +#define TYPE_S390_MACHINE               MACHINE_TYPE_NAME(S390_MACHINE)
>  
>  #define S390_TOD_CLOCK_VALUE_MISSING    0x00
>  #define S390_TOD_CLOCK_VALUE_PRESENT    0x01
> @@ -333,7 +334,7 @@ static void s390_machine_class_init(ObjectClass *oc, void *data)
>      MachineClass *mc = MACHINE_CLASS(oc);
>      NMIClass *nc = NMI_CLASS(oc);
>  
> -    mc->name = "s390-virtio";
> +    mc->name = S390_MACHINE;
>      mc->alias = "s390";
>      mc->desc = "VirtIO based S390 machine";
>      mc->init = s390_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

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]