From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43888) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZufBe-0005x0-85 for qemu-devel@nongnu.org; Fri, 06 Nov 2015 06:28:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZufBZ-0004lh-06 for qemu-devel@nongnu.org; Fri, 06 Nov 2015 06:28:05 -0500 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:44450) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZufBY-0004lR-NR for qemu-devel@nongnu.org; Fri, 06 Nov 2015 06:28:00 -0500 Received: from localhost by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 6 Nov 2015 11:27:58 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id D53C5219005F for ; Fri, 6 Nov 2015 11:27:51 +0000 (GMT) Received: from d06av06.portsmouth.uk.ibm.com (d06av06.portsmouth.uk.ibm.com [9.149.37.217]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tA6BRtt37143902 for ; Fri, 6 Nov 2015 11:27:56 GMT Received: from d06av06.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tA6BRtSq004039 for ; Fri, 6 Nov 2015 04:27:55 -0700 From: Christian Borntraeger Date: Fri, 6 Nov 2015 12:28:18 +0100 Message-Id: <1446809298-58175-1-git-send-email-borntraeger@de.ibm.com> Subject: [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: Cornelia Huck Cc: Peter Maydell , qemu-devel , Alexander Graf , Christian Borntraeger , Jens Freimann , Paolo Bonzini , Richard Henderson 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 --- 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"); + 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