diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2024-10-02 16:29:58 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2024-10-02 16:29:58 +0100 |
commit | a3500b22a18ec4195793037c0f45a47bd5a59e51 (patch) | |
tree | 25c26bdc61c46ab7c059fd3db8b2a50866f41c31 /include | |
parent | 062cfce8d4c077800d252b84c65da8a2dd03fd6f (diff) | |
parent | e5a007001824f9cde0db58cc960d4efcf1b93f27 (diff) | |
download | qemu-a3500b22a18ec4195793037c0f45a47bd5a59e51.zip qemu-a3500b22a18ec4195793037c0f45a47bd5a59e51.tar.gz qemu-a3500b22a18ec4195793037c0f45a47bd5a59e51.tar.bz2 |
Merge tag 'pull-request-2024-10-02' of https://gitlab.com/thuth/qemu into staging
* Fix mips64el in the CI
* Remove unused sh4eb target
* Add an additional EXECUTE TCG test for s390x
# -----BEGIN PGP SIGNATURE-----
#
# iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmb9QdARHHRodXRoQHJl
# ZGhhdC5jb20ACgkQLtnXdP5wLbWQsQ/+NyTWEdTVXYLKGjv17QE3s5irfH6pT6WB
# Ea5HOkiT7mAOJZEzHS38fUzgySFA24MOpeqqPK6Dyi6O/fpXKkJL+e1Km2qWvc66
# NCKsicj271+AWHOrT2KnWnk6zRnxJBpeV/c/ajJnyjTAOYc5ItBPeNlfDsj1+sNP
# UzQ3mTmiw6M9jDntvJCtC99NyBBZTuyFLp/5ZA/fXCJdmzVEHEOU/rjWuVIq1nDC
# zm3MxUZwheHAkJ5wk7O+T3Qsio5iGBCeWBeNsH6hy6KyAf7fhU3h5vn4zaVzKQPB
# 88I8BbPok5sIVB1ODseIZLiF4IWZt8cPV00SJVSNebyufJ6wsuEFLT+nbMcQy4K1
# hZMvqA2WY+MGyThF67iC8OtaeDksUBoYw6RM0cCGlRQ2fsR4QAahk8Cg1BIG6Hn7
# hYtKu68Rs+vrxH6lgjq9wWBrafl7MbROQxlTm8KsJJdHigQ4UUB23+OKKcJrePi+
# vQpFEWIEgLVrxUrnwyJPulqG5fVXNkOWYfu1Y/WARr7uNe4gf86UvBunQmSxlV3Y
# 4Q1iQlKaVznzyUe8QEvP8LpZRols0v5BT9zpF0TJwC/vk+SjuAtz4/URWvLn5Qwd
# zIhWp9ZUxHUJgCqiciNHAY1AzsG2CiSuihKgTbPBZo0b3oYMB7sMaDLq733M98k2
# lI6f5DjIyhg=
# =V9nZ
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 02 Oct 2024 13:51:28 BST
# 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-10-02' of https://gitlab.com/thuth/qemu:
tests/tcg/s390x: Test modifying an EXECUTE target
qemu-timer: Remove unused timer functions
Remove the unused sh4eb target
configs: Fix typo in the sh4-softmmu devices config file
testing: bump mips64el cross to bookworm and fix package list
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/qemu/timer.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/include/qemu/timer.h b/include/qemu/timer.h index fa56ec9..cc167bd 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -191,16 +191,6 @@ bool qemu_clock_use_for_deadline(QEMUClockType type); int64_t qemu_clock_deadline_ns_all(QEMUClockType type, int attr_mask); /** - * qemu_clock_get_main_loop_timerlist: - * @type: the clock type - * - * Return the default timer list associated with a clock. - * - * Returns: the default timer list - */ -QEMUTimerList *qemu_clock_get_main_loop_timerlist(QEMUClockType type); - -/** * qemu_clock_nofify: * @type: the clock type * @@ -327,17 +317,6 @@ bool timerlist_expired(QEMUTimerList *timer_list); int64_t timerlist_deadline_ns(QEMUTimerList *timer_list); /** - * timerlist_get_clock: - * @timer_list: the timer list to operate on - * - * Determine the clock type associated with a timer list. - * - * Returns: the clock type associated with the - * timer list. - */ -QEMUClockType timerlist_get_clock(QEMUTimerList *timer_list); - -/** * timerlist_run_timers: * @timer_list: the timer list to use * |