| Message ID | 6811045539cc2d35ceff331326220aba2af9e670.1391541004.git.jcody@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Feb 04, 2014 at 02:12:44PM -0500, Jeff Cody wrote: > 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> > --- > block/iscsi.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) Thanks, applied to my block tree: https://github.com/stefanha/qemu/commits/block Stefan
diff --git a/block/iscsi.c b/block/iscsi.c index 6f4af72..cb0ac69 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) @@ -1337,11 +1341,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; }
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> --- block/iscsi.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)