summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJeff Cody <jcody@redhat.com>2014-02-04 14:12:44 -0500
committerStefan Hajnoczi <stefanha@redhat.com>2014-02-14 13:38:35 +0100
commit28f106afb35a86aa01e1907ef7632e015fabce02 (patch)
tree13ea4f9bc744c6f078889fc34ff42c888afc9740
parentee13ed1cbc5f7f848e417f587c93ca1f36d83eb0 (diff)
downloadfocaccia-qemu-28f106afb35a86aa01e1907ef7632e015fabce02.tar.gz
focaccia-qemu-28f106afb35a86aa01e1907ef7632e015fabce02.zip
block: Add notes to iSCSI's .bdrv_open and .bdrv_reopen_prepare
iSCSI currently does not need to do any actions to support the
current usage of bdrv_reopen().  However, it is important to note
a couple of things: 1.) A connection will not be re-established to
an iSCSI target, and 2.) If iscsi_open() is changed to parse 'flags',
then iscsi_reopen_prepare() may need to be more than a stub.

In light of the above, this commit adds comments above both of the
functions to bring attention to these facts.

Signed-off-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r--block/iscsi.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/block/iscsi.c b/block/iscsi.c
index 8d0f9667c5..c97c04060d 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -1099,6 +1099,10 @@ fail:
 /*
  * We support iscsi url's on the form
  * iscsi://[<username>%<password>@]<host>[:<port>]/<targetname>/<lun>
+ *
+ * Note: flags are currently not used by iscsi_open.  If this function
+ * is changed such that flags are used, please examine iscsi_reopen_prepare()
+ * to see if needs to be changed as well.
  */
 static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
                       Error **errp)
@@ -1336,11 +1340,13 @@ static int iscsi_refresh_limits(BlockDriverState *bs)
     return 0;
 }
 
-/* We have nothing to do for iSCSI reopen, stub just returns
- * success */
+/* Since iscsi_open() ignores bdrv_flags, there is nothing to do here in
+ * prepare.  Note that this will not re-establish a connection with an iSCSI
+ * target - it is effectively a NOP.  */
 static int iscsi_reopen_prepare(BDRVReopenState *state,
                                 BlockReopenQueue *queue, Error **errp)
 {
+    /* NOP */
     return 0;
 }