aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2021-07-11 18:49:25 +0100
committerPeter Maydell <peter.maydell@linaro.org>2021-07-11 18:49:25 +0100
commit86108e23d798bcd3fce35ad271b198f8a8611746 (patch)
tree6309ee9f735760ddb608294008bb41837dfdf5f2 /util
parent9516034d05a8c71ef157a59f525e4c4f7ed79827 (diff)
parente28ffe90fde5702aa8716ac2fa1b4116cdcc9e61 (diff)
downloadqemu-86108e23d798bcd3fce35ad271b198f8a8611746.zip
qemu-86108e23d798bcd3fce35ad271b198f8a8611746.tar.gz
qemu-86108e23d798bcd3fce35ad271b198f8a8611746.tar.bz2
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-6.1-pull-request' into staging
Trivial patches pull request 20210709 # gpg: Signature made Fri 09 Jul 2021 21:26:52 BST # 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-for-6.1-pull-request: util/guest-random: Fix size arg to tail memcpy migration: fix typo in mig_throttle_guest_down comment target/xtensa/xtensa-semi: Fix compilation problem on Haiku hw/virtio: Document *_should_notify() are called within rcu_read_lock() misc: Remove redundant new line in perror() virtiofsd: Add missing newline in error message misc: Fix "havn't" typo memory: Display MemoryRegion name in read/write ops trace events qemu-option: Drop dead assertion Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util')
-rw-r--r--util/guest-random.c2
-rw-r--r--util/qemu-option.c2
2 files changed, 1 insertions, 3 deletions
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;
}
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)) {