diff options
| author | Peter Maydell | 2020-04-13 14:11:38 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-04-13 14:11:38 +0200 |
| commit | e33d61cc9aef14f21fbf16c0e3cf01d2e2965717 (patch) | |
| tree | e914ee8e1c0f759f38425d9fe096f1ef7267d093 /util | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20200412' into staging (diff) | |
| parent | module: increase dirs array size by one (diff) | |
| download | qemu-e33d61cc9aef14f21fbf16c0e3cf01d2e2965717.tar.gz qemu-e33d61cc9aef14f21fbf16c0e3cf01d2e2965717.tar.xz qemu-e33d61cc9aef14f21fbf16c0e3cf01d2e2965717.zip | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
Bugfixes, and reworking of the atomics documentation.
# gpg: Signature made Mon 13 Apr 2020 07:56:22 BST
# 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:
module: increase dirs array size by one
memory: Do not allow direct write access to rom_device regions
vl.c: error out if -mem-path is used together with -M memory-backend
rcu: do not mention atomic_mb_read/set in documentation
atomics: update documentation
atomics: convert to reStructuredText
oslib-posix: take lock before qemu_cond_broadcast
piix: fix xenfv regression, add compat machine xenfv-4.2
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util')
| -rw-r--r-- | util/module.c | 2 | ||||
| -rw-r--r-- | util/oslib-posix.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/util/module.c b/util/module.c index 5f7896870a..e48d9aacc0 100644 --- a/util/module.c +++ b/util/module.c @@ -177,7 +177,7 @@ bool module_load_one(const char *prefix, const char *lib_name) char *version_dir; #endif const char *search_dir; - char *dirs[4]; + char *dirs[5]; char *module_name; int i = 0, n_dirs = 0; int ret; diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 4dd6d7d4b4..062236a1ab 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -492,8 +492,11 @@ static bool touch_all_pages(char *area, size_t hpagesize, size_t numpages, QEMU_THREAD_JOINABLE); addr += memset_thread[i].numpages * hpagesize; } + + qemu_mutex_lock(&page_mutex); threads_created_flag = true; qemu_cond_broadcast(&page_cond); + qemu_mutex_unlock(&page_mutex); for (i = 0; i < memset_num_threads; i++) { qemu_thread_join(&memset_thread[i].pgthread); |