diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-10-30 15:49:35 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-30 15:49:35 +0000 |
| commit | 9a2ea4f4a7230fe224dee91d9adf2ef872c3d226 (patch) | |
| tree | 37f70ac1318a1b355a07b3e53faf46b7304b5f46 /include/hw/qdev-core.h | |
| parent | c99fa56b95a72f6debd50a280561895d078ae020 (diff) | |
| parent | e83029fa605d6aa475be60b191f2af3954591093 (diff) | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.2-pull-request' into staging
Pull request trivial branch 20201027
# gpg: Signature made Tue 27 Oct 2020 16:29:47 GMT
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-branch-for-5.2-pull-request:
CHANGELOG: remove disused file
qdev: Fix two typos
scripts/qmp: delete 'qmp' script
cryptodev: Fix Lesser GPL version number
io: Fix Lesser GPL version number
cpus: Drop declaration of cpu_remove()
Makefile: Add *.[ch].inc files to cscope/ctags/TAGS
elf2dmp: Fix memory leak on main() error paths
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/qdev-core.h')
| -rw-r--r-- | include/hw/qdev-core.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index a653295d6f..5e737195b5 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -163,8 +163,8 @@ struct NamedClockList { /** * DeviceState: * @realized: Indicates whether the device has been fully constructed. - * When accessed outsize big qemu lock, must be accessed with - * atomic_load_acquire() + * When accessed outside big qemu lock, must be accessed with + * qatomic_load_acquire() * @reset: ResettableState for the device; handled by Resettable interface. * * This structure should not be accessed directly. We declare it here |