Re: [qemu-s390x] [PATCH v2 2/2] s390x: deprecate s390-squash-mcss machine prop

[Cornelia Huck]

On Wed,  6 Dec 2017 15:44:38 +0100
Halil Pasic <address@hidden> wrote:

> 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 <address@hidden>
> ---
> v1 -> v2:
> * Moved warning to machine initialization, and made it
>   warn if the command line option is specified
> * Dropped the r-b of Dong Jia because of the change above
> * Dropped machine name from the doc
> ---
>  hw/s390x/s390-virtio-ccw.c | 7 ++++++-
>  qemu-doc.texi              | 8 ++++++++
>  qemu-options.hx            | 8 +++++++-
>  3 files changed, 21 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index 4d65a50334..91e12f3af9 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).");
> +    }
> +

Oh, you found a way to make it warn whenever specified? Neat.

>      assert(ret == 0);
>      if (css_migration_enabled()) {
>          css_register_vmstate();