Re: [Qemu-devel] [PATCH] s390: deprecate the non-ccw machine in 2.5

[Peter Maydell]

On 6 November 2015 at 11:28, Christian Borntraeger
<address@hidden> wrote:
> The non-ccw machine for s390 (s390-virtio) is not very well maintained
> and caused several issues in the past:
> - aliases like virtio-blk did not work for s390
> - virtio refactoring failed due to long standing bugs (e.g.see commit
>   cb927b8a "s390-virtio: Accommodate guests using virtqueues too early")
> - some features like memory hotplug will cause trouble due to virtio storage
>   being above guest memory
> - the boot loader bios no longer seems to work. the source code of that
>   loader is also no longer maintained
>
> 2.4 changed the default to the ccw machine, let's deprecate the old
> machine for 2.5.
>
> Signed-off-by: Christian Borntraeger <address@hidden>
> Acked-by: David Hildenbrand <address@hidden>

You'll also want to add a suitable note to the Changelog on the wiki.

> ---
>  hw/s390x/s390-virtio.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c
> index e4000c9..7d95cfd 100644
> --- a/hw/s390x/s390-virtio.c
> +++ b/hw/s390x/s390-virtio.c
> @@ -266,6 +266,9 @@ static void s390_init(MachineState *machine)
>      hwaddr virtio_region_len;
>      hwaddr virtio_region_start;
>
> +    error_report("WARNING\nThe s390-virtio machine (non-ccw) is 
> deprecated.\n"
> +                 "It will be removed in 2.6. Please use s390-ccw-virtio");
> +

I have a vague recollection that you shouldn't have embedded
newlines in error_report() strings, but maybe I'm misremembering?

>      if (machine->ram_slots) {
>          error_report("Memory hotplug not supported by the selected 
> machine.");
>          exit(EXIT_FAILURE);
> @@ -320,7 +323,7 @@ static void s390_machine_class_init(ObjectClass *oc, void 
> *data)
>
>      mc->name = "s390-virtio";
>      mc->alias = "s390";
> -    mc->desc = "VirtIO based S390 machine";
> +    mc->desc = "VirtIO based S390 machine (deprecated)";
>      mc->init = s390_init;
>      mc->block_default_type = IF_VIRTIO;
>      mc->max_cpus = 255;
> --
> 2.3.0

thanks
-- PMM