[libvirt] [PATCH 4/5]: Move the sendtarget command into the login command

[Chris Lalancette <clalance@xxxxxxxxxx>]

A small bugfix; we only need to call the iscsiadm sendtarget command when we are
first logging in; we don't need to do it for logout.  Move the sendtarget
command into the Login() function.

Changes since last time:
1)  Make const char *cmdsendtarget into const char *const cmdsendtarget based on
feedback from Jim.

Signed-off-by: Chris Lalancette <clalance@xxxxxxxxxx>

diff -urp libvirt.session/src/storage_backend_iscsi.c libvirt.sendtarget/src/storage_backend_iscsi.c
--- libvirt.session/src/storage_backend_iscsi.c	2008-06-16 14:33:13.000000000 +0200
+++ libvirt.sendtarget/src/storage_backend_iscsi.c	2008-06-16 14:35:34.000000000 +0200
@@ -158,14 +158,6 @@ virStorageBackendISCSIConnection(virConn
         "--targetname", pool->def->source.devices[0].path, action, NULL
     };
 
-    const char *cmdsendtarget[] = {
-        ISCSIADM, "--mode", "discovery", "--type", "sendtargets",
-        "--portal", portal, NULL
-    };
-
-    if (virRun(conn, (char **)cmdsendtarget, NULL) < 0)
-        return -1;
-
     if (virRun(conn, (char **)cmdargv, NULL) < 0)
         return -1;
 
@@ -403,6 +395,14 @@ virStorageBackendISCSILogin(virConnectPt
                             virStoragePoolObjPtr pool,
                             const char *portal)
 {
+    const char *const cmdsendtarget[] = {
+        ISCSIADM, "--mode", "discovery", "--type", "sendtargets",
+        "--portal", portal, NULL
+    };
+
+    if (virRun(conn, (char **)cmdsendtarget, NULL) < 0)
+        return -1;
+
     return virStorageBackendISCSIConnection(conn, pool, portal, "--login");
 }
 

--
Libvir-list mailing list
Libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list