From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 4 Apr 2017 10:40:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
X-Git-Tag: v2.9.0-rc3~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87cc4c61020addea6a001b94b662596b1896d1b3;p=thirdparty%2Fqemu.git

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>
---

87cc4c61020addea6a001b94b662596b1896d1b3
diff --cc block/nbd.c
index 8bb29a90bb5,3150712f0c9..814ab26dcee
--- a/block/nbd.c
+++ b/block/nbd.c
@@@ -320,8 -310,8 +320,9 @@@ static QIOChannelSocket *nbd_establish_
      qio_channel_socket_connect_sync(sioc,
                                      saddr,
                                      &local_err);
 +    qapi_free_SocketAddress(saddr);
      if (local_err) {
+         object_unref(OBJECT(sioc));
          error_propagate(errp, local_err);
          return NULL;
      }