Commit d69969e5 authored by Halil Pasic's avatar Halil Pasic Committed by Cornelia Huck
Browse files

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: default avatarHalil Pasic <pasic@linux.vnet.ibm.com>
Message-Id: <20171206144438.28908-3-pasic@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 99577c49

hw/s390x/s390-virtio-ccw.c

+6 −1
Original line number Diff line number Diff line
@@ -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);

qemu-doc.texi

+8 −0
Original line number Diff line number Diff line
@@ -2501,6 +2501,14 @@ enabled via the ``-machine usb=on'' argument. 


The ``-nodefconfig`` argument is a synonym for ``-no-user-config``.



@subsection -machine s390-squash-mcss=on|off (since 2.12.0)



The ``s390-squash-mcss=on`` property has been obsoleted by allowing the

cssid to be chosen freely. Instead of squashing subchannels into the

default channel subsystem image for guests that do not support multiple

channel subsystems, all devices can be put into the default channel

subsystem image.



@section qemu-img command line arguments



@subsection convert -s (since 2.0.0)

qemu-options.hx

+7 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ 
    "                suppress-vmdesc=on|off disables self-describing migration (default=off)\n"

    "                nvdimm=on|off controls NVDIMM support (default=off)\n"

    "                enforce-config-section=on|off enforce configuration section migration (default=off)\n"

    "                s390-squash-mcss=on|off controls support for squashing into default css (default=off)\n",

    "                s390-squash-mcss=on|off (deprecated) controls support for squashing into default css (default=off)\n",

    QEMU_ARCH_ALL)

STEXI

@item -machine [type=]@var{name}[,prop=@var{value}[,...]]
@@ -98,6 +98,12 @@ Enables or disables NVDIMM support. The default is off. 
@item s390-squash-mcss=on|off

Enables or disables squashing subchannels into the default css.

The default is off.

NOTE: This property is deprecated and will be removed in future releases.

The ``s390-squash-mcss=on`` property has been obsoleted by allowing the

cssid to be chosen freely. Instead of squashing subchannels into the

default channel subsystem image for guests that do not support multiple

channel subsystems, all devices can be put into the default channel

subsystem image.

@item enforce-config-section=on|off

If @option{enforce-config-section} is set to @var{on}, force migration

code to send configuration section even if the machine-type sets the