diff options
author | Peter Maydell | 2021-03-17 11:38:27 +0100 |
---|---|---|
committer | Peter Maydell | 2021-03-17 11:38:27 +0100 |
commit | ff81439aafac58887b18032acd18a117f534cd75 (patch) | |
tree | 18ccbd7e017e2802715131284ea1177c6cc894b7 /block/preallocate.c | |
parent | Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-virtiofs-2021... (diff) | |
parent | m68k: add Virtual M68k Machine (diff) | |
download | qemu-ff81439aafac58887b18032acd18a117f534cd75.tar.gz qemu-ff81439aafac58887b18032acd18a117f534cd75.tar.xz qemu-ff81439aafac58887b18032acd18a117f534cd75.zip |
Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-6.0-pull-request' into staging
m68k pull request 20210315
Add m68k virt machine
# gpg: Signature made Mon 15 Mar 2021 20:41:51 GMT
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier/tags/m68k-for-6.0-pull-request:
m68k: add Virtual M68k Machine
m68k: add a system controller
m68k: add an interrupt controller
hw/intc: add goldfish-pic
hw/char: add goldfish-tty
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/preallocate.c')
0 files changed, 0 insertions, 0 deletions