diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2020-09-23 11:56:46 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2020-09-23 16:07:44 +0100 |
| commit | d73415a315471ac0b127ed3fad45c8ec5d711de1 (patch) | |
| tree | bae20b3a39968fdfb4340b1a39b533333a8e6fd0 /monitor | |
| parent | ed7db34b5aedba4487fd949b2e545eef954f093e (diff) | |
qemu/atomic.h: rename atomic_ to qatomic_
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>
Diffstat (limited to 'monitor')
| -rw-r--r-- | monitor/hmp.c | 6 | ||||
| -rw-r--r-- | monitor/misc.c | 2 | ||||
| -rw-r--r-- | monitor/monitor.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/monitor/hmp.c b/monitor/hmp.c index d598dd02bb..4ecdefd705 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -1337,19 +1337,19 @@ static void monitor_event(void *opaque, QEMUChrEvent event) monitor_resume(mon); monitor_flush(mon); } else { - atomic_mb_set(&mon->suspend_cnt, 0); + qatomic_mb_set(&mon->suspend_cnt, 0); } break; case CHR_EVENT_MUX_OUT: if (mon->reset_seen) { - if (atomic_mb_read(&mon->suspend_cnt) == 0) { + if (qatomic_mb_read(&mon->suspend_cnt) == 0) { monitor_printf(mon, "\n"); } monitor_flush(mon); monitor_suspend(mon); } else { - atomic_inc(&mon->suspend_cnt); + qatomic_inc(&mon->suspend_cnt); } qemu_mutex_lock(&mon->mon_lock); mon->mux_out = 1; diff --git a/monitor/misc.c b/monitor/misc.c index 0b1b9b196c..262f2bd951 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -751,7 +751,7 @@ static uint64_t vtop(void *ptr, Error **errp) } /* Force copy-on-write if necessary. */ - atomic_add((uint8_t *)ptr, 0); + qatomic_add((uint8_t *)ptr, 0); if (pread(fd, &pinfo, sizeof(pinfo), offset) != sizeof(pinfo)) { error_setg_errno(errp, errno, "Cannot read pagemap"); diff --git a/monitor/monitor.c b/monitor/monitor.c index b385a3d569..0f32892ad4 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -449,7 +449,7 @@ int monitor_suspend(Monitor *mon) return -ENOTTY; } - atomic_inc(&mon->suspend_cnt); + qatomic_inc(&mon->suspend_cnt); if (mon->use_io_thread) { /* @@ -476,7 +476,7 @@ void monitor_resume(Monitor *mon) return; } - if (atomic_dec_fetch(&mon->suspend_cnt) == 0) { + if (qatomic_dec_fetch(&mon->suspend_cnt) == 0) { AioContext *ctx; if (mon->use_io_thread) { @@ -501,7 +501,7 @@ int monitor_can_read(void *opaque) { Monitor *mon = opaque; - return !atomic_mb_read(&mon->suspend_cnt); + return !qatomic_mb_read(&mon->suspend_cnt); } void monitor_list_append(Monitor *mon) |