From: Peter Maydell Date: Tue, 29 Oct 2019 16:27:48 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/vivier/tags/q800-branch-pull-request' into... X-Git-Tag: v4.2.0-rc0~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f724de8dde4cc8d8159e4811714aeca222d9eb70;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/vivier/tags/q800-branch-pull-request' into staging Add Macintosh Quadra 800 machine in hw/m68k # gpg: Signature made Mon 28 Oct 2019 18:14:25 GMT # gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C # gpg: issuer "laurent@vivier.eu" # gpg: Good signature from "Laurent Vivier " [full] # gpg: aka "Laurent Vivier " [full] # gpg: aka "Laurent Vivier (Red Hat) " [full] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/vivier/tags/q800-branch-pull-request: BootLinuxConsoleTest: Test the Quadra 800 hw/m68k: define Macintosh Quadra 800 hw/m68k: add a dummy SWIM floppy controller hw/m68k: add Nubus macfb video card hw/m68k: add Nubus support hw/m68k: implement ADB bus support for via hw/m68k: add VIA support dp8393x: manage big endian bus esp: add pseudo-DMA as used by Macintosh esp: move get_cmd() post-DMA code to get_cmd_cb() esp: move handle_ti_cmd() cleanup code to esp_do_dma(). Signed-off-by: Peter Maydell --- f724de8dde4cc8d8159e4811714aeca222d9eb70