The following changes since commit 7bc8f9734213b76e76631a483be13d6737c2adbc:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20191025' into staging (2019-10-25 13:12:16 +0100) are available in the Git repository at: git://github.com/vivier/qemu-m68k.git tags/q800-branch-pull-request for you to fetch changes up to f7d85525f14b99aaa7bf561c9f3cf11c85a080c9: BootLinuxConsoleTest: Test the Quadra 800 (2019-10-28 19:07:22 +0100) ---------------------------------------------------------------- Add Macintosh Quadra 800 machine in hw/m68k ---------------------------------------------------------------- Laurent Vivier (10): esp: move handle_ti_cmd() cleanup code to esp_do_dma(). esp: move get_cmd() post-DMA code to get_cmd_cb() esp: add pseudo-DMA as used by Macintosh dp8393x: manage big endian bus hw/m68k: add VIA support hw/m68k: implement ADB bus support for via hw/m68k: add Nubus support hw/m68k: add Nubus macfb video card hw/m68k: add a dummy SWIM floppy controller hw/m68k: define Macintosh Quadra 800 Philippe Mathieu-Daudé (1): BootLinuxConsoleTest: Test the Quadra 800 default-configs/m68k-softmmu.mak | 1 + hw/m68k/bootinfo.h | 114 +++ include/hw/block/swim.h | 76 ++ include/hw/display/macfb.h | 64 ++ include/hw/misc/mac_via.h | 115 +++ include/hw/nubus/mac-nubus-bridge.h | 24 + include/hw/nubus/nubus.h | 69 ++ include/hw/scsi/esp.h | 15 + arch_init.c | 4 + hw/block/swim.c | 489 +++++++++++++ hw/display/macfb.c | 477 ++++++++++++ hw/m68k/q800.c | 401 ++++++++++ hw/misc/mac_via.c | 964 +++++++++++++++++++++++++ hw/net/dp8393x.c | 88 ++- hw/nubus/mac-nubus-bridge.c | 45 ++ hw/nubus/nubus-bridge.c | 34 + hw/nubus/nubus-bus.c | 111 +++ hw/nubus/nubus-device.c | 215 ++++++ hw/scsi/esp.c | 336 ++++++++- vl.c | 3 +- MAINTAINERS | 14 + hw/Kconfig | 1 + hw/Makefile.objs | 1 + hw/block/Kconfig | 3 + hw/block/Makefile.objs | 1 + hw/display/Kconfig | 5 + hw/display/Makefile.objs | 1 + hw/m68k/Kconfig | 10 + hw/m68k/Makefile.objs | 1 + hw/misc/Kconfig | 5 + hw/misc/Makefile.objs | 1 + hw/nubus/Kconfig | 2 + hw/nubus/Makefile.objs | 4 + qemu-options.hx | 2 +- tests/acceptance/boot_linux_console.py | 24 + 35 files changed, 3659 insertions(+), 61 deletions(-) create mode 100644 hw/m68k/bootinfo.h create mode 100644 include/hw/block/swim.h create mode 100644 include/hw/display/macfb.h create mode 100644 include/hw/misc/mac_via.h create mode 100644 include/hw/nubus/mac-nubus-bridge.h create mode 100644 include/hw/nubus/nubus.h create mode 100644 hw/block/swim.c create mode 100644 hw/display/macfb.c create mode 100644 hw/m68k/q800.c create mode 100644 hw/misc/mac_via.c create mode 100644 hw/nubus/mac-nubus-bridge.c create mode 100644 hw/nubus/nubus-bridge.c create mode 100644 hw/nubus/nubus-bus.c create mode 100644 hw/nubus/nubus-device.c create mode 100644 hw/nubus/Kconfig create mode 100644 hw/nubus/Makefile.objs -- 2.21.0
