Re: [PATCH] hw/s390x/s390-virtio-ccw: Improve the machine description string

[Cornelia Huck <cohuck@redhat.com>]

On Fri, May 06 2022, Thomas Huth <thuth@redhat.com> wrote:

> On 06/05/2022 09.23, Cornelia Huck wrote:
>> On Fri, May 06 2022, Thomas Huth <thuth@redhat.com> wrote:
>> 
>>> The machine name already contains the words "ccw" and "virtio", so
>>> using "VirtIO-ccw" in the description likely does not really help
>>> the average user to get an idea what this machine type is about.
>>> Thus let's switch to "Virtual s390x machine" now, since "virtual
>>> machine" should be a familiar term, and "s390x" signals that this
>>> is about 64-bit guests (unlike S390 which could mean that it is
>>> 31-bit only).
>> 
>> Do we foresee any s390x machines that don't default to ccw virtio
>> devices in the future?
>
> I don't think so. And if we ever get another type of para-virtualized 
> machine, we still can change the description again to be more specific to 
> distinguish them.

Fair enough.

Acked-by: Cornelia Huck <cohuck@redhat.com>

>
>>> Also expand "v" to "version, since this makes it easier to use
>> 
>> s/"version/"version"/ :)
>
> Thanks!
>
>>> this macro also with non-numeric machine names in downstream.
>>>
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>> ---
>>>   hw/s390x/s390-virtio-ccw.c | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
>>> index 8fa488d13a..11a942a325 100644
>>> --- a/hw/s390x/s390-virtio-ccw.c
>>> +++ b/hw/s390x/s390-virtio-ccw.c
>>> @@ -768,7 +768,7 @@ bool css_migration_enabled(void)
>>>       {                                                                         \
>>>           MachineClass *mc = MACHINE_CLASS(oc);                                 \
>>>           ccw_machine_##suffix##_class_options(mc);                             \
>>> -        mc->desc = "VirtIO-ccw based S390 machine v" verstr;                  \
>>> +        mc->desc = "Virtual s390x machine (version " verstr ")";      \
>>>           if (latest) {                                                         \
>>>               mc->alias = "s390-ccw-virtio";                                    \
>>>               mc->is_default = true;                                            \
>> 
>
>   Thomas