diff options
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | nbd/server.c | 10 | ||||
| -rw-r--r-- | target/arm/translate-a64.c | 2 | ||||
| -rw-r--r-- | util/module.c | 1 | ||||
| -rw-r--r-- | vl.c | 1 |
5 files changed, 6 insertions, 10 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cd2dc137a3..df0893cd4c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2659,7 +2659,7 @@ F: tests/test-replication.c F: docs/block-replication.txt PVRDMA -M: Yuval Shaia <yuval.shaia@oracle.com> +M: Yuval Shaia <yuval.shaia.ml@gmail.com> M: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> S: Maintained F: hw/rdma/* diff --git a/nbd/server.c b/nbd/server.c index 24ebc1a805..87fcd2e7bf 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -2384,20 +2384,12 @@ static coroutine_fn int nbd_handle_request(NBDClient *client, !client->export_meta.bitmap, NBD_META_ID_BASE_ALLOCATION, errp); - if (ret < 0) { - return ret; - } - } - - if (client->export_meta.bitmap) { + } else { /* client->export_meta.bitmap */ ret = nbd_co_send_bitmap(client, request->handle, client->exp->export_bitmap, request->from, request->len, dont_fragment, true, NBD_META_ID_DIRTY_BITMAP, errp); - if (ret < 0) { - return ret; - } } return ret; diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 972c28c3c9..8c18cdff87 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -13585,6 +13585,8 @@ static void disas_crypto_three_reg_sha512(DisasContext *s, uint32_t insn) feature = dc_isar_feature(aa64_sha3, s); genfn = NULL; break; + default: + g_assert_not_reached(); } } else { switch (opcode) { diff --git a/util/module.c b/util/module.c index e9fe3e5422..8c5315a7a3 100644 --- a/util/module.c +++ b/util/module.c @@ -214,6 +214,7 @@ bool module_load_one(const char *prefix, const char *lib_name) if (!success) { g_hash_table_remove(loaded_modules, module_name); + g_free(module_name); } for (i = 0; i < n_dirs; i++) { @@ -2788,6 +2788,7 @@ static void configure_accelerators(const char *progname) error_report("invalid accelerator %s", *tmp); } } + g_strfreev(accel_list); } else { if (accel != NULL) { error_report("The -accel and \"-machine accel=\" options are incompatible"); |