[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.5 15/15] s390: deprecate the non-ccw machine in
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL for-2.5 15/15] s390: deprecate the non-ccw machine in 2.5 |
Date: |
Wed, 11 Nov 2015 18:56:33 +0100 |
From: Christian Borntraeger <address@hidden>
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>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-virtio.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c
index cebebb1..51dc0a8 100644
--- a/hw/s390x/s390-virtio.c
+++ b/hw/s390x/s390-virtio.c
@@ -268,6 +268,10 @@ static void s390_init(MachineState *machine)
hwaddr virtio_region_len;
hwaddr virtio_region_start;
+ error_printf("WARNING\n"
+ "The s390-virtio machine (non-ccw) is deprecated.\n"
+ "It will be removed in 2.6. Please use s390-ccw-virtio\n");
+
if (machine->ram_slots) {
error_report("Memory hotplug not supported by the selected machine.");
exit(EXIT_FAILURE);
@@ -334,7 +338,7 @@ static void s390_machine_class_init(ObjectClass *oc, void
*data)
NMIClass *nc = NMI_CLASS(oc);
mc->alias = "s390";
- mc->desc = "VirtIO based S390 machine";
+ mc->desc = "VirtIO based S390 machine (deprecated)";
mc->init = s390_init;
mc->reset = s390_machine_reset;
mc->block_default_type = IF_VIRTIO;
--
2.6.3
- [Qemu-devel] [PULL for-2.5 03/15] MAINTAINERS: update s390 file patterns, (continued)
- [Qemu-devel] [PULL for-2.5 03/15] MAINTAINERS: update s390 file patterns, Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 05/15] s390x: switch to memory_region_allocate_system_memory, Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 08/15] pc-bios/s390-ccw: ISO-9660 El Torito boot implementation, Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 07/15] pc-bios/s390-ccw: Always adjust virtio sector count, Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 10/15] pc-bios/s390-ccw: El Torito 16-bit boot image size field workaround, Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 09/15] pc-bios/s390-ccw: El Torito s390x boot entry check, Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 14/15] s390x/ipl: switch error reporting to error_setg, Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 13/15] s390x/ipl: clean up qom definitions and turn into TYPE_DEVICE, Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 12/15] qdev: provide qdev_reset_all_fn(), Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 11/15] pc-bios/s390-ccw: rebuild image, Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 15/15] s390: deprecate the non-ccw machine in 2.5,
Cornelia Huck <=
- Re: [Qemu-devel] [PULL for-2.5 00/15] s390x patches for 2.5, Peter Maydell, 2015/11/11