diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-09-24 18:48:45 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-09-24 18:48:45 +0100 |
| commit | 8c1c07929feae876202ba26f07a540c5115c18cd (patch) | |
| tree | 20f6c8e2ac556bfb3c88a98c0d0cb2689de0263e /target/i386 | |
| parent | 1bd5556f6686365e76f7ff67fe67260c449e8345 (diff) | |
| parent | d73415a315471ac0b127ed3fad45c8ec5d711de1 (diff) | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request
This includes the atomic_ -> qatomic_ rename that touches many files and is
prone to conflicts.
# gpg: Signature made Wed 23 Sep 2020 17:08:43 BST
# gpg: using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
qemu/atomic.h: rename atomic_ to qatomic_
tests: add test-fdmon-epoll
fdmon-poll: reset npfd when upgrading to fdmon-epoll
gitmodules: add qemu.org vbootrom submodule
gitmodules: switch to qemu.org meson mirror
gitmodules: switch to qemu.org qboot mirror
docs/system: clarify deprecation schedule
virtio-crypto: don't modify elem->in/out_sg
virtio-blk: undo destructive iov_discard_*() operations
util/iov: add iov_discard_undo()
virtio: add vhost-user-fs-ccw device
libvhost-user: handle endianness as mandated by the spec
MAINTAINERS: add Stefan Hajnoczi as block/nvme.c maintainer
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/i386')
| -rw-r--r-- | target/i386/mem_helper.c | 2 | ||||
| -rw-r--r-- | target/i386/whpx-all.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/i386/mem_helper.c b/target/i386/mem_helper.c index acf41f8885..3a6d3ae2ef 100644 --- a/target/i386/mem_helper.c +++ b/target/i386/mem_helper.c @@ -68,7 +68,7 @@ void helper_cmpxchg8b(CPUX86State *env, target_ulong a0) uint64_t *haddr = g2h(a0); cmpv = cpu_to_le64(cmpv); newv = cpu_to_le64(newv); - oldv = atomic_cmpxchg__nocheck(haddr, cmpv, newv); + oldv = qatomic_cmpxchg__nocheck(haddr, cmpv, newv); oldv = le64_to_cpu(oldv); } #else diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c index c78baac6df..5a0f337a4c 100644 --- a/target/i386/whpx-all.c +++ b/target/i386/whpx-all.c @@ -946,7 +946,7 @@ static int whpx_vcpu_run(CPUState *cpu) whpx_vcpu_process_async_events(cpu); if (cpu->halted) { cpu->exception_index = EXCP_HLT; - atomic_set(&cpu->exit_request, false); + qatomic_set(&cpu->exit_request, false); return 0; } @@ -961,7 +961,7 @@ static int whpx_vcpu_run(CPUState *cpu) whpx_vcpu_pre_run(cpu); - if (atomic_read(&cpu->exit_request)) { + if (qatomic_read(&cpu->exit_request)) { whpx_vcpu_kick(cpu); } @@ -1113,7 +1113,7 @@ static int whpx_vcpu_run(CPUState *cpu) qemu_mutex_lock_iothread(); current_cpu = cpu; - atomic_set(&cpu->exit_request, false); + qatomic_set(&cpu->exit_request, false); return ret < 0; } |