Re: [Qemu-trivial] [PATCH] iscsi: Fix check for username

[Peter Lieven <pl@kamp.de>]

Am 07.03.2015 um 10:14 schrieb Stefan Weil:
> The variable user in struct iscsi_url is a character array, not a pointer.
> Therefore its address will never be NULL.
>
> clang reports this error:
>
> block/iscsi.c:1329:20: warning:
>  comparison of array 'iscsi_url->user' not equal to a null pointer
>  is always true [-Wtautological-pointer-compare]
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>
> This error also exists in libscsi. See my pull request
> https://github.com/sahlberg/libiscsi/pull/146
>
> Cheers
> Stefan
>
>  block/iscsi.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/block/iscsi.c b/block/iscsi.c
> index 1fa855a..a2bd70a 100644
> --- a/block/iscsi.c
> +++ b/block/iscsi.c
> @@ -1326,7 +1326,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
>          goto out;
>      }
>  
> -    if (iscsi_url->user != NULL) {
> +    if (iscsi_url->user[0] != '\0') {
>          ret = iscsi_set_initiator_username_pwd(iscsi, iscsi_url->user,
>                                                iscsi_url->passwd);
>          if (ret != 0) {

Thanks for catching this. Luckily this call is before the parse_chap function. Otherwise
it would have been impossible to specify username and password via config file.

Reviewed-by: Peter Lieven <pl@kamp.de>
Acked-by: Peter Lieven <pl@kamp.de>