From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47385) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZufV6-0001nT-EB for qemu-devel@nongnu.org; Fri, 06 Nov 2015 06:48:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZufV3-0002Hd-6F for qemu-devel@nongnu.org; Fri, 06 Nov 2015 06:48:12 -0500 Received: from e06smtp12.uk.ibm.com ([195.75.94.108]:59958) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZufV2-0002HX-Te for qemu-devel@nongnu.org; Fri, 06 Nov 2015 06:48:09 -0500 Received: from localhost by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 6 Nov 2015 11:48:07 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 1BBE4219005F for ; Fri, 6 Nov 2015 11:48:00 +0000 (GMT) Received: from d06av11.portsmouth.uk.ibm.com (d06av11.portsmouth.uk.ibm.com [9.149.37.252]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tA6Bm4gY66846916 for ; Fri, 6 Nov 2015 11:48:04 GMT Received: from d06av11.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av11.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tA6Bm39w013852 for ; Fri, 6 Nov 2015 04:48:03 -0700 References: <1446809298-58175-1-git-send-email-borntraeger@de.ibm.com> From: Christian Borntraeger Message-ID: <563C9372.7020306@de.ibm.com> Date: Fri, 6 Nov 2015 12:48:02 +0100 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] s390: deprecate the non-ccw machine in 2.5 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: qemu-devel , Alexander Graf , Jens Freimann , Cornelia Huck , Paolo Bonzini , Richard Henderson Am 06.11.2015 um 12:41 schrieb Peter Maydell: > On 6 November 2015 at 11:28, Christian Borntraeger > 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 >> Acked-by: David Hildenbrand > > 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.