summaryrefslogtreecommitdiffstats
path: root/include/qemu/timer.h
diff options
context:
space:
mode:
authorPeter Maydell2021-04-10 17:58:56 +0200
committerPeter Maydell2021-04-10 17:58:56 +0200
commit555249a59e9cdd6b58da103aba5cf3a2d45c899f (patch)
treefb7fa2d4f6759c8b62cb3016b1b83f567f57d104 /include/qemu/timer.h
parentMerge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff)
parentcpu/core: Fix "help" of CPU core device types (diff)
downloadqemu-555249a59e9cdd6b58da103aba5cf3a2d45c899f.tar.gz
qemu-555249a59e9cdd6b58da103aba5cf3a2d45c899f.tar.xz
qemu-555249a59e9cdd6b58da103aba5cf3a2d45c899f.zip
Merge remote-tracking branch 'remotes/ehabkost-gl/tags/x86-next-pull-request' into staging
x86 and CPU bug fixes for 6.0-rc3 * Add missing features to EPYC-Rome CPU model (Babu Moger) * Fix crash with "-device ...-cpu-core,help" (Greg Kurz) # gpg: Signature made Fri 09 Apr 2021 21:20:18 BST # gpg: using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6 # gpg: issuer "ehabkost@redhat.com" # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full] # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost-gl/tags/x86-next-pull-request: cpu/core: Fix "help" of CPU core device types i386: Add missing cpu feature bits in EPYC-Rome model Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qemu/timer.h')
0 files changed, 0 insertions, 0 deletions