diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2024-12-12 18:39:19 -0500 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2024-12-12 18:39:19 -0500 |
| commit | ed2db97e60fdc32441f22526a26bd66a6557674d (patch) | |
| tree | 15d0d7f01ac7cb98ffbe348f27cae3737fd239a1 /include/hw | |
| parent | a5ba0a7e4e150d1350a041f0d0ef9ca6c8d7c307 (diff) | |
| parent | f29c96d0f5760f72220623500ee659f1fc2d1542 (diff) | |
| download | qemu-ed2db97e60fdc32441f22526a26bd66a6557674d.zip qemu-ed2db97e60fdc32441f22526a26bd66a6557674d.tar.gz qemu-ed2db97e60fdc32441f22526a26bd66a6557674d.tar.bz2 | |
Merge tag 'pull-request-2024-12-11' of https://gitlab.com/thuth/qemu into staging
* Add compat machines for QEMU 10.0
* Add s390x CPU model for the gen17 mainframe
* Convert some more avocado tests to the new functional framework
* Some minor clean-ups for functional tests
# -----BEGIN PGP SIGNATURE-----
#
# iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmdZUu0RHHRodXRoQHJl
# ZGhhdC5jb20ACgkQLtnXdP5wLbVpzBAAo/xldyDvEBkQiHpw7YF5x6dipSdQmgbL
# 02Qq1p2A7LxGK7uv6HBtOwhxk2eB0F+o8ZNt79u6QJmrI7Anme40B6GRXKHpm+Nn
# 2zn6xzBKnKJSjI/mr3zNqQwCb+q68hL+0N9oNSlbl42uElnMNMr1elkW7W+YT70d
# w+P5UzV2AuvjC6ML1R6ULwJHdeoklAk87g7l3Ns5z8CPFCV3yMOzGHqgpYQdYl+U
# Cx0CT/xqkfoyustkbPSCUGDzZbLQLMHcCgGX9DVLUmP8I6U1MeZC3HIxYdI4ofX/
# ApFQ4ThMV5f0A6hnn2TRrP+74He6wjYkB3RUjXtchVizWm1FZhNNa//cWvoEmCFU
# ufwuAFNvTodli0/47GEmwu8t/jqXJ1SeC50VAPyzxpedJwkgaMAZiYAlDO/oxIY1
# BCNR5bDjf4pAzguHG4FnPxaOcb5UT+V+sukQMvxa03TGrTp2/U9sanCVVdGPOovI
# sf/nXsK6jYe1mvinLF9wTyAjjkXqboqfgRabQi2DRgP/FMKseGapy4fOOXzj5Flv
# 5FSdyzm4/3fnb2fl1cWSNqPCLwAtmPWx0weu7PBbhP7AwNEXbpJcHmjtJwxL5Slx
# c+qazS6lbeBphPlToEqhibOZAxMM6QYvFxhL8Ut36vyEBbO/LAjy9+od9/jb8QCd
# ijtWjauVpHc=
# =BG+s
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 11 Dec 2024 03:53:01 EST
# 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 <huth@tuxfamily.org>" [full]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* tag 'pull-request-2024-12-11' of https://gitlab.com/thuth/qemu: (26 commits)
tests/functional: remove pointless with statement
tests/functional: remove unused system imports
tests/functional: Convert the cubieboard avocado tests
tests/functional: Convert the smdkc210 avocado test
tests/functional: Convert the emcraft_sf2 avocado test
tests/functional: Convert the xlnx_versal_virt avocado test
MAINTAINERS: Cover the tests/functional/test_sh4eb_r2d.py file
tests/functional: Bump the timeout of the sh4_tuxrun test
s390x/cpumodel: gen17 model
s390x/cpumodel: Add PLO-extension facility
s390x/cpumodel: correct PLO feature wording
s390x/cpumodel: Add Sequential-Instruction-Fetching facility
s390x/cpumodel: add Ineffective-nonconstrained-transaction facility
s390x/cpumodel: add Vector-Packed-Decimal-Enhancement facility 3
s390x/cpumodel: add Miscellaneous-Instruction-Extensions Facility 4
s390x/cpumodel: add Vector Enhancements facility 3
s390x/cpumodel: add Concurrent-functions facility support
linux-headers: Update to Linux 6.13-rc1
s390x/cpumodel: Add ptff Query Time-Stamp Event (QTSE) support
s390x/cpumodel: add msa13 subfunctions
...
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/boards.h | 3 | ||||
| -rw-r--r-- | include/hw/i386/pc.h | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/hw/boards.h b/include/hw/boards.h index 36fbb9b..7456889 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -756,6 +756,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_9_2[]; +extern const size_t hw_compat_9_2_len; + extern GlobalProperty hw_compat_9_1[]; extern const size_t hw_compat_9_1_len; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 14ee062..1b26a41 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -215,6 +215,9 @@ void pc_system_parse_ovmf_flash(uint8_t *flash_ptr, size_t flash_size); /* sgx.c */ void pc_machine_init_sgx_epc(PCMachineState *pcms); +extern GlobalProperty pc_compat_9_2[]; +extern const size_t pc_compat_9_2_len; + extern GlobalProperty pc_compat_9_1[]; extern const size_t pc_compat_9_1_len; @@ -320,7 +323,7 @@ extern const size_t pc_compat_2_3_len; } \ type_init(pc_machine_init_##suffix) -#define DEFINE_PC_VER_MACHINE(namesym, namestr, initfn, ...) \ +#define DEFINE_PC_VER_MACHINE(namesym, namestr, initfn, isdefault, malias, ...) \ static void MACHINE_VER_SYM(init, namesym, __VA_ARGS__)( \ MachineState *machine) \ { \ @@ -334,6 +337,8 @@ extern const size_t pc_compat_2_3_len; MACHINE_VER_SYM(options, namesym, __VA_ARGS__)(mc); \ mc->init = MACHINE_VER_SYM(init, namesym, __VA_ARGS__); \ MACHINE_VER_DEPRECATION(__VA_ARGS__); \ + mc->is_default = isdefault; \ + mc->alias = malias; \ } \ static const TypeInfo MACHINE_VER_SYM(info, namesym, __VA_ARGS__) = \ { \ |