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

[Christian Borntraeger]

Am 06.11.2015 um 12:41 schrieb 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.

Yes.
> 
>> ---
>>  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?

Hmm, right error_printf can handle newlines, error_report might not depending
on output.