| Message ID | 1446811645-25565-1-git-send-email-borntraeger@de.ibm.com |
|---|---|
| State | New |
| Headers | show |
On Fri, 6 Nov 2015 13:07:25 +0100 Christian Borntraeger <borntraeger@de.ibm.com> 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 <borntraeger@de.ibm.com> > Acked-by: David Hildenbrand <dahi@linux.vnet.ibm.com> > --- > 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 e4000c9..8d5e578 100644 > --- a/hw/s390x/s390-virtio.c > +++ b/hw/s390x/s390-virtio.c > @@ -266,6 +266,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); > @@ -320,7 +324,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; Second hunk did not quite fit (old-ish tree?), but no need to resend. Applied to my s390-next branch, and I'll update the changelog as well.
diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index e4000c9..8d5e578 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -266,6 +266,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); @@ -320,7 +324,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;