qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] block/iscsi: drop obsolete pointers from iscsi_co_writev
@ 2014-06-18 16:40 Peter Lieven
  2014-06-23  8:06 ` Stefan Hajnoczi
  2014-06-23  8:13 ` Stefan Hajnoczi
  0 siblings, 2 replies; 3+ messages in thread
From: Peter Lieven @ 2014-06-18 16:40 UTC (permalink / raw)
  To: qemu-devel; +Cc: kwolf, pbonzini, Peter Lieven, stefanha

Signed-off-by: Peter Lieven <pl@kamp.de>
---
 block/iscsi.c |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/block/iscsi.c b/block/iscsi.c
index 327353c..84aa22a 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -359,8 +359,6 @@ static int coroutine_fn iscsi_co_writev(BlockDriverState *bs,
     struct IscsiTask iTask;
     uint64_t lba;
     uint32_t num_sectors;
-    uint8_t *data = NULL;
-    uint8_t *buf = NULL;
 
     if (!is_request_lun_aligned(sector_num, nb_sectors, iscsilun)) {
         return -EINVAL;
@@ -372,17 +370,16 @@ static int coroutine_fn iscsi_co_writev(BlockDriverState *bs,
 retry:
     if (iscsilun->use_16_for_rw) {
         iTask.task = iscsi_write16_task(iscsilun->iscsi, iscsilun->lun, lba,
-                                        data, num_sectors * iscsilun->block_size,
+                                        NULL, num_sectors * iscsilun->block_size,
                                         iscsilun->block_size, 0, 0, 0, 0, 0,
                                         iscsi_co_generic_cb, &iTask);
     } else {
         iTask.task = iscsi_write10_task(iscsilun->iscsi, iscsilun->lun, lba,
-                                        data, num_sectors * iscsilun->block_size,
+                                        NULL, num_sectors * iscsilun->block_size,
                                         iscsilun->block_size, 0, 0, 0, 0, 0,
                                         iscsi_co_generic_cb, &iTask);
     }
     if (iTask.task == NULL) {
-        g_free(buf);
         return -ENOMEM;
     }
     scsi_task_set_iov_out(iTask.task, (struct scsi_iovec *) iov->iov,
@@ -402,8 +399,6 @@ retry:
         goto retry;
     }
 
-    g_free(buf);
-
     if (iTask.status != SCSI_STATUS_GOOD) {
         return -EIO;
     }
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [Qemu-devel] [PATCH] block/iscsi: drop obsolete pointers from iscsi_co_writev
  2014-06-18 16:40 [Qemu-devel] [PATCH] block/iscsi: drop obsolete pointers from iscsi_co_writev Peter Lieven
@ 2014-06-23  8:06 ` Stefan Hajnoczi
  2014-06-23  8:13 ` Stefan Hajnoczi
  1 sibling, 0 replies; 3+ messages in thread
From: Stefan Hajnoczi @ 2014-06-23  8:06 UTC (permalink / raw)
  To: Peter Lieven; +Cc: kwolf, pbonzini, qemu-devel, stefanha

[-- Attachment #1: Type: text/plain, Size: 286 bytes --]

On Wed, Jun 18, 2014 at 06:40:22PM +0200, Peter Lieven wrote:
> Signed-off-by: Peter Lieven <pl@kamp.de>
> ---
>  block/iscsi.c |    9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [Qemu-devel] [PATCH] block/iscsi: drop obsolete pointers from iscsi_co_writev
  2014-06-18 16:40 [Qemu-devel] [PATCH] block/iscsi: drop obsolete pointers from iscsi_co_writev Peter Lieven
  2014-06-23  8:06 ` Stefan Hajnoczi
@ 2014-06-23  8:13 ` Stefan Hajnoczi
  1 sibling, 0 replies; 3+ messages in thread
From: Stefan Hajnoczi @ 2014-06-23  8:13 UTC (permalink / raw)
  To: Peter Lieven; +Cc: kwolf, pbonzini, qemu-devel, stefanha

[-- Attachment #1: Type: text/plain, Size: 254 bytes --]

On Wed, Jun 18, 2014 at 06:40:22PM +0200, Peter Lieven wrote:
> Signed-off-by: Peter Lieven <pl@kamp.de>
> ---
>  block/iscsi.c |    9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)

Nevermind, Paolo already applied this via the SCSI tree.

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-06-23  8:14 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-18 16:40 [Qemu-devel] [PATCH] block/iscsi: drop obsolete pointers from iscsi_co_writev Peter Lieven
2014-06-23  8:06 ` Stefan Hajnoczi
2014-06-23  8:13 ` Stefan Hajnoczi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).