diff options
| author | Halil Pasic | 2017-12-06 15:44:38 +0100 |
|---|---|---|
| committer | Cornelia Huck | 2017-12-14 17:56:54 +0100 |
| commit | d69969e55f2187188c3d2a0ea9c6be29631358fb (patch) | |
| tree | 692adaa4f14f95e6abefd7cc3fafd3b1b158af0c /hw | |
| parent | s390x/css: unrestrict cssids (diff) | |
| download | qemu-d69969e55f2187188c3d2a0ea9c6be29631358fb.tar.gz qemu-d69969e55f2187188c3d2a0ea9c6be29631358fb.tar.xz qemu-d69969e55f2187188c3d2a0ea9c6be29631358fb.zip | |
s390x: deprecate s390-squash-mcss machine prop
With the cssids unrestricted (commit "s390x/css: unrestrict cssids") the
s390-squash-mcss machine property should not be used. Actually Libvirt
never supported this, so the expectation is that removing it should be
pretty painless. But let's play nice and deprecate it first.
Signed-off-by: Halil Pasic <pasic@linux.vnet.ibm.com>
Message-Id: <20171206144438.28908-3-pasic@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 5d4aaaf158..fe3f3b2ad6 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -308,6 +308,11 @@ static void ccw_init(MachineState *machine) } else { ret = css_create_css_image(VIRTUAL_CSSID, true); } + if (qemu_opt_get(qemu_get_machine_opts(), "s390-squash-mcss")) { + warn_report("The machine property 's390-squash-mcss' is deprecated" + " (obsoleted by lifting the cssid restrictions)."); + } + assert(ret == 0); if (css_migration_enabled()) { css_register_vmstate(); @@ -582,7 +587,7 @@ static inline void s390_machine_initfn(Object *obj) object_property_add_bool(obj, "s390-squash-mcss", machine_get_squash_mcss, machine_set_squash_mcss, NULL); - object_property_set_description(obj, "s390-squash-mcss", + object_property_set_description(obj, "s390-squash-mcss", "(deprecated) " "enable/disable squashing subchannels into the default css", NULL); object_property_set_bool(obj, false, "s390-squash-mcss", NULL); |