d73415a315
clang's C11 atomic_fetch_*() functions only take a C11 atomic type
pointer argument. QEMU uses direct types (int, etc) and this causes a
compiler error when a QEMU code calls these functions in a source file
that also included <stdatomic.h> via a system header file:
$ CC=clang CXX=clang++ ./configure ... && make
../util/async.c:79:17: error: address argument to atomic operation must be a pointer to _Atomic type ('unsigned int *' invalid)
Avoid using atomic_*() names in QEMU's atomic.h since that namespace is
used by <stdatomic.h>. Prefix QEMU's APIs with 'q' so that atomic.h
and <stdatomic.h> can co-exist. I checked /usr/include on my machine and
searched GitHub for existing "qatomic_" users but there seem to be none.
This patch was generated using:
$ git grep -h -o '\<atomic\(64\)\?_[a-z0-9_]\+' include/qemu/atomic.h | \
sort -u >/tmp/changed_identifiers
$ for identifier in $(</tmp/changed_identifiers); do
sed -i "s%\<$identifier\>%q$identifier%g" \
$(git grep -I -l "\<$identifier\>")
done
I manually fixed line-wrap issues and misaligned rST tables.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200923105646.47864-1-stefanha@redhat.com>
85 lines
1.9 KiB
C
85 lines
1.9 KiB
C
#ifndef QEMU_EXEC_LOG_H
|
|
#define QEMU_EXEC_LOG_H
|
|
|
|
#include "qemu/log.h"
|
|
#include "hw/core/cpu.h"
|
|
#include "disas/disas.h"
|
|
|
|
/* cpu_dump_state() logging functions: */
|
|
/**
|
|
* log_cpu_state:
|
|
* @cpu: The CPU whose state is to be logged.
|
|
* @flags: Flags what to log.
|
|
*
|
|
* Logs the output of cpu_dump_state().
|
|
*/
|
|
static inline void log_cpu_state(CPUState *cpu, int flags)
|
|
{
|
|
QemuLogFile *logfile;
|
|
|
|
if (qemu_log_enabled()) {
|
|
rcu_read_lock();
|
|
logfile = qatomic_rcu_read(&qemu_logfile);
|
|
if (logfile) {
|
|
cpu_dump_state(cpu, logfile->fd, flags);
|
|
}
|
|
rcu_read_unlock();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* log_cpu_state_mask:
|
|
* @mask: Mask when to log.
|
|
* @cpu: The CPU whose state is to be logged.
|
|
* @flags: Flags what to log.
|
|
*
|
|
* Logs the output of cpu_dump_state() if loglevel includes @mask.
|
|
*/
|
|
static inline void log_cpu_state_mask(int mask, CPUState *cpu, int flags)
|
|
{
|
|
if (qemu_loglevel & mask) {
|
|
log_cpu_state(cpu, flags);
|
|
}
|
|
}
|
|
|
|
#ifdef NEED_CPU_H
|
|
/* disas() and target_disas() to qemu_logfile: */
|
|
static inline void log_target_disas(CPUState *cpu, target_ulong start,
|
|
target_ulong len)
|
|
{
|
|
QemuLogFile *logfile;
|
|
rcu_read_lock();
|
|
logfile = qatomic_rcu_read(&qemu_logfile);
|
|
if (logfile) {
|
|
target_disas(logfile->fd, cpu, start, len);
|
|
}
|
|
rcu_read_unlock();
|
|
}
|
|
|
|
static inline void log_disas(void *code, unsigned long size, const char *note)
|
|
{
|
|
QemuLogFile *logfile;
|
|
rcu_read_lock();
|
|
logfile = qatomic_rcu_read(&qemu_logfile);
|
|
if (logfile) {
|
|
disas(logfile->fd, code, size, note);
|
|
}
|
|
rcu_read_unlock();
|
|
}
|
|
|
|
#if defined(CONFIG_USER_ONLY)
|
|
/* page_dump() output to the log file: */
|
|
static inline void log_page_dump(const char *operation)
|
|
{
|
|
FILE *logfile = qemu_log_lock();
|
|
if (logfile) {
|
|
qemu_log("page layout changed following %s\n", operation);
|
|
page_dump(logfile);
|
|
}
|
|
qemu_log_unlock(logfile);
|
|
}
|
|
#endif
|
|
#endif
|
|
|
|
#endif
|