From 0849cb547844b7205af01455b82dc54956c978a9 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 10 Jun 2021 10:50:26 +0200 Subject: qemu-option: Drop dead assertion Commit c6ecec43b2 "qemu-option: Check return value instead of @err where convenient" simplified opts = qemu_opts_create(list, qdict_get_try_str(qdict, "id"), 1, &local_err); if (local_err) { error_propagate(errp, local_err); return NULL; } to opts = qemu_opts_create(list, qdict_get_try_str(qdict, "id"), 1, errp); if (!opts) { return NULL; } but neglected to delete assert(opts != NULL); Do that now. Signed-off-by: Markus Armbruster Reviewed-by: Thomas Huth Message-Id: <20210610085026.436081-1-armbru@redhat.com> Signed-off-by: Laurent Vivier --- util/qemu-option.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'util') diff --git a/util/qemu-option.c b/util/qemu-option.c index ee78e42..61cb4a9 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -997,8 +997,6 @@ QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, const QDict *qdict, return NULL; } - assert(opts != NULL); - for (entry = qdict_first(qdict); entry; entry = qdict_next(qdict, entry)) { -- cgit v1.1 From e28ffe90fde5702aa8716ac2fa1b4116cdcc9e61 Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Fri, 9 Jul 2021 07:06:00 -0500 Subject: util/guest-random: Fix size arg to tail memcpy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We know that in the body of this if statement i is less than len, so we really should be copying len - i bytes not i - len bytes. Fix this typo. Fixes: 8d8404f1564 ("util: Add qemu_guest_getrandom and associated routines") Signed-off-by: Mark Nelson Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210709120600.11080-1-mdnelson8@gmail.com> Signed-off-by: Laurent Vivier --- util/guest-random.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util') diff --git a/util/guest-random.c b/util/guest-random.c index 086115b..23643f8 100644 --- a/util/guest-random.c +++ b/util/guest-random.c @@ -38,7 +38,7 @@ static int glib_random_bytes(void *buf, size_t len) } if (i < len) { x = g_rand_int(rand); - __builtin_memcpy(buf + i, &x, i - len); + __builtin_memcpy(buf + i, &x, len - i); } return 0; } -- cgit v1.1