[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/61] oslib-posix: initialize mutex and condition variable
From: |
Paolo Bonzini |
Subject: |
[PULL 11/61] oslib-posix: initialize mutex and condition variable |
Date: |
Mon, 16 Mar 2020 22:26:38 +0100 |
The mutex and condition variable were never initialized, causing
-mem-prealloc to abort with an assertion failure.
Fixes: 037fb5eb3941c80a2b7c36a843e47207ddb004d4
Reported-by: Marc Hartmayer <address@hidden>
Cc: bauerchen <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
util/oslib-posix.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index 897e8f3..4dd6d7d 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -466,10 +466,17 @@ static inline int get_memset_num_threads(int smp_cpus)
static bool touch_all_pages(char *area, size_t hpagesize, size_t numpages,
int smp_cpus)
{
+ static gsize initialized = 0;
size_t numpages_per_thread, leftover;
char *addr = area;
int i = 0;
+ if (g_once_init_enter(&initialized)) {
+ qemu_mutex_init(&page_mutex);
+ qemu_cond_init(&page_cond);
+ g_once_init_leave(&initialized, 1);
+ }
+
memset_thread_failed = false;
threads_created_flag = false;
memset_num_threads = get_memset_num_threads(smp_cpus);
--
1.8.3.1
- [PULL 06/61] util: add util function buffer_zero_avx512(), (continued)
[PULL 11/61] oslib-posix: initialize mutex and condition variable,
Paolo Bonzini <=
[PULL 14/61] configure: Fix building with SASL on Windows, Paolo Bonzini, 2020/03/16
[PULL 13/61] modules: load modules from versioned /var/run dir, Paolo Bonzini, 2020/03/16
[PULL 16/61] memory: Fix start offset for bitmap log_clear hook, Paolo Bonzini, 2020/03/16
[PULL 12/61] build-sys: do not make qemu-ga link with pixman, Paolo Bonzini, 2020/03/16
[PULL 15/61] tests/docker: Install SASL library to extend code coverage on amd64, Paolo Bonzini, 2020/03/16
[PULL 19/61] ich9: Simplify ich9_lpc_initfn, Paolo Bonzini, 2020/03/16
[PULL 18/61] ich9: fix getter type for sci_int property, Paolo Bonzini, 2020/03/16
[PULL 17/61] qom/object: enable setter for uint types, Paolo Bonzini, 2020/03/16
[PULL 21/61] i386: Fix GCC warning with snprintf when HAX is enabled, Paolo Bonzini, 2020/03/16
[PULL 20/61] qom/object: Use common get/set uint helpers, Paolo Bonzini, 2020/03/16