diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/async.c | 2 | ||||
| -rw-r--r-- | util/log.c | 2 | ||||
| -rw-r--r-- | util/main-loop.c | 4 | ||||
| -rw-r--r-- | util/oslib-posix.c | 2 | ||||
| -rw-r--r-- | util/qemu-thread-posix.c | 1 | ||||
| -rw-r--r-- | util/qemu-timer.c | 8 |
6 files changed, 11 insertions, 8 deletions
diff --git a/util/async.c b/util/async.c index 99db28389f..0fe2943609 100644 --- a/util/async.c +++ b/util/async.c @@ -35,7 +35,7 @@ #include "block/raw-aio.h" #include "qemu/coroutine_int.h" #include "qemu/coroutine-tls.h" -#include "sysemu/cpu-timers.h" +#include "system/cpu-timers.h" #include "trace.h" /***********************************************************/ diff --git a/util/log.c b/util/log.c index 6219819855..b87d399e4c 100644 --- a/util/log.c +++ b/util/log.c @@ -503,6 +503,8 @@ const QEMULogItem qemu_log_items[] = { "open a separate log file per thread; filename must contain '%d'" }, { CPU_LOG_TB_VPU, "vpu", "include VPU registers in the 'cpu' logging" }, + { LOG_INVALID_MEM, "invalid_mem", + "log invalid memory accesses" }, { 0, NULL, NULL }, }; diff --git a/util/main-loop.c b/util/main-loop.c index a0386cfeb6..acad8c2e6c 100644 --- a/util/main-loop.c +++ b/util/main-loop.c @@ -26,8 +26,8 @@ #include "qapi/error.h" #include "qemu/cutils.h" #include "qemu/timer.h" -#include "sysemu/cpu-timers.h" -#include "sysemu/replay.h" +#include "system/cpu-timers.h" +#include "system/replay.h" #include "qemu/main-loop.h" #include "block/aio.h" #include "block/thread-pool.h" diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 11b35e48fb..7a542cb50b 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -31,7 +31,7 @@ #include <glib/gprintf.h> -#include "sysemu/sysemu.h" +#include "system/system.h" #include "trace.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/util/qemu-thread-posix.c b/util/qemu-thread-posix.c index b2e26e2120..6fff4162ac 100644 --- a/util/qemu-thread-posix.c +++ b/util/qemu-thread-posix.c @@ -17,6 +17,7 @@ #include "qemu-thread-common.h" #include "qemu/tsan.h" #include "qemu/bitmap.h" +#include "qemu/clang-tsa.h" #ifdef CONFIG_PTHREAD_SET_NAME_NP #include <pthread_np.h> diff --git a/util/qemu-timer.c b/util/qemu-timer.c index ffe9a3c5c1..0e8a453eaa 100644 --- a/util/qemu-timer.c +++ b/util/qemu-timer.c @@ -26,9 +26,9 @@ #include "qemu/main-loop.h" #include "qemu/timer.h" #include "qemu/lockable.h" -#include "sysemu/cpu-timers.h" -#include "sysemu/replay.h" -#include "sysemu/cpus.h" +#include "system/cpu-timers.h" +#include "system/replay.h" +#include "system/cpus.h" #ifdef CONFIG_POSIX #include <pthread.h> @@ -680,7 +680,7 @@ int64_t qemu_clock_advance_virtual_time(int64_t dest) aio_context = qemu_get_aio_context(); deadline = qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL, - QEMU_TIMER_ATTR_ALL); + QEMU_TIMER_ATTR_ALL); /* * A deadline of < 0 indicates this timer is not enabled, so we * won't get far trying to run it forward. |