Fix some uninitialized variable warnings,
some memory leak warnings and update MAINTAINERS file. -----BEGIN PGP SIGNATURE----- iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAl4V/QMSHGxhdXJlbnRA dml2aWVyLmV1AAoJEPMMOL0/L748jsIP/iYNeDRLcur9XqW2j8MRGS6bhPFQv6jU INqEqxkVpdBykcE8IeqNpY8R8tFSvPdzUcYd7n5o752XQNrXXOzsBRT6J2VVLVPG /t6sx+yLD78WV/n4w5KWeXHwLv4ZdR7TuZP9slGygc6XiH1PerjCfh/ol3NkqFkI wk9zoCL95fMB3KEkmdUrQM1aX/ANlAQNBkgDKFLU+BPZJ7LaAh/4O96ONdNOtz1d nJ0TDQ0IaqtrclP1bODh9J72PT2dUFOZca7JfaDiIB0rvRpDyhPV6bjxkPi5Bfoc pVeF7Kc2H8wRqhgMDgqQioweQJWzrNWqpyYjQXznKldg2zdq3/ZqPVhPFi1hz81x XngPu8LoBCSZtgEdjiHoHFB56SWJ5MBSsQmBMIH/B3iaBaxVM8qFmv0VvpNU1fWx /x/5/DmLyQy334Aka5ZRqcat2tD8tAWzvppKzjIT+9QNXpr+n9Kdgkbkv39eJGoe 2eIxhuhXZDtcmC8lMd1jUoFnaJ5pv34mHgTq/RfHYmXftwPx5wERT8GFUU/bQPCR mRtbXEqVl6QPSXdlFKFAV5eIBcPHU7n618+rmXTQqOvTIxV8CzhTV3jByUSX66JW PF9U+p4IYG/SrWdYFJH16pcyIPqU87cO8qNd7+HWHiVJvNHc4Yr5nR9I7rL0nZ4Q SKkUYkqlfcs3 =An/0 -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging Fix some uninitialized variable warnings, some memory leak warnings and update MAINTAINERS file. # gpg: Signature made Wed 08 Jan 2020 16:02:11 GMT # gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C # gpg: issuer "laurent@vivier.eu" # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full] # gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full] # gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/vivier2/tags/trivial-branch-pull-request: vl: fix memory leak in configure_accelerators arm/translate-a64: fix uninitialized variable warning nbd: fix uninitialized variable warning util/module: fix a memory leak MAINTAINERS: Update Yuval Shaia's email address Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
abd5f8bb95
@ -2659,7 +2659,7 @@ F: tests/test-replication.c
|
|||||||
F: docs/block-replication.txt
|
F: docs/block-replication.txt
|
||||||
|
|
||||||
PVRDMA
|
PVRDMA
|
||||||
M: Yuval Shaia <yuval.shaia@oracle.com>
|
M: Yuval Shaia <yuval.shaia.ml@gmail.com>
|
||||||
M: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
|
M: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: hw/rdma/*
|
F: hw/rdma/*
|
||||||
|
10
nbd/server.c
10
nbd/server.c
@ -2384,20 +2384,12 @@ static coroutine_fn int nbd_handle_request(NBDClient *client,
|
|||||||
!client->export_meta.bitmap,
|
!client->export_meta.bitmap,
|
||||||
NBD_META_ID_BASE_ALLOCATION,
|
NBD_META_ID_BASE_ALLOCATION,
|
||||||
errp);
|
errp);
|
||||||
if (ret < 0) {
|
} else { /* client->export_meta.bitmap */
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (client->export_meta.bitmap) {
|
|
||||||
ret = nbd_co_send_bitmap(client, request->handle,
|
ret = nbd_co_send_bitmap(client, request->handle,
|
||||||
client->exp->export_bitmap,
|
client->exp->export_bitmap,
|
||||||
request->from, request->len,
|
request->from, request->len,
|
||||||
dont_fragment,
|
dont_fragment,
|
||||||
true, NBD_META_ID_DIRTY_BITMAP, errp);
|
true, NBD_META_ID_DIRTY_BITMAP, errp);
|
||||||
if (ret < 0) {
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -13585,6 +13585,8 @@ static void disas_crypto_three_reg_sha512(DisasContext *s, uint32_t insn)
|
|||||||
feature = dc_isar_feature(aa64_sha3, s);
|
feature = dc_isar_feature(aa64_sha3, s);
|
||||||
genfn = NULL;
|
genfn = NULL;
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
g_assert_not_reached();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
switch (opcode) {
|
switch (opcode) {
|
||||||
|
@ -214,6 +214,7 @@ bool module_load_one(const char *prefix, const char *lib_name)
|
|||||||
|
|
||||||
if (!success) {
|
if (!success) {
|
||||||
g_hash_table_remove(loaded_modules, module_name);
|
g_hash_table_remove(loaded_modules, module_name);
|
||||||
|
g_free(module_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < n_dirs; i++) {
|
for (i = 0; i < n_dirs; i++) {
|
||||||
|
1
vl.c
1
vl.c
@ -2788,6 +2788,7 @@ static void configure_accelerators(const char *progname)
|
|||||||
error_report("invalid accelerator %s", *tmp);
|
error_report("invalid accelerator %s", *tmp);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
g_strfreev(accel_list);
|
||||||
} else {
|
} else {
|
||||||
if (accel != NULL) {
|
if (accel != NULL) {
|
||||||
error_report("The -accel and \"-machine accel=\" options are incompatible");
|
error_report("The -accel and \"-machine accel=\" options are incompatible");
|
||||||
|
Loading…
Reference in New Issue
Block a user