diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-04-04 11:40:55 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-04-04 11:40:55 +0100 |
| commit | 87cc4c61020addea6a001b94b662596b1896d1b3 (patch) | |
| tree | eceec77ab6e5df3c37f8b86097ec5888762ff1a9 /block | |
| parent | d9123d09f711bf1b855de2b5a907d4c85f46d6c3 (diff) | |
| parent | ecbddbb106114f90008024b4e6c3ba1c38d7ca0e (diff) | |
| download | qemu-87cc4c61020addea6a001b94b662596b1896d1b3.zip | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* MemoryRegionCache revert
* glib optimization workaround
* fix "info lapic" segfault on isapc
* fix QIOChannel memory leak
# gpg: Signature made Mon 03 Apr 2017 18:17:00 BST
# gpg: using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream:
main-loop: Acquire main_context lock around os_host_main_loop_wait.
exec: revert MemoryRegionCache
nbd: fix memory leak on socket_connect failed
ipmi: Fix macro issues
target-i386: fix "info lapic" segfault on isapc
iscsi: drop unused IscsiAIOCB.qiov field
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/iscsi.c | 1 | ||||
| -rw-r--r-- | block/nbd.c | 1 |
2 files changed, 1 insertions, 1 deletions
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; diff --git a/block/nbd.c b/block/nbd.c index 8bb29a90bb..814ab26dce 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -322,6 +322,7 @@ static QIOChannelSocket *nbd_establish_connection(SocketAddressFlat *saddr_flat, &local_err); qapi_free_SocketAddress(saddr); if (local_err) { + object_unref(OBJECT(sioc)); error_propagate(errp, local_err); return NULL; } |