diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2023-06-10 07:22:26 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2023-06-10 07:22:26 -0700 |
| commit | 374db3c82189cc0bab9b628b64b0087ee2a0e318 (patch) | |
| tree | d684da6de857e8d4ba51f0ea91398d69e56bd609 /hw/core | |
| parent | 3673ad389622d9ef4d2743101253c642def7935a (diff) | |
| parent | e928907105cfeb48b68cedce232bbd4784536707 (diff) | |
| download | focaccia-qemu-374db3c82189cc0bab9b628b64b0087ee2a0e318.tar.gz focaccia-qemu-374db3c82189cc0bab9b628b64b0087ee2a0e318.zip | |
Merge tag 'trivial-patches-20230610' of https://gitlab.com/mjt0k/qemu into staging
trivial-patches-20230610
# -----BEGIN PGP SIGNATURE-----
#
# iQFDBAABCAAtFiEEe3O61ovnosKJMUsicBtPaxppPlkFAmSEG50PHG1qdEB0bHMu
# bXNrLnJ1AAoJEHAbT2saaT5ZKSEIAJ/KCuwY0LNFhJKwxT8a8VCdgW5efW4Ji1NR
# qZ4gv0BgI0VE0SlYgaorWxaeiQ6+pJnLInCAa5591OHIftCGM9iWl/SN0EhBehJR
# tKL7o0FzARCZdQgdQYr8k169ojogauoGl2SyB+BewlK7m+PexXat/XVHPIme6150
# YZZF0wKfnI2NhesRMuVzK8WbBSXeNH4bGCsBJaGC9ewaCXKvNjf8urZQ1RX4GAeN
# 1vyN1YDCc7PyBGzBa+1bREToF+3JB0eAedEk+GMkvl8aB+r0I9K9A9k0r8rvRHm/
# j0KV5JMiMF/ZTc+3AyRGkFETWNuZekjE3bf34NukA34m8x9e3HQ=
# =ME9P
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 09 Jun 2023 11:43:41 PM PDT
# gpg: using RSA key 7B73BAD68BE7A2C289314B22701B4F6B1A693E59
# gpg: issuer "mjt@tls.msk.ru"
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>" [unknown]
# gpg: aka "Michael Tokarev <mjt@debian.org>" [unknown]
# gpg: aka "Michael Tokarev <mjt@corpit.ru>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5
# Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931 4B22 701B 4F6B 1A69 3E59
* tag 'trivial-patches-20230610' of https://gitlab.com/mjt0k/qemu:
linux-user: elfload: Specify -R is an option for qemu-user binaries
linux-user: elfload: s/min_mmap_addr/mmap_min_addr/
vnc: move assert in vnc_worker_thread_loop
linux-user: Return EINVAL for getgroups() with negative gidsetsize
linux-user: add comments for TARGET_NR_[gs]etgroups{,32}
hw/usb/hcd-ehci-pci: Simplify using DEVICE_GET_CLASS() macro
hw/pci/pci: Simplify pci_bar_address() using MACHINE_GET_CLASS() macro
hw/i386/microvm: Simplify using object_dynamic_cast()
hw/core/cpu: Simplify realize() using MACHINE_GET_CLASS() macro
target/m68k/fpu_helper: Use FloatRelation enum to hold comparison result
meson: install keyboard maps only if necessary
block.c: add newline for "Detected format" warning
hw/remote: Fix vfu_cfg trace offset format
spelling: information
hw/virtio/virtio-qmp.c: spelling: suppoted
docs: Fix trivial typos in vhost-user.rst
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'hw/core')
| -rw-r--r-- | hw/core/cpu-common.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index f4e51c8a1b..ced66c2b34 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -196,8 +196,7 @@ static void cpu_common_realizefn(DeviceState *dev, Error **errp) * no need to check the ignore_memory_transaction_failures board flag. */ if (object_dynamic_cast(machine, TYPE_MACHINE)) { - ObjectClass *oc = object_get_class(machine); - MachineClass *mc = MACHINE_CLASS(oc); + MachineClass *mc = MACHINE_GET_CLASS(machine); if (mc) { cpu->ignore_memory_transaction_failures = |