mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-08-31 11:29:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

Browse Source 
* ASAN fixes

# gpg: Signature made Tue 12 Mar 2019 14:35:59 GMT
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# 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:
  test-migration: fix memory leak
  migration: fix memory leak
  test-bdrv-graph-mod: fix Error leak
  test-char: fix undefined behavior

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
2019-03-14 12:02:12 +00:00
parent dbbc277510 1e25879e6f
commit f6c63c0dbf
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
migration/socket.c
View File

@ -199,6 +199,7 @@ static void socket_start_incoming_migration(SocketAddress *saddr,
return; return;
} }
migrate_add_address(address); migrate_add_address(address);
qapi_free_SocketAddress(address);
} }
} }

3
tests/migration-test.c
View File

@ -382,9 +382,10 @@ static char *migrate_get_socket_address(QTestState *who, const char *parameter)
iv = qobject_input_visitor_new(object); iv = qobject_input_visitor_new(object);
visit_type_SocketAddressList(iv, NULL, &addrs, &local_err); visit_type_SocketAddressList(iv, NULL, &addrs, &local_err);
visit_free(iv);
/* we are only using a single address */ /* we are only using a single address */
result = g_strdup_printf("%s", SocketAddress_to_str(addrs->value)); result = SocketAddress_to_str(addrs->value);
qapi_free_SocketAddressList(addrs); qapi_free_SocketAddressList(addrs);
qobject_unref(rsp); qobject_unref(rsp);

1
tests/test-bdrv-graph-mod.c
View File

@ -114,6 +114,7 @@ static void test_update_perm_tree(void)
bdrv_append(filter, bs, &local_err); bdrv_append(filter, bs, &local_err);
g_assert_nonnull(local_err); g_assert_nonnull(local_err);
error_free(local_err);
bdrv_unref(bs); bdrv_unref(bs);
blk_unref(root); blk_unref(root);

2
tests/test-char.c
View File

@ -745,7 +745,7 @@ static void char_socket_server_test(gconstpointer opaque)
Visitor *v; Visitor *v;
QemuThread thread; QemuThread thread;
int ret; int ret;
bool reconnected; bool reconnected = false;
char *optstr; char *optstr;
QemuOpts *opts; QemuOpts *opts;