On 04/11/2020 15.05, Daniel P. Berrangé wrote:
> Update some docs and test cases to use 'on' | 'off' as the preferred
> value for bool options.
>
> Signed-off-by: Daniel P. Berrangé <berra...@redhat.com>
> ---
> docs/system/vnc-security.rst | 6 +++---
> include/authz/listfile.h | 2 +-
> qemu-options.hx | 4 ++--
> tests/qemu-iotests/233 | 4 ++--
> 4 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/docs/system/vnc-security.rst b/docs/system/vnc-security.rst
> index b237b07330..e97b42dfdc 100644
> --- a/docs/system/vnc-security.rst
> +++ b/docs/system/vnc-security.rst
> @@ -89,7 +89,7 @@ but with ``verify-peer`` set to ``yes`` instead.
> .. parsed-literal::
>
> |qemu_system| [...OPTIONS...] \
> - -object
> tls-creds-x509,id=tls0,dir=/etc/pki/qemu,endpoint=server,verify-peer=yes \
> + -object
> tls-creds-x509,id=tls0,dir=/etc/pki/qemu,endpoint=server,verify-peer=on \
> -vnc :1,tls-creds=tls0 -monitor stdio
>
> .. _vnc_005fsec_005fcertificate_005fpw:
> @@ -103,7 +103,7 @@ authentication to provide two layers of authentication
> for clients.
> .. parsed-literal::
>
> |qemu_system| [...OPTIONS...] \
> - -object
> tls-creds-x509,id=tls0,dir=/etc/pki/qemu,endpoint=server,verify-peer=yes \
> + -object
> tls-creds-x509,id=tls0,dir=/etc/pki/qemu,endpoint=server,verify-peer=on \
> -vnc :1,tls-creds=tls0,password -monitor stdio
> (qemu) change vnc password
> Password: ********
> @@ -145,7 +145,7 @@ x509 options:
> .. parsed-literal::
>
> |qemu_system| [...OPTIONS...] \
> - -object
> tls-creds-x509,id=tls0,dir=/etc/pki/qemu,endpoint=server,verify-peer=yes \
> + -object
> tls-creds-x509,id=tls0,dir=/etc/pki/qemu,endpoint=server,verify-peer=on \
> -vnc :1,tls-creds=tls0,sasl -monitor stdio
>
> .. _vnc_005fsetup_005fsasl:
> diff --git a/include/authz/listfile.h b/include/authz/listfile.h
> index 0a1e5bddd3..0b7fe72198 100644
> --- a/include/authz/listfile.h
> +++ b/include/authz/listfile.h
> @@ -73,7 +73,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(QAuthZListFile,
> * The object can be created on the command line using
> *
> * -object authz-list-file,id=authz0,\
> - * filename=/etc/qemu/myvm-vnc.acl,refresh=yes
> + * filename=/etc/qemu/myvm-vnc.acl,refresh=on
> *
> */
> struct QAuthZListFile {
> diff --git a/qemu-options.hx b/qemu-options.hx
> index 2c83390504..0bdc07bc47 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -5002,7 +5002,7 @@ SRST
> Note the use of quotes due to the x509 distinguished name
> containing whitespace, and escaping of ','.
>
> - ``-object authz-listfile,id=id,filename=path,refresh=yes|no``
> + ``-object authz-listfile,id=id,filename=path,refresh=on|off``
> Create an authorization object that will control access to
> network services.
>
> @@ -5047,7 +5047,7 @@ SRST
>
> # |qemu_system| \\
> ... \\
> - -object
> authz-simple,id=auth0,filename=/etc/qemu/vnc-sasl.acl,refresh=yes \\
> + -object
> authz-simple,id=auth0,filename=/etc/qemu/vnc-sasl.acl,refresh=on \\
> ...
>
> ``-object authz-pam,id=id,service=string``
> diff --git a/tests/qemu-iotests/233 b/tests/qemu-iotests/233
> index a5c17c3963..0b99530f7f 100755
> --- a/tests/qemu-iotests/233
> +++ b/tests/qemu-iotests/233
> @@ -83,7 +83,7 @@ echo
> echo "== check plain client to TLS server fails =="
>
> nbd_server_start_tcp_socket \
> - --object
> tls-creds-x509,dir=${tls_dir}/server1,endpoint=server,id=tls0,verify-peer=yes
> \
> + --object
> tls-creds-x509,dir=${tls_dir}/server1,endpoint=server,id=tls0,verify-peer=on \
> --tls-creds tls0 \
> -f $IMGFMT "$TEST_IMG" 2>> "$TEST_DIR/server.log"
>
> @@ -128,7 +128,7 @@ echo "== check TLS with authorization =="
> nbd_server_stop
>
> nbd_server_start_tcp_socket \
> - --object
> tls-creds-x509,dir=${tls_dir}/server1,endpoint=server,id=tls0,verify-peer=yes
> \
> + --object
> tls-creds-x509,dir=${tls_dir}/server1,endpoint=server,id=tls0,verify-peer=on \
> --object "authz-simple,id=authz0,identity=CN=localhost,, \
> O=Cthulu Dark Lord Enterprises client1,,L=R'lyeh,,C=South Pacific" \
> --tls-authz authz0 \
>
Reviewed-by: Thomas Huth <th...@redhat.com>
