From b9afaba891458d3e1f3f853a8cb6880498ed34e3 Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Mon, 27 Mar 2017 17:50:05 +0100 Subject: iscsi: drop unused IscsiAIOCB.qiov field The IscsiAIOCB.qiov field has been unused since commit 063c3378a9e3c25cc0afac3c72e4823d0621e352 ("block/iscsi: introduce bdrv_co_{readv, writev, flush_to_disk}") back in 2013. Signed-off-by: Stefan Hajnoczi Message-Id: <20170327165005.22038-1-stefanha@redhat.com> Reviewed-by: Eric Blake Signed-off-by: Paolo Bonzini --- block/iscsi.c | 1 - 1 file changed, 1 deletion(-) (limited to 'block') diff --git a/block/iscsi.c b/block/iscsi.c index 75d890538e..716e74abba 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -103,7 +103,6 @@ typedef struct IscsiTask { typedef struct IscsiAIOCB { BlockAIOCB common; - QEMUIOVector *qiov; QEMUBH *bh; IscsiLun *iscsilun; struct scsi_task *task; -- cgit v1.2.3 From cc1e13913916f755fd2dc5041b8d4bf25d3ea88e Mon Sep 17 00:00:00 2001 From: yaolujing Date: Sat, 1 Apr 2017 08:15:09 +0800 Subject: nbd: fix memory leak on socket_connect failed When TCP connection fails between nbd server and client, the local var, sioc, memory leak. This patch fixes the memory leak. Signed-off-by: yaolujing Reviewed-by: Eric Blake Message-Id: <1491005709-29989-1-git-send-email-yaolujing@huawei.com> Signed-off-by: Paolo Bonzini --- block/nbd.c | 1 + 1 file changed, 1 insertion(+) (limited to 'block') diff --git a/block/nbd.c b/block/nbd.c index 1b832c2132..3150712f0c 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -311,6 +311,7 @@ static QIOChannelSocket *nbd_establish_connection(SocketAddress *saddr, saddr, &local_err); if (local_err) { + object_unref(OBJECT(sioc)); error_propagate(errp, local_err); return NULL; } -- cgit v1.2.3