diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2024-05-10 09:41:35 +0200 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2024-05-10 09:41:35 +0200 |
| commit | dafec285bdbfe415ac6823abdc510e0b92c3f094 (patch) | |
| tree | b5cce7a3f5758c4954d7c1b66b2d3b9e9a0a3c9d /qapi | |
| parent | 937e2cb759589105fb73f796c11fe7ae80b0d66e (diff) | |
| parent | 0d497106a71a3b17b0228cb87922ef794296cb24 (diff) | |
| download | qemu-dafec285bdbfe415ac6823abdc510e0b92c3f094.zip qemu-dafec285bdbfe415ac6823abdc510e0b92c3f094.tar.gz qemu-dafec285bdbfe415ac6823abdc510e0b92c3f094.tar.bz2 | |
Merge tag 'pull-request-2024-05-10' of https://gitlab.com/thuth/qemu into staging
* Attach s390x sclpconsole to a proper parent in the QOM tree
* SCLP related clean-ups
* Report deprecated-props in cpu-model-expansion reply on s390x
* Deprecate "-runas" and introduce "-run-with user=..." instead
* Add some more qtest cases on LoongArch
# -----BEGIN PGP SIGNATURE-----
#
# iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmY9wHwRHHRodXRoQHJl
# ZGhhdC5jb20ACgkQLtnXdP5wLbUF+A/+JsraF7XOWv1eqW5/O+F5Id1a15CI15bQ
# +rUxW0H0wYxdg1i7jj4cB1dIBXgp59lTkpKUN7ftmnP54oxYQkdcJVCvclzAcwzh
# ZoMiIw3u88JEBZYpF4HcEaKawXxbTMU/ZGOAil1DSkdv+bwhISCS+aIo6ra2Nclg
# 2Zwzvb6DsHqcaYIqvrhbxr5VNhZ+o9AU0PEO67AbN6NKXAFCYlRf6Y9OlEveizZi
# 4bNnpa/YpA71dL418argAI0Wq78UPENjLeTVGap0DWGbufiiZ4M/Qov6czT0eYuG
# Us2CGJcimV9W+mR45g4xGIgaPmp7PFiobrOoTrAhbixxRA9FQWjamTsElcifktqE
# XiE8kYnTx052bY24ttgLOKYRV+whkw+luxtIZo5JPwNkM5S6rZiwY8EsAmd6fIxR
# aBlWPWQVO5JBc1Ol6MOWqZ/odpr6nQRe4gnL6tcCTFnpZwpyzaQiooNFES0a8KWJ
# MIsywMbIheMNI6m85rngdbKZ4lI1HTUnqLpfoDym3nlHtdx00ctq0O8RjJArfzt6
# aRltpbIAvbGgDyRMzJjezCiMbBSwIHyv4eheJVMi/SAuSevGtnfVNZjCw208Qir6
# sWEAWjavom/XnOFOtLwzkBdjBDiWHiPbLLLgRKcwZ7wbBgH4vhITwSz71fyKpo8n
# aTjjveXlUr0=
# =y1dS
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 10 May 2024 08:36:44 AM CEST
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full]
* tag 'pull-request-2024-05-10' of https://gitlab.com/thuth/qemu:
tests/qtest: Add some test cases support on LoongArch
qemu-options: Deprecate "-runas" and introduce "-run-with user=..." instead
target/s390x: flag te and cte as deprecated
target/s390x: report deprecated-props in cpu-model-expansion reply
s390x/sclp: Simplify get_sclp_device()
s390x/event-facility: Simplify sclp_get_event_facility_bus()
s390x: Introduce a SCLPDevice pointer under the machine
hw/s390x: Attach the sclpconsole to /machine/sclp/s390-sclp-event-facility
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/machine-target.json | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/qapi/machine-target.json b/qapi/machine-target.json index 29e695a..2942853 100644 --- a/qapi/machine-target.json +++ b/qapi/machine-target.json @@ -20,11 +20,16 @@ # # @props: a dictionary of QOM properties to be applied # +# @deprecated-props: a list of properties that are flagged as deprecated +# by the CPU vendor. These props are a subset of the full model's +# definition list of properties. (since 9.1) +# # Since: 2.8 ## { 'struct': 'CpuModelInfo', 'data': { 'name': 'str', - '*props': 'any' } } + '*props': 'any', + '*deprecated-props': ['str'] } } ## # @CpuModelExpansionType: |