[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 26/39] sysemu/os-win32: Test for and use _lock_file/_unlock_fi
From: |
Richard Henderson |
Subject: |
[PATCH v3 26/39] sysemu/os-win32: Test for and use _lock_file/_unlock_file |
Date: |
Sun, 17 Apr 2022 11:30:06 -0700 |
The bug referenced in os-win32.h was fixed in mingw-w64 v6.
According to repology, version 5 used by ubuntu 18, which is
not yet out of support, so provide a meson link test for it.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
meson.build | 12 ++++++++++++
include/sysemu/os-win32.h | 16 +++++++++-------
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/meson.build b/meson.build
index 861de93c4f..1b8b65f171 100644
--- a/meson.build
+++ b/meson.build
@@ -2054,6 +2054,18 @@ foreach k, v: config_host
endif
endforeach
+# Older versions of MinGW do not import _lock_file and _unlock_file properly.
+# This was fixed for v6.0.0 with commit b48e3ac8969d.
+if targetos == 'windows'
+ config_host_data.set('HAVE__LOCK_FILE', cc.links('''
+ #include <stdio.h>
+ int main(void) {
+ _lock_file(NULL);
+ _unlock_file(NULL);
+ return 0;
+ }''', name: '_lock_file and _unlock_file'))
+endif
+
########################
# Target configuration #
########################
diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h
index 770752222a..649f417d39 100644
--- a/include/sysemu/os-win32.h
+++ b/include/sysemu/os-win32.h
@@ -113,20 +113,22 @@ static inline char *realpath(const char *path, char
*resolved_path)
return resolved_path;
}
-/* ??? Mingw appears to export _lock_file and _unlock_file as the functions
- * with which to lock a stdio handle. But something is wrong in the markup,
- * either in the header or the library, such that we get undefined references
- * to "_imp___lock_file" etc when linking. Since we seem to have no other
- * alternative, and the usage within the logging functions isn't critical,
- * ignore FILE locking.
+/*
+ * Older versions of MinGW do not import _lock_file and _unlock_file properly.
+ * This was fixed for v6.0.0 with commit b48e3ac8969d.
*/
-
static inline void qemu_flockfile(FILE *f)
{
+#ifdef HAVE__LOCK_FILE
+ _lock_file(f);
+#endif
}
static inline void qemu_funlockfile(FILE *f)
{
+#ifdef HAVE__LOCK_FILE
+ _unlock_file(f);
+#endif
}
/* We wrap all the sockets functions so that we can
--
2.25.1
- [PATCH v3 17/39] util/log: Drop return value from qemu_log, (continued)
- [PATCH v3 17/39] util/log: Drop return value from qemu_log, Richard Henderson, 2022/04/17
- [PATCH v3 25/39] include/qemu/log: Move entire implementation out-of-line, Richard Henderson, 2022/04/17
- [PATCH v3 27/39] util/log: Introduce qemu_set_log_filename_flags, Richard Henderson, 2022/04/17
- [PATCH v3 32/39] util/log: Rename logfilename to global_filename, Richard Henderson, 2022/04/17
- [PATCH v3 37/39] util/log: Rename QemuLogFile to RCUCloseFILE, Richard Henderson, 2022/04/17
- [PATCH v3 13/39] exec/log: Remove log_disas and log_target_disas, Richard Henderson, 2022/04/17
- [PATCH v3 07/39] util/log: Rename qemu_log_lock to qemu_log_trylock, Richard Henderson, 2022/04/17
- [PATCH v3 22/39] linux-user: Expand log_page_dump inline, Richard Henderson, 2022/04/17
- [PATCH v3 23/39] tests/unit: Do not reference QemuLogFile directly, Richard Henderson, 2022/04/17
- [PATCH v3 21/39] bsd-user: Expand log_page_dump inline, Richard Henderson, 2022/04/17
- [PATCH v3 26/39] sysemu/os-win32: Test for and use _lock_file/_unlock_file,
Richard Henderson <=
- [PATCH v3 19/39] util/log: Remove qemu_log_flush, Richard Henderson, 2022/04/17
- [PATCH v3 30/39] softmmu: Use qemu_set_log_filename_flags, Richard Henderson, 2022/04/17
- [PATCH v3 31/39] util/log: Remove qemu_log_close, Richard Henderson, 2022/04/17
- [PATCH v3 28/39] bsd-user: Use qemu_set_log_filename_flags, Richard Henderson, 2022/04/17
- [PATCH v3 02/39] target/hexagon: Remove qemu_set_log in hexagon_translate_init, Richard Henderson, 2022/04/17
- [PATCH v3 04/39] util/log: Pass Error pointer to qemu_set_log, Richard Henderson, 2022/04/17
- [PATCH v3 15/39] target/nios2: Remove log_cpu_state from reset, Richard Henderson, 2022/04/17
- [PATCH v3 24/39] include/exec/log: Do not reference QemuLogFile directly, Richard Henderson, 2022/04/17
- [PATCH v3 29/39] linux-user: Use qemu_set_log_filename_flags, Richard Henderson, 2022/04/17