]> git.proxmox.com Git - mirror_qemu.git/commitdiff
iscsi: Fix check for username
authorStefan Weil <sw@weilnetz.de>
Sat, 7 Mar 2015 09:14:30 +0000 (10:14 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 10 Mar 2015 09:49:25 +0000 (10:49 +0100)
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]

Reviewed-by: Peter Lieven <pl@kamp.de>
Acked-by: Peter Lieven <pl@kamp.de>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Message-Id: <1425719670-5486-1-git-send-email-sw@weilnetz.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
block/iscsi.c

index 1fa855acdda3b3957a73345449df9dbf27d07575..3e34b1f3a240493a823a545fc455bd64f32ea975 100644 (file)
@@ -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) {