diff mbox series

[RFC,09/13] hw/m68k: define Macintosh Quadra 800

Message ID 20180608200558.386-10-laurent@vivier.eu
State New
Headers show
Series hw/m68k: add Apple Machintosh Quadra 800 machine | expand

Commit Message

Laurent Vivier June 8, 2018, 8:05 p.m. UTC 
From: Laurent Vivier <Laurent@Vivier.EU>

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 default-configs/m68k-softmmu.mak |  12 ++
 hw/display/macfb.c               |  31 ++--
 hw/m68k/Makefile.objs            |   6 +-
 hw/m68k/bootinfo.h               |  99 ++++++++++
 hw/m68k/mac.c                    | 384 +++++++++++++++++++++++++++++++++++++++
 hw/nubus/nubus-device.c          |  13 --
 tests/qom-test.c                 |   5 +
 tests/test-hmp.c                 |   3 +-
 8 files changed, 519 insertions(+), 34 deletions(-)
 create mode 100644 hw/m68k/bootinfo.h
 create mode 100644 hw/m68k/mac.c

Comments

Mark Cave-Ayland June 9, 2018, 10:24 a.m. UTC | #1 
On 08/06/18 21:05, Laurent Vivier wrote:

> From: Laurent Vivier <Laurent@Vivier.EU>
> 
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
>   default-configs/m68k-softmmu.mak |  12 ++
>   hw/display/macfb.c               |  31 ++--
>   hw/m68k/Makefile.objs            |   6 +-
>   hw/m68k/bootinfo.h               |  99 ++++++++++
>   hw/m68k/mac.c                    | 384 +++++++++++++++++++++++++++++++++++++++
>   hw/nubus/nubus-device.c          |  13 --
>   tests/qom-test.c                 |   5 +
>   tests/test-hmp.c                 |   3 +-
>   8 files changed, 519 insertions(+), 34 deletions(-)
>   create mode 100644 hw/m68k/bootinfo.h
>   create mode 100644 hw/m68k/mac.c
> 
> diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak
> index 60f7cdfbf2..1b568be166 100644
> --- a/default-configs/m68k-softmmu.mak
> +++ b/default-configs/m68k-softmmu.mak
> @@ -2,3 +2,15 @@
>   
>   CONFIG_COLDFIRE=y
>   CONFIG_PTIMER=y
> +CONFIG_ESCC=y
> +CONFIG_FRAMEBUFFER=y
> +CONFIG_ADB=y
> +CONFIG_MAC_VIA=y
> +CONFIG_MAC=y
> +CONFIG_SCSI=y
> +CONFIG_ESP=y
> +CONFIG_ASC=y
> +CONFIG_MACFB=y
> +CONFIG_NUBUS=y
> +CONFIG_DP8393X=y
> +CONFIG_SWIM=y
> diff --git a/hw/display/macfb.c b/hw/display/macfb.c
> index 295fd0fc8a..a3204ab150 100644
> --- a/hw/display/macfb.c
> +++ b/hw/display/macfb.c
> @@ -240,31 +240,28 @@ typedef struct {
>       MacfbState macfb;
>   } MacfbNubusState;
>   
> -static int macfb_sysbus_init(SysBusDevice *dev)
> +static void macfb_sysbus_realize(DeviceState *dev, Error **errp)
>   {
>       MacfbState *s =  &MACFB(dev)->macfb;
>   
> -    macfb_init(DEVICE(dev), s);
> -    sysbus_init_mmio(dev, &s->mem_ctrl);
> -    sysbus_init_mmio(dev, &s->mem_vram);
> -
> -    return 0;
> +    macfb_init(dev, s);
> +    sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->mem_ctrl);
> +    sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->mem_vram);
>   }
>   
>   const uint8_t macfb_rom[] = {
>       255, 0, 0, 0,
>   };
>   
> -static int macfb_nubus_init(NubusDevice *dev)
> +static void macfb_nubus_realize(DeviceState *dev, Error **errp)
>   {
> -    MacfbState *s = &DO_UPCAST(MacfbNubusState, busdev, dev)->macfb;

DO_UPCAST() - wow that's a blast from the past! Obviously these should 
be handled via proper QOM objects and casts.

> +    NubusDevice *nubus = NUBUS_DEVICE(dev);
> +    MacfbState *s = &DO_UPCAST(MacfbNubusState, busdev, nubus)->macfb;
>   
> -    macfb_init(DEVICE(dev), s);
> -    nubus_add_slot_mmio(dev, DAFB_BASE, &s->mem_ctrl);
> -    nubus_add_slot_mmio(dev, VIDEO_BASE, &s->mem_vram);
> -    nubus_register_rom(dev, macfb_rom, sizeof(macfb_rom), 1, 9, 0xf);
> -
> -    return 0;
> +    macfb_init(dev, s);
> +    nubus_add_slot_mmio(nubus, DAFB_BASE, &s->mem_ctrl);
> +    nubus_add_slot_mmio(nubus, VIDEO_BASE, &s->mem_vram);
> +    nubus_register_rom(nubus, macfb_rom, sizeof(macfb_rom), 1, 9, 0xf);
>   }
>   
>   static void macfb_sysbus_reset(DeviceState *d)
> @@ -296,9 +293,8 @@ static Property macfb_nubus_properties[] = {
>   static void macfb_sysbus_class_init(ObjectClass *klass, void *data)
>   {
>       DeviceClass *dc = DEVICE_CLASS(klass);
> -    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
>   
> -    k->init = macfb_sysbus_init;
> +    dc->realize = macfb_sysbus_realize;
>       dc->desc = "SysBus Macintosh framebuffer";
>       dc->reset = macfb_sysbus_reset;
>       dc->vmsd = &vmstate_macfb;
> @@ -308,9 +304,8 @@ static void macfb_sysbus_class_init(ObjectClass *klass, void *data)
>   static void macfb_nubus_class_init(ObjectClass *klass, void *data)
>   {
>       DeviceClass *dc = DEVICE_CLASS(klass);
> -    NubusDeviceClass *k = NUBUS_DEVICE_CLASS(klass);
>   
> -    k->init = macfb_nubus_init;
> +    dc->realize = macfb_nubus_realize;
>       dc->desc = "Nubus Macintosh framebuffer";
>       dc->reset = macfb_nubus_reset;
>       dc->vmsd = &vmstate_macfb;
> diff --git a/hw/m68k/Makefile.objs b/hw/m68k/Makefile.objs
> index d1f089c08a..ff739617b2 100644
> --- a/hw/m68k/Makefile.objs
> +++ b/hw/m68k/Makefile.objs
> @@ -1,2 +1,4 @@
> -obj-y += an5206.o mcf5208.o
> -obj-y += mcf5206.o mcf_intc.o
> +obj-$(CONFIG_COLDFIRE) += an5206.o mcf5208.o
> +obj-$(CONFIG_MAC) += mac.o
> +
> +obj-$(CONFIG_COLDFIRE) += mcf5206.o mcf_intc.o
> diff --git a/hw/m68k/bootinfo.h b/hw/m68k/bootinfo.h
> new file mode 100644
> index 0000000000..b04153ce1e
> --- /dev/null
> +++ b/hw/m68k/bootinfo.h
> @@ -0,0 +1,99 @@
> +struct bi_record {
> +    uint16_t tag;        /* tag ID */
> +    uint16_t size;       /* size of record */
> +    uint32_t data[0];    /* data */
> +};
> +
> +/* machine independent tags */
> +
> +#define BI_LAST         0x0000 /* last record */
> +#define BI_MACHTYPE     0x0001 /* machine type (u_long) */
> +#define BI_CPUTYPE      0x0002 /* cpu type (u_long) */
> +#define BI_FPUTYPE      0x0003 /* fpu type (u_long) */
> +#define BI_MMUTYPE      0x0004 /* mmu type (u_long) */
> +#define BI_MEMCHUNK     0x0005 /* memory chunk address and size */
> +                               /* (struct mem_info) */
> +#define BI_RAMDISK      0x0006 /* ramdisk address and size */
> +                               /* (struct mem_info) */
> +#define BI_COMMAND_LINE 0x0007 /* kernel command line parameters */
> +                               /* (string) */
> +
> +/*  Macintosh-specific tags (all u_long) */
> +
> +#define BI_MAC_MODEL    0x8000  /* Mac Gestalt ID (model type) */
> +#define BI_MAC_VADDR    0x8001  /* Mac video base address */
> +#define BI_MAC_VDEPTH   0x8002  /* Mac video depth */
> +#define BI_MAC_VROW     0x8003  /* Mac video rowbytes */
> +#define BI_MAC_VDIM     0x8004  /* Mac video dimensions */
> +#define BI_MAC_VLOGICAL 0x8005  /* Mac video logical base */
> +#define BI_MAC_SCCBASE  0x8006  /* Mac SCC base address */
> +#define BI_MAC_BTIME    0x8007  /* Mac boot time */
> +#define BI_MAC_GMTBIAS  0x8008  /* Mac GMT timezone offset */
> +#define BI_MAC_MEMSIZE  0x8009  /* Mac RAM size (sanity check) */
> +#define BI_MAC_CPUID    0x800a  /* Mac CPU type (sanity check) */
> +#define BI_MAC_ROMBASE  0x800b  /* Mac system ROM base address */
> +
> +/*  Macintosh hardware profile data */
> +
> +#define BI_MAC_VIA1BASE 0x8010  /* Mac VIA1 base address (always present) */
> +#define BI_MAC_VIA2BASE 0x8011  /* Mac VIA2 base address (type varies) */
> +#define BI_MAC_VIA2TYPE 0x8012  /* Mac VIA2 type (VIA, RBV, OSS) */
> +#define BI_MAC_ADBTYPE  0x8013  /* Mac ADB interface type */
> +#define BI_MAC_ASCBASE  0x8014  /* Mac Apple Sound Chip base address */
> +#define BI_MAC_SCSI5380 0x8015  /* Mac NCR 5380 SCSI (base address, multi) */
> +#define BI_MAC_SCSIDMA  0x8016  /* Mac SCSI DMA (base address) */
> +#define BI_MAC_SCSI5396 0x8017  /* Mac NCR 53C96 SCSI (base address, multi) */
> +#define BI_MAC_IDETYPE  0x8018  /* Mac IDE interface type */
> +#define BI_MAC_IDEBASE  0x8019  /* Mac IDE interface base address */
> +#define BI_MAC_NUBUS    0x801a  /* Mac Nubus type (none, regular, pseudo) */
> +#define BI_MAC_SLOTMASK 0x801b  /* Mac Nubus slots present */
> +#define BI_MAC_SCCTYPE  0x801c  /* Mac SCC serial type (normal, IOP) */
> +#define BI_MAC_ETHTYPE  0x801d  /* Mac builtin ethernet type (Sonic, MACE */
> +#define BI_MAC_ETHBASE  0x801e  /* Mac builtin ethernet base address */
> +#define BI_MAC_PMU      0x801f  /* Mac power management / poweroff hardware */
> +#define BI_MAC_IOP_SWIM 0x8020  /* Mac SWIM floppy IOP */
> +#define BI_MAC_IOP_ADB  0x8021  /* Mac ADB IOP */
> +
> +#define BOOTINFO0(as, base, id) \
> +    do { \
> +        stw_phys(as, base, id); \
> +        base += 2; \
> +        stw_phys(as, base, sizeof(struct bi_record)); \
> +        base += 2; \
> +    } while (0)
> +
> +#define BOOTINFO1(as, base, id, value) \
> +    do { \
> +        stw_phys(as, base, id); \
> +        base += 2; \
> +        stw_phys(as, base, sizeof(struct bi_record) + 4); \
> +        base += 2; \
> +        stl_phys(as, base, value); \
> +        base += 4; \
> +    } while (0)
> +
> +#define BOOTINFO2(as, base, id, value1, value2) \
> +    do { \
> +        stw_phys(as, base, id); \
> +        base += 2; \
> +        stw_phys(as, base, sizeof(struct bi_record) + 8); \
> +        base += 2; \
> +        stl_phys(as, base, value1); \
> +        base += 4; \
> +        stl_phys(as, base, value2); \
> +        base += 4; \
> +    } while (0)
> +
> +#define BOOTINFOSTR(as, base, id, string) \
> +    do { \
> +        int i; \
> +        stw_phys(as, base, id); \
> +        base += 2; \
> +        stw_phys(as, base, (sizeof(struct bi_record) + strlen(string) + 2) & ~1); \
> +        base += 2; \
> +        for (i = 0; string[i]; i++) { \
> +            stb_phys(as, base++, string[i]); \
> +        } \
> +        stb_phys(as, base++, 0); \
> +        base = (parameters_base + 1) & ~1; \
> +    } while (0)
> diff --git a/hw/m68k/mac.c b/hw/m68k/mac.c
> new file mode 100644
> index 0000000000..d573339e66
> --- /dev/null
> +++ b/hw/m68k/mac.c
> @@ -0,0 +1,384 @@
> +/*
> + * QEMU Motorla 680x0 Macintosh hardware System Emulator
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a copy
> + * of this software and associated documentation files (the "Software"), to deal
> + * in the Software without restriction, including without limitation the rights
> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> + * copies of the Software, and to permit persons to whom the Software is
> + * furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> + * THE SOFTWARE.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "sysemu/sysemu.h"
> +#include "cpu.h"
> +#include "hw/hw.h"
> +#include "hw/boards.h"
> +#include "elf.h"
> +#include "hw/loader.h"
> +#include "hw/display/framebuffer.h"
> +#include "ui/console.h"
> +#include "exec/address-spaces.h"
> +#include "hw/char/escc.h"
> +#include "hw/sysbus.h"
> +#include "hw/scsi/esp.h"
> +#include "bootinfo.h"
> +#include "hw/misc/mac_via.h"
> +#include "hw/input/adb.h"
> +#include "hw/audio/asc.h"
> +#include "hw/nubus/mac.h"
> +#include "net/net.h"
> +#include "qapi/error.h"
> +
> +#define MACROM_ADDR     0x40000000
> +#define MACROM_SIZE     0x00100000
> +
> +/*
> + *              .ident          = MAC_MODEL_Q800,
> + *              .name           = "Quadra 800",
> + *              .adb_type       = MAC_ADB_II,
> + *              .via_type       = MAC_VIA_QUADRA,
> + *              .scsi_type      = MAC_SCSI_QUADRA,
> + *              .scc_type       = MAC_SCC_QUADRA,
> + *              .ether_type     = MAC_ETHER_SONIC,
> + *              .nubus_type     = MAC_NUBUS
> + */
> +
> +#define MACROM_FILENAME "MacROM.bin"
> +
> +#define Q800_MACHINE_ID 35
> +#define Q800_CPU_ID (1 << 2)
> +#define Q800_FPU_ID (1 << 2)
> +#define Q800_MMU_ID (1 << 2)
> +
> +#define MACH_MAC        3
> +#define Q800_MAC_CPU_ID 2
> +
> +#define VIA_BASE              0x50f00000
> +#define SONIC_PROM_BASE       0x50f08000
> +#define SONIC_BASE            0x50f0a000
> +#define SCC_BASE              0x50f0c020
> +#define ESP_BASE              0x50f10000
> +#define ESP_PDMA              0x50f10100
> +#define ASC_BASE              0x50F14000
> +#define SWIM_BASE             0x50F1E000
> +#define NUBUS_SUPER_SLOT_BASE 0x60000000
> +#define NUBUS_SLOT_BASE       0xf0000000
> +
> +/* the video base, whereas it a Nubus address,
> + * is needed by the kernel to have early display and
> + * thus provided by the bootloader
> + */
> +#define VIDEO_BASE            0xf9001000
> +
> +#define MAC_CLOCK  3686418
> +
> +typedef struct {
> +    M68kCPU *cpu;
> +    uint8_t ipr;
> +} q800_glue_state_t;
> +
> +static void q800_glue_set_irq(void *opaque, int irq, int level)
> +{
> +    int i;
> +
> +    q800_glue_state_t *s = opaque;
> +
> +    if (level) {
> +        s->ipr |= 1 << irq;
> +    } else {
> +        s->ipr &= ~(1 << irq);
> +    }
> +
> +    for (i = 7; i >= 0; i--) {
> +        if ((s->ipr >> i) & 1) {
> +            m68k_set_irq_level(s->cpu, i + 1, i + 25);
> +            return;
> +        }
> +    }
> +    m68k_set_irq_level(s->cpu, 0, 0);
> +}

I would recommend making this a separate QOM device, and having the 
board wire up the CPU IRQs and expose them via qdev GPIOs so then 
everything else can wire up interrupts via the standard qdev_gpio APIs.

It is a bit more work, but doing it this way makes the board wiring much 
easier to follow.

> +static void main_cpu_reset(void *opaque)
> +{
> +    M68kCPU *cpu = opaque;
> +    CPUState *cs = CPU(cpu);
> +
> +    cpu_reset(cs);
> +    cpu->env.aregs[7] = ldl_phys(cs->as, 0);
> +    cpu->env.pc = ldl_phys(cs->as, 4);
> +}
> +
> +static void q800_init(MachineState *machine)
> +{
> +    M68kCPU *cpu = NULL;
> +    int linux_boot;
> +    int32_t kernel_size;
> +    uint64_t elf_entry;
> +    char *filename;
> +    int bios_size;
> +    ram_addr_t initrd_base;
> +    int32_t initrd_size;
> +    MemoryRegion *rom;
> +    MemoryRegion *ram;
> +    ram_addr_t ram_size = machine->ram_size;
> +    const char *kernel_filename = machine->kernel_filename;
> +    const char *initrd_filename = machine->initrd_filename;
> +    const char *kernel_cmdline = machine->kernel_cmdline;
> +    q800_glue_state_t *s;
> +    qemu_irq *pic;
> +    hwaddr parameters_base;
> +    CPUState *cs;
> +    DeviceState *dev;
> +    DeviceState *via_dev;
> +    SysBusDevice *sysbus;
> +    BusState *adb_bus;
> +    qemu_irq  esp_reset_irq, esp_dma_enable;
> +    NubusBus *nubus;
> +    NubusDevice *nubus_dev;
> +    DriveInfo *fds[2];
> +
> +    linux_boot = (kernel_filename != NULL);
> +
> +    /* init CPUs */
> +    cpu = M68K_CPU(cpu_create(machine->cpu_type));
> +    if (!cpu) {
> +            hw_error("qemu: unable to find m68k CPU definition\n");
> +            exit(1);
> +    }
> +    qemu_register_reset(main_cpu_reset, cpu);
> +
> +    ram = g_malloc(sizeof(*ram));
> +    memory_region_init_ram(ram, NULL, "m68k_mac.ram", ram_size, &error_abort);
> +    memory_region_add_subregion(get_system_memory(), 0, ram);
> +
> +    /* Glue */
> +
> +    s = (q800_glue_state_t *)g_malloc0(sizeof(q800_glue_state_t));
> +    s->cpu = cpu;
> +    pic = qemu_allocate_irqs(q800_glue_set_irq, s, 6);
> +
> +    /* VIA */
> +
> +    via_dev = qdev_create(NULL, TYPE_MAC_VIA);
> +    qdev_init_nofail(via_dev);
> +    sysbus = SYS_BUS_DEVICE(via_dev);
> +    sysbus_mmio_map(sysbus, 0, VIA_BASE);
> +    sysbus_connect_irq(sysbus, 0, pic[0]);
> +    sysbus_connect_irq(sysbus, 1, pic[1]);
> +
> +    adb_bus = qdev_get_child_bus(via_dev, "adb.0");
> +    dev = qdev_create(adb_bus, TYPE_ADB_KEYBOARD);
> +    qdev_init_nofail(dev);
> +    dev = qdev_create(adb_bus, TYPE_ADB_MOUSE);
> +    qdev_init_nofail(dev);
> +
> +    /* MACSONIC */
> +
> +    if (nb_nics != 1) {
> +        hw_error("Q800 needs a dp83932 ethernet interfaces");
> +    }
> +    if (!nd_table[0].model) {
> +        nd_table[0].model = g_strdup("dp83932");
> +    }
> +    if (strcmp(nd_table[0].model, "dp83932") != 0) {
> +        hw_error("Q800 needs a dp83932 ethernet interfaces");
> +    } else {
> +        /* MacSonic driver needs an Apple MAC address
> +         * Valid prefix are:
> +         * 00:05:02 Apple
> +         * 00:80:19 Dayna Communications, Inc.
> +         * 00:A0:40 Apple
> +         * 08:00:07 Apple
> +         * (Q800 use the last one)
> +         */
> +        nd_table[0].macaddr.a[0] = 0x08;
> +        nd_table[0].macaddr.a[1] = 0x00;
> +        nd_table[0].macaddr.a[2] = 0x07;
> +    }
> +    qemu_check_nic_model(&nd_table[0], "dp83932");
> +    dev = qdev_create(NULL, "dp8393x");
> +    qdev_set_nic_properties(dev, &nd_table[0]);
> +    qdev_prop_set_uint8(dev, "it_shift", 2);
> +    qdev_prop_set_bit(dev, "big_endian", true);
> +    qdev_prop_set_ptr(dev, "dma_mr", get_system_memory());
> +    qdev_init_nofail(dev);
> +    sysbus = SYS_BUS_DEVICE(dev);
> +    sysbus_mmio_map(sysbus, 0, SONIC_BASE);
> +    sysbus_mmio_map(sysbus, 1, SONIC_PROM_BASE);
> +    sysbus_connect_irq(sysbus, 0, pic[2]);
> +
> +    /* SCC */
> +
> +    dev = qdev_create(NULL, "escc");
> +    qdev_prop_set_uint32(dev, "disabled", 0);
> +    qdev_prop_set_uint32(dev, "frequency", MAC_CLOCK);
> +    qdev_prop_set_uint32(dev, "it_shift", 1);
> +    qdev_prop_set_bit(dev, "bit_swap", true);
> +    qdev_prop_set_chr(dev, "chrA", serial_hd(0));
> +    qdev_prop_set_chr(dev, "chrB", serial_hd(1));
> +    qdev_prop_set_uint32(dev, "chnBtype", 0);
> +    qdev_prop_set_uint32(dev, "chnAtype", 0);
> +    qdev_init_nofail(dev);
> +    sysbus = SYS_BUS_DEVICE(dev);
> +    sysbus_connect_irq(sysbus, 0, pic[3]);
> +    sysbus_connect_irq(sysbus, 1, pic[3]);
> +    sysbus_mmio_map(sysbus, 0, SCC_BASE);
> +
> +    /* SCSI */
> +
> +    esp_init_pdma(ESP_BASE, 4, ESP_PDMA,
> +                  qdev_get_gpio_in(via_dev, VIA2_IRQ_SCSI_BIT),
> +                  qdev_get_gpio_in(via_dev, VIA2_IRQ_SCSI_DATA_BIT),
> +                  &esp_reset_irq, &esp_dma_enable);
> +
> +    /* Apple Sound Chip */
> +
> +    dev = qdev_create(NULL, "apple-sound-chip");
> +    qdev_prop_set_uint8(dev, "asctype", ASC_TYPE_ASC);
> +    qdev_init_nofail(dev);
> +    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, ASC_BASE);
> +    sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0,
> +                       qdev_get_gpio_in(via_dev, VIA2_IRQ_ASC_BIT));
> +
> +    /* SWIM floppy controller */
> +
> +    if (drive_get_max_bus(IF_FLOPPY) >= 2) {
> +        fprintf(stderr, "qemu: too many floppy drives\n");
> +        exit(1);
> +    }
> +    fds[0] = drive_get(IF_FLOPPY, 0, 0);
> +    fds[1] = drive_get(IF_FLOPPY, 0, 1);
> +
> +    dev = qdev_create(NULL, "sysbus-swim");
> +    if (fds[0]) {
> +        qdev_prop_set_drive(dev, "driveA", blk_by_legacy_dinfo(fds[0]),
> +                            &error_fatal);
> +    }
> +    if (fds[1]) {
> +        qdev_prop_set_drive(dev, "driveB", blk_by_legacy_dinfo(fds[1]),
> +                            &error_fatal);
> +    }
> +    qdev_init_nofail(dev);
> +    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, SWIM_BASE);
> +
> +    /* NuBus */
> +
> +    nubus = nubus_mac_new(NUBUS_SUPER_SLOT_BASE, NUBUS_SLOT_BASE);
> +
> +    /* framebuffer in nubus slot #9 */
> +
> +    nubus_dev = nubus_create(nubus, "nubus-macfb");
> +    qdev_prop_set_uint32(&nubus_dev->qdev, "width", graphic_width);
> +    qdev_prop_set_uint32(&nubus_dev->qdev, "height", graphic_height);
> +    qdev_prop_set_uint8(&nubus_dev->qdev, "depth", graphic_depth);
> +    qdev_init_nofail(&nubus_dev->qdev);
> +
> +    cs = CPU(cpu);
> +    if (linux_boot) {
> +        uint64_t high;
> +        kernel_size = load_elf(kernel_filename, NULL, NULL,
> +                               &elf_entry, NULL, &high, 1,
> +                               EM_68K, 0, 0);
> +        if (kernel_size < 0) {
> +            hw_error("qemu: could not load kernel '%s'\n",
> +                      kernel_filename);
> +            exit(1);
> +        }
> +        stl_phys(cs->as, 4, elf_entry); /* reset initial PC */
> +        parameters_base = (high + 1) & ~1;
> +
> +        BOOTINFO1(cs->as, parameters_base, BI_MACHTYPE, MACH_MAC);
> +        BOOTINFO1(cs->as, parameters_base, BI_FPUTYPE, Q800_FPU_ID);
> +        BOOTINFO1(cs->as, parameters_base, BI_MMUTYPE, Q800_MMU_ID);
> +        BOOTINFO1(cs->as, parameters_base, BI_CPUTYPE, Q800_CPU_ID);
> +        BOOTINFO1(cs->as, parameters_base, BI_MAC_CPUID, Q800_MAC_CPU_ID);
> +        BOOTINFO1(cs->as, parameters_base, BI_MAC_MODEL, Q800_MACHINE_ID);
> +        BOOTINFO1(cs->as, parameters_base,
> +                  BI_MAC_MEMSIZE, ram_size >> 20); /* in MB */
> +        BOOTINFO2(cs->as, parameters_base, BI_MEMCHUNK, 0, ram_size);
> +        BOOTINFO1(cs->as, parameters_base, BI_MAC_VADDR, VIDEO_BASE);
> +        BOOTINFO1(cs->as, parameters_base, BI_MAC_VDEPTH, graphic_depth);
> +        BOOTINFO1(cs->as, parameters_base, BI_MAC_VDIM,
> +                  (graphic_height << 16) | graphic_width);
> +        BOOTINFO1(cs->as, parameters_base, BI_MAC_VROW,
> +                  (graphic_width * graphic_depth + 7) / 8);
> +        BOOTINFO1(cs->as, parameters_base, BI_MAC_SCCBASE, SCC_BASE);
> +
> +        if (kernel_cmdline) {
> +            BOOTINFOSTR(cs->as, parameters_base, BI_COMMAND_LINE,
> +                        kernel_cmdline);
> +        }
> +
> +        /* load initrd */
> +        if (initrd_filename) {
> +            initrd_size = get_image_size(initrd_filename);
> +            if (initrd_size < 0) {
> +                hw_error("qemu: could not load initial ram disk '%s'\n",
> +                         initrd_filename);
> +                exit(1);
> +            }
> +
> +            initrd_base = (ram_size - initrd_size) & TARGET_PAGE_MASK;
> +            load_image_targphys(initrd_filename, initrd_base,
> +                                ram_size - initrd_base);
> +            BOOTINFO2(cs->as, parameters_base, BI_RAMDISK, initrd_base,
> +                      initrd_size);
> +        } else {
> +            initrd_base = 0;
> +            initrd_size = 0;
> +        }
> +        BOOTINFO0(cs->as, parameters_base, BI_LAST);
> +    } else {
> +        uint8_t *ptr;
> +        /* allocate and load BIOS */
> +        rom = g_malloc(sizeof(*rom));
> +        memory_region_init_ram(rom, NULL, "m68k_mac.rom", MACROM_SIZE,
> +                               &error_abort);
> +        if (bios_name == NULL) {
> +            bios_name = MACROM_FILENAME;
> +        }
> +        filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
> +        memory_region_set_readonly(rom, true);
> +        memory_region_add_subregion(get_system_memory(), MACROM_ADDR, rom);
> +
> +        /* Load MacROM binary */
> +        if (filename) {
> +            bios_size = load_image_targphys(filename, MACROM_ADDR, MACROM_SIZE);
> +            g_free(filename);
> +        } else {
> +            bios_size = -1;
> +        }
> +        if (bios_size < 0 || bios_size > MACROM_SIZE) {
> +            hw_error("qemu: could not load MacROM '%s'\n", bios_name);
> +            exit(1);
> +        }
> +        ptr = rom_ptr(MACROM_ADDR);
> +        stl_phys(cs->as, 0, ldl_p(ptr));    /* reset initial SP */
> +        stl_phys(cs->as, 4,
> +                 MACROM_ADDR + ldl_p(ptr + 4)); /* reset initial PC */
> +    }
> +}
> +
> +static void q800_machine_init(MachineClass *mc)
> +{
> +    mc->desc = "Macintosh Quadra 800";
> +    mc->init = q800_init;
> +    mc->default_cpu_type = M68K_CPU_TYPE_NAME("m68040");
> +    mc->max_cpus = 1;
> +    mc->is_default = 0;
> +    mc->block_default_type = IF_SCSI;
> +}
> +
> +DEFINE_MACHINE("q800", q800_machine_init)
> diff --git a/hw/nubus/nubus-device.c b/hw/nubus/nubus-device.c
> index 0c8023d46a..7fd1e03909 100644
> --- a/hw/nubus/nubus-device.c
> +++ b/hw/nubus/nubus-device.c
> @@ -238,22 +238,9 @@ static void nubus_device_init(Object *obj)
>   {
>   }
>   
> -static int nubus_qdev_init(DeviceState *qdev)
> -{
> -    NubusDevice *dev = NUBUS_DEVICE(qdev);
> -    NubusDeviceClass *klass = NUBUS_DEVICE_GET_CLASS(dev);
> -
> -    if (klass->init) {
> -        return klass->init(dev);
> -    }
> -
> -    return 0;
> -}
> -
>   static void nubus_device_class_init(ObjectClass *klass, void *data)
>   {
>       DeviceClass *k = DEVICE_CLASS(klass);
> -    k->init = nubus_qdev_init;
>       k->bus_type = TYPE_NUBUS_BUS;
>   }
>   
> diff --git a/tests/qom-test.c b/tests/qom-test.c
> index e6f712cbd3..373699fda4 100644
> --- a/tests/qom-test.c
> +++ b/tests/qom-test.c
> @@ -19,12 +19,17 @@ static const char *blacklist_x86[] = {
>       "xenfv", "xenpv", NULL
>   };
>   
> +static const char *blacklist_m68k[] = {
> +    "q800", NULL
> +};
> +
>   static const struct {
>       const char *arch;
>       const char **machine;
>   } blacklists[] = {
>       { "i386", blacklist_x86 },
>       { "x86_64", blacklist_x86 },
> +    { "m68k", blacklist_m68k },
>   };
>   
>   static bool is_blacklisted(const char *arch, const char *mach)
> diff --git a/tests/test-hmp.c b/tests/test-hmp.c
> index 5352c9c088..f3b79d5bdf 100644
> --- a/tests/test-hmp.c
> +++ b/tests/test-hmp.c
> @@ -139,7 +139,8 @@ static void add_machine_test_case(const char *mname)
>       char *path;
>   
>       /* Ignore blacklisted machines that have known problems */
> -    if (!strcmp("xenfv", mname) || !strcmp("xenpv", mname)) {
> +    if (!strcmp("xenfv", mname) || !strcmp("xenpv", mname) ||
> +        !strcmp("q800", mname)) {
>           return;
>       }


ATB,

Mark.
diff mbox series

Patch

diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak
index 60f7cdfbf2..1b568be166 100644
--- a/default-configs/m68k-softmmu.mak
+++ b/default-configs/m68k-softmmu.mak
@@ -2,3 +2,15 @@ 
 
 CONFIG_COLDFIRE=y
 CONFIG_PTIMER=y
+CONFIG_ESCC=y
+CONFIG_FRAMEBUFFER=y
+CONFIG_ADB=y
+CONFIG_MAC_VIA=y
+CONFIG_MAC=y
+CONFIG_SCSI=y
+CONFIG_ESP=y
+CONFIG_ASC=y
+CONFIG_MACFB=y
+CONFIG_NUBUS=y
+CONFIG_DP8393X=y
+CONFIG_SWIM=y
diff --git a/hw/display/macfb.c b/hw/display/macfb.c
index 295fd0fc8a..a3204ab150 100644
--- a/hw/display/macfb.c
+++ b/hw/display/macfb.c
@@ -240,31 +240,28 @@  typedef struct {
     MacfbState macfb;
 } MacfbNubusState;
 
-static int macfb_sysbus_init(SysBusDevice *dev)
+static void macfb_sysbus_realize(DeviceState *dev, Error **errp)
 {
     MacfbState *s =  &MACFB(dev)->macfb;
 
-    macfb_init(DEVICE(dev), s);
-    sysbus_init_mmio(dev, &s->mem_ctrl);
-    sysbus_init_mmio(dev, &s->mem_vram);
-
-    return 0;
+    macfb_init(dev, s);
+    sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->mem_ctrl);
+    sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->mem_vram);
 }
 
 const uint8_t macfb_rom[] = {
     255, 0, 0, 0,
 };
 
-static int macfb_nubus_init(NubusDevice *dev)
+static void macfb_nubus_realize(DeviceState *dev, Error **errp)
 {
-    MacfbState *s = &DO_UPCAST(MacfbNubusState, busdev, dev)->macfb;
+    NubusDevice *nubus = NUBUS_DEVICE(dev);
+    MacfbState *s = &DO_UPCAST(MacfbNubusState, busdev, nubus)->macfb;
 
-    macfb_init(DEVICE(dev), s);
-    nubus_add_slot_mmio(dev, DAFB_BASE, &s->mem_ctrl);
-    nubus_add_slot_mmio(dev, VIDEO_BASE, &s->mem_vram);
-    nubus_register_rom(dev, macfb_rom, sizeof(macfb_rom), 1, 9, 0xf);
-
-    return 0;
+    macfb_init(dev, s);
+    nubus_add_slot_mmio(nubus, DAFB_BASE, &s->mem_ctrl);
+    nubus_add_slot_mmio(nubus, VIDEO_BASE, &s->mem_vram);
+    nubus_register_rom(nubus, macfb_rom, sizeof(macfb_rom), 1, 9, 0xf);
 }
 
 static void macfb_sysbus_reset(DeviceState *d)
@@ -296,9 +293,8 @@  static Property macfb_nubus_properties[] = {
 static void macfb_sysbus_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
-    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
 
-    k->init = macfb_sysbus_init;
+    dc->realize = macfb_sysbus_realize;
     dc->desc = "SysBus Macintosh framebuffer";
     dc->reset = macfb_sysbus_reset;
     dc->vmsd = &vmstate_macfb;
@@ -308,9 +304,8 @@  static void macfb_sysbus_class_init(ObjectClass *klass, void *data)
 static void macfb_nubus_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
-    NubusDeviceClass *k = NUBUS_DEVICE_CLASS(klass);
 
-    k->init = macfb_nubus_init;
+    dc->realize = macfb_nubus_realize;
     dc->desc = "Nubus Macintosh framebuffer";
     dc->reset = macfb_nubus_reset;
     dc->vmsd = &vmstate_macfb;
diff --git a/hw/m68k/Makefile.objs b/hw/m68k/Makefile.objs
index d1f089c08a..ff739617b2 100644
--- a/hw/m68k/Makefile.objs
+++ b/hw/m68k/Makefile.objs
@@ -1,2 +1,4 @@ 
-obj-y += an5206.o mcf5208.o
-obj-y += mcf5206.o mcf_intc.o
+obj-$(CONFIG_COLDFIRE) += an5206.o mcf5208.o
+obj-$(CONFIG_MAC) += mac.o
+
+obj-$(CONFIG_COLDFIRE) += mcf5206.o mcf_intc.o
diff --git a/hw/m68k/bootinfo.h b/hw/m68k/bootinfo.h
new file mode 100644
index 0000000000..b04153ce1e
--- /dev/null
+++ b/hw/m68k/bootinfo.h
@@ -0,0 +1,99 @@ 
+struct bi_record {
+    uint16_t tag;        /* tag ID */
+    uint16_t size;       /* size of record */
+    uint32_t data[0];    /* data */
+};
+
+/* machine independent tags */
+
+#define BI_LAST         0x0000 /* last record */
+#define BI_MACHTYPE     0x0001 /* machine type (u_long) */
+#define BI_CPUTYPE      0x0002 /* cpu type (u_long) */
+#define BI_FPUTYPE      0x0003 /* fpu type (u_long) */
+#define BI_MMUTYPE      0x0004 /* mmu type (u_long) */
+#define BI_MEMCHUNK     0x0005 /* memory chunk address and size */
+                               /* (struct mem_info) */
+#define BI_RAMDISK      0x0006 /* ramdisk address and size */
+                               /* (struct mem_info) */
+#define BI_COMMAND_LINE 0x0007 /* kernel command line parameters */
+                               /* (string) */
+
+/*  Macintosh-specific tags (all u_long) */
+
+#define BI_MAC_MODEL    0x8000  /* Mac Gestalt ID (model type) */
+#define BI_MAC_VADDR    0x8001  /* Mac video base address */
+#define BI_MAC_VDEPTH   0x8002  /* Mac video depth */
+#define BI_MAC_VROW     0x8003  /* Mac video rowbytes */
+#define BI_MAC_VDIM     0x8004  /* Mac video dimensions */
+#define BI_MAC_VLOGICAL 0x8005  /* Mac video logical base */
+#define BI_MAC_SCCBASE  0x8006  /* Mac SCC base address */
+#define BI_MAC_BTIME    0x8007  /* Mac boot time */
+#define BI_MAC_GMTBIAS  0x8008  /* Mac GMT timezone offset */
+#define BI_MAC_MEMSIZE  0x8009  /* Mac RAM size (sanity check) */
+#define BI_MAC_CPUID    0x800a  /* Mac CPU type (sanity check) */
+#define BI_MAC_ROMBASE  0x800b  /* Mac system ROM base address */
+
+/*  Macintosh hardware profile data */
+
+#define BI_MAC_VIA1BASE 0x8010  /* Mac VIA1 base address (always present) */
+#define BI_MAC_VIA2BASE 0x8011  /* Mac VIA2 base address (type varies) */
+#define BI_MAC_VIA2TYPE 0x8012  /* Mac VIA2 type (VIA, RBV, OSS) */
+#define BI_MAC_ADBTYPE  0x8013  /* Mac ADB interface type */
+#define BI_MAC_ASCBASE  0x8014  /* Mac Apple Sound Chip base address */
+#define BI_MAC_SCSI5380 0x8015  /* Mac NCR 5380 SCSI (base address, multi) */
+#define BI_MAC_SCSIDMA  0x8016  /* Mac SCSI DMA (base address) */
+#define BI_MAC_SCSI5396 0x8017  /* Mac NCR 53C96 SCSI (base address, multi) */
+#define BI_MAC_IDETYPE  0x8018  /* Mac IDE interface type */
+#define BI_MAC_IDEBASE  0x8019  /* Mac IDE interface base address */
+#define BI_MAC_NUBUS    0x801a  /* Mac Nubus type (none, regular, pseudo) */
+#define BI_MAC_SLOTMASK 0x801b  /* Mac Nubus slots present */
+#define BI_MAC_SCCTYPE  0x801c  /* Mac SCC serial type (normal, IOP) */
+#define BI_MAC_ETHTYPE  0x801d  /* Mac builtin ethernet type (Sonic, MACE */
+#define BI_MAC_ETHBASE  0x801e  /* Mac builtin ethernet base address */
+#define BI_MAC_PMU      0x801f  /* Mac power management / poweroff hardware */
+#define BI_MAC_IOP_SWIM 0x8020  /* Mac SWIM floppy IOP */
+#define BI_MAC_IOP_ADB  0x8021  /* Mac ADB IOP */
+
+#define BOOTINFO0(as, base, id) \
+    do { \
+        stw_phys(as, base, id); \
+        base += 2; \
+        stw_phys(as, base, sizeof(struct bi_record)); \
+        base += 2; \
+    } while (0)
+
+#define BOOTINFO1(as, base, id, value) \
+    do { \
+        stw_phys(as, base, id); \
+        base += 2; \
+        stw_phys(as, base, sizeof(struct bi_record) + 4); \
+        base += 2; \
+        stl_phys(as, base, value); \
+        base += 4; \
+    } while (0)
+
+#define BOOTINFO2(as, base, id, value1, value2) \
+    do { \
+        stw_phys(as, base, id); \
+        base += 2; \
+        stw_phys(as, base, sizeof(struct bi_record) + 8); \
+        base += 2; \
+        stl_phys(as, base, value1); \
+        base += 4; \
+        stl_phys(as, base, value2); \
+        base += 4; \
+    } while (0)
+
+#define BOOTINFOSTR(as, base, id, string) \
+    do { \
+        int i; \
+        stw_phys(as, base, id); \
+        base += 2; \
+        stw_phys(as, base, (sizeof(struct bi_record) + strlen(string) + 2) & ~1); \
+        base += 2; \
+        for (i = 0; string[i]; i++) { \
+            stb_phys(as, base++, string[i]); \
+        } \
+        stb_phys(as, base++, 0); \
+        base = (parameters_base + 1) & ~1; \
+    } while (0)
diff --git a/hw/m68k/mac.c b/hw/m68k/mac.c
new file mode 100644
index 0000000000..d573339e66
--- /dev/null
+++ b/hw/m68k/mac.c
@@ -0,0 +1,384 @@ 
+/*
+ * QEMU Motorla 680x0 Macintosh hardware System Emulator
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "qemu/osdep.h"
+#include "sysemu/sysemu.h"
+#include "cpu.h"
+#include "hw/hw.h"
+#include "hw/boards.h"
+#include "elf.h"
+#include "hw/loader.h"
+#include "hw/display/framebuffer.h"
+#include "ui/console.h"
+#include "exec/address-spaces.h"
+#include "hw/char/escc.h"
+#include "hw/sysbus.h"
+#include "hw/scsi/esp.h"
+#include "bootinfo.h"
+#include "hw/misc/mac_via.h"
+#include "hw/input/adb.h"
+#include "hw/audio/asc.h"
+#include "hw/nubus/mac.h"
+#include "net/net.h"
+#include "qapi/error.h"
+
+#define MACROM_ADDR     0x40000000
+#define MACROM_SIZE     0x00100000
+
+/*
+ *              .ident          = MAC_MODEL_Q800,
+ *              .name           = "Quadra 800",
+ *              .adb_type       = MAC_ADB_II,
+ *              .via_type       = MAC_VIA_QUADRA,
+ *              .scsi_type      = MAC_SCSI_QUADRA,
+ *              .scc_type       = MAC_SCC_QUADRA,
+ *              .ether_type     = MAC_ETHER_SONIC,
+ *              .nubus_type     = MAC_NUBUS
+ */
+
+#define MACROM_FILENAME "MacROM.bin"
+
+#define Q800_MACHINE_ID 35
+#define Q800_CPU_ID (1 << 2)
+#define Q800_FPU_ID (1 << 2)
+#define Q800_MMU_ID (1 << 2)
+
+#define MACH_MAC        3
+#define Q800_MAC_CPU_ID 2
+
+#define VIA_BASE              0x50f00000
+#define SONIC_PROM_BASE       0x50f08000
+#define SONIC_BASE            0x50f0a000
+#define SCC_BASE              0x50f0c020
+#define ESP_BASE              0x50f10000
+#define ESP_PDMA              0x50f10100
+#define ASC_BASE              0x50F14000
+#define SWIM_BASE             0x50F1E000
+#define NUBUS_SUPER_SLOT_BASE 0x60000000
+#define NUBUS_SLOT_BASE       0xf0000000
+
+/* the video base, whereas it a Nubus address,
+ * is needed by the kernel to have early display and
+ * thus provided by the bootloader
+ */
+#define VIDEO_BASE            0xf9001000
+
+#define MAC_CLOCK  3686418
+
+typedef struct {
+    M68kCPU *cpu;
+    uint8_t ipr;
+} q800_glue_state_t;
+
+static void q800_glue_set_irq(void *opaque, int irq, int level)
+{
+    int i;
+
+    q800_glue_state_t *s = opaque;
+
+    if (level) {
+        s->ipr |= 1 << irq;
+    } else {
+        s->ipr &= ~(1 << irq);
+    }
+
+    for (i = 7; i >= 0; i--) {
+        if ((s->ipr >> i) & 1) {
+            m68k_set_irq_level(s->cpu, i + 1, i + 25);
+            return;
+        }
+    }
+    m68k_set_irq_level(s->cpu, 0, 0);
+}
+
+static void main_cpu_reset(void *opaque)
+{
+    M68kCPU *cpu = opaque;
+    CPUState *cs = CPU(cpu);
+
+    cpu_reset(cs);
+    cpu->env.aregs[7] = ldl_phys(cs->as, 0);
+    cpu->env.pc = ldl_phys(cs->as, 4);
+}
+
+static void q800_init(MachineState *machine)
+{
+    M68kCPU *cpu = NULL;
+    int linux_boot;
+    int32_t kernel_size;
+    uint64_t elf_entry;
+    char *filename;
+    int bios_size;
+    ram_addr_t initrd_base;
+    int32_t initrd_size;
+    MemoryRegion *rom;
+    MemoryRegion *ram;
+    ram_addr_t ram_size = machine->ram_size;
+    const char *kernel_filename = machine->kernel_filename;
+    const char *initrd_filename = machine->initrd_filename;
+    const char *kernel_cmdline = machine->kernel_cmdline;
+    q800_glue_state_t *s;
+    qemu_irq *pic;
+    hwaddr parameters_base;
+    CPUState *cs;
+    DeviceState *dev;
+    DeviceState *via_dev;
+    SysBusDevice *sysbus;
+    BusState *adb_bus;
+    qemu_irq  esp_reset_irq, esp_dma_enable;
+    NubusBus *nubus;
+    NubusDevice *nubus_dev;
+    DriveInfo *fds[2];
+
+    linux_boot = (kernel_filename != NULL);
+
+    /* init CPUs */
+    cpu = M68K_CPU(cpu_create(machine->cpu_type));
+    if (!cpu) {
+            hw_error("qemu: unable to find m68k CPU definition\n");
+            exit(1);
+    }
+    qemu_register_reset(main_cpu_reset, cpu);
+
+    ram = g_malloc(sizeof(*ram));
+    memory_region_init_ram(ram, NULL, "m68k_mac.ram", ram_size, &error_abort);
+    memory_region_add_subregion(get_system_memory(), 0, ram);
+
+    /* Glue */
+
+    s = (q800_glue_state_t *)g_malloc0(sizeof(q800_glue_state_t));
+    s->cpu = cpu;
+    pic = qemu_allocate_irqs(q800_glue_set_irq, s, 6);
+
+    /* VIA */
+
+    via_dev = qdev_create(NULL, TYPE_MAC_VIA);
+    qdev_init_nofail(via_dev);
+    sysbus = SYS_BUS_DEVICE(via_dev);
+    sysbus_mmio_map(sysbus, 0, VIA_BASE);
+    sysbus_connect_irq(sysbus, 0, pic[0]);
+    sysbus_connect_irq(sysbus, 1, pic[1]);
+
+    adb_bus = qdev_get_child_bus(via_dev, "adb.0");
+    dev = qdev_create(adb_bus, TYPE_ADB_KEYBOARD);
+    qdev_init_nofail(dev);
+    dev = qdev_create(adb_bus, TYPE_ADB_MOUSE);
+    qdev_init_nofail(dev);
+
+    /* MACSONIC */
+
+    if (nb_nics != 1) {
+        hw_error("Q800 needs a dp83932 ethernet interfaces");
+    }
+    if (!nd_table[0].model) {
+        nd_table[0].model = g_strdup("dp83932");
+    }
+    if (strcmp(nd_table[0].model, "dp83932") != 0) {
+        hw_error("Q800 needs a dp83932 ethernet interfaces");
+    } else {
+        /* MacSonic driver needs an Apple MAC address
+         * Valid prefix are:
+         * 00:05:02 Apple
+         * 00:80:19 Dayna Communications, Inc.
+         * 00:A0:40 Apple
+         * 08:00:07 Apple
+         * (Q800 use the last one)
+         */
+        nd_table[0].macaddr.a[0] = 0x08;
+        nd_table[0].macaddr.a[1] = 0x00;
+        nd_table[0].macaddr.a[2] = 0x07;
+    }
+    qemu_check_nic_model(&nd_table[0], "dp83932");
+    dev = qdev_create(NULL, "dp8393x");
+    qdev_set_nic_properties(dev, &nd_table[0]);
+    qdev_prop_set_uint8(dev, "it_shift", 2);
+    qdev_prop_set_bit(dev, "big_endian", true);
+    qdev_prop_set_ptr(dev, "dma_mr", get_system_memory());
+    qdev_init_nofail(dev);
+    sysbus = SYS_BUS_DEVICE(dev);
+    sysbus_mmio_map(sysbus, 0, SONIC_BASE);
+    sysbus_mmio_map(sysbus, 1, SONIC_PROM_BASE);
+    sysbus_connect_irq(sysbus, 0, pic[2]);
+
+    /* SCC */
+
+    dev = qdev_create(NULL, "escc");
+    qdev_prop_set_uint32(dev, "disabled", 0);
+    qdev_prop_set_uint32(dev, "frequency", MAC_CLOCK);
+    qdev_prop_set_uint32(dev, "it_shift", 1);
+    qdev_prop_set_bit(dev, "bit_swap", true);
+    qdev_prop_set_chr(dev, "chrA", serial_hd(0));
+    qdev_prop_set_chr(dev, "chrB", serial_hd(1));
+    qdev_prop_set_uint32(dev, "chnBtype", 0);
+    qdev_prop_set_uint32(dev, "chnAtype", 0);
+    qdev_init_nofail(dev);
+    sysbus = SYS_BUS_DEVICE(dev);
+    sysbus_connect_irq(sysbus, 0, pic[3]);
+    sysbus_connect_irq(sysbus, 1, pic[3]);
+    sysbus_mmio_map(sysbus, 0, SCC_BASE);
+
+    /* SCSI */
+
+    esp_init_pdma(ESP_BASE, 4, ESP_PDMA,
+                  qdev_get_gpio_in(via_dev, VIA2_IRQ_SCSI_BIT),
+                  qdev_get_gpio_in(via_dev, VIA2_IRQ_SCSI_DATA_BIT),
+                  &esp_reset_irq, &esp_dma_enable);
+
+    /* Apple Sound Chip */
+
+    dev = qdev_create(NULL, "apple-sound-chip");
+    qdev_prop_set_uint8(dev, "asctype", ASC_TYPE_ASC);
+    qdev_init_nofail(dev);
+    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, ASC_BASE);
+    sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0,
+                       qdev_get_gpio_in(via_dev, VIA2_IRQ_ASC_BIT));
+
+    /* SWIM floppy controller */
+
+    if (drive_get_max_bus(IF_FLOPPY) >= 2) {
+        fprintf(stderr, "qemu: too many floppy drives\n");
+        exit(1);
+    }
+    fds[0] = drive_get(IF_FLOPPY, 0, 0);
+    fds[1] = drive_get(IF_FLOPPY, 0, 1);
+
+    dev = qdev_create(NULL, "sysbus-swim");
+    if (fds[0]) {
+        qdev_prop_set_drive(dev, "driveA", blk_by_legacy_dinfo(fds[0]),
+                            &error_fatal);
+    }
+    if (fds[1]) {
+        qdev_prop_set_drive(dev, "driveB", blk_by_legacy_dinfo(fds[1]),
+                            &error_fatal);
+    }
+    qdev_init_nofail(dev);
+    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, SWIM_BASE);
+
+    /* NuBus */
+
+    nubus = nubus_mac_new(NUBUS_SUPER_SLOT_BASE, NUBUS_SLOT_BASE);
+
+    /* framebuffer in nubus slot #9 */
+
+    nubus_dev = nubus_create(nubus, "nubus-macfb");
+    qdev_prop_set_uint32(&nubus_dev->qdev, "width", graphic_width);
+    qdev_prop_set_uint32(&nubus_dev->qdev, "height", graphic_height);
+    qdev_prop_set_uint8(&nubus_dev->qdev, "depth", graphic_depth);
+    qdev_init_nofail(&nubus_dev->qdev);
+
+    cs = CPU(cpu);
+    if (linux_boot) {
+        uint64_t high;
+        kernel_size = load_elf(kernel_filename, NULL, NULL,
+                               &elf_entry, NULL, &high, 1,
+                               EM_68K, 0, 0);
+        if (kernel_size < 0) {
+            hw_error("qemu: could not load kernel '%s'\n",
+                      kernel_filename);
+            exit(1);
+        }
+        stl_phys(cs->as, 4, elf_entry); /* reset initial PC */
+        parameters_base = (high + 1) & ~1;
+
+        BOOTINFO1(cs->as, parameters_base, BI_MACHTYPE, MACH_MAC);
+        BOOTINFO1(cs->as, parameters_base, BI_FPUTYPE, Q800_FPU_ID);
+        BOOTINFO1(cs->as, parameters_base, BI_MMUTYPE, Q800_MMU_ID);
+        BOOTINFO1(cs->as, parameters_base, BI_CPUTYPE, Q800_CPU_ID);
+        BOOTINFO1(cs->as, parameters_base, BI_MAC_CPUID, Q800_MAC_CPU_ID);
+        BOOTINFO1(cs->as, parameters_base, BI_MAC_MODEL, Q800_MACHINE_ID);
+        BOOTINFO1(cs->as, parameters_base,
+                  BI_MAC_MEMSIZE, ram_size >> 20); /* in MB */
+        BOOTINFO2(cs->as, parameters_base, BI_MEMCHUNK, 0, ram_size);
+        BOOTINFO1(cs->as, parameters_base, BI_MAC_VADDR, VIDEO_BASE);
+        BOOTINFO1(cs->as, parameters_base, BI_MAC_VDEPTH, graphic_depth);
+        BOOTINFO1(cs->as, parameters_base, BI_MAC_VDIM,
+                  (graphic_height << 16) | graphic_width);
+        BOOTINFO1(cs->as, parameters_base, BI_MAC_VROW,
+                  (graphic_width * graphic_depth + 7) / 8);
+        BOOTINFO1(cs->as, parameters_base, BI_MAC_SCCBASE, SCC_BASE);
+
+        if (kernel_cmdline) {
+            BOOTINFOSTR(cs->as, parameters_base, BI_COMMAND_LINE,
+                        kernel_cmdline);
+        }
+
+        /* load initrd */
+        if (initrd_filename) {
+            initrd_size = get_image_size(initrd_filename);
+            if (initrd_size < 0) {
+                hw_error("qemu: could not load initial ram disk '%s'\n",
+                         initrd_filename);
+                exit(1);
+            }
+
+            initrd_base = (ram_size - initrd_size) & TARGET_PAGE_MASK;
+            load_image_targphys(initrd_filename, initrd_base,
+                                ram_size - initrd_base);
+            BOOTINFO2(cs->as, parameters_base, BI_RAMDISK, initrd_base,
+                      initrd_size);
+        } else {
+            initrd_base = 0;
+            initrd_size = 0;
+        }
+        BOOTINFO0(cs->as, parameters_base, BI_LAST);
+    } else {
+        uint8_t *ptr;
+        /* allocate and load BIOS */
+        rom = g_malloc(sizeof(*rom));
+        memory_region_init_ram(rom, NULL, "m68k_mac.rom", MACROM_SIZE,
+                               &error_abort);
+        if (bios_name == NULL) {
+            bios_name = MACROM_FILENAME;
+        }
+        filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
+        memory_region_set_readonly(rom, true);
+        memory_region_add_subregion(get_system_memory(), MACROM_ADDR, rom);
+
+        /* Load MacROM binary */
+        if (filename) {
+            bios_size = load_image_targphys(filename, MACROM_ADDR, MACROM_SIZE);
+            g_free(filename);
+        } else {
+            bios_size = -1;
+        }
+        if (bios_size < 0 || bios_size > MACROM_SIZE) {
+            hw_error("qemu: could not load MacROM '%s'\n", bios_name);
+            exit(1);
+        }
+        ptr = rom_ptr(MACROM_ADDR);
+        stl_phys(cs->as, 0, ldl_p(ptr));    /* reset initial SP */
+        stl_phys(cs->as, 4,
+                 MACROM_ADDR + ldl_p(ptr + 4)); /* reset initial PC */
+    }
+}
+
+static void q800_machine_init(MachineClass *mc)
+{
+    mc->desc = "Macintosh Quadra 800";
+    mc->init = q800_init;
+    mc->default_cpu_type = M68K_CPU_TYPE_NAME("m68040");
+    mc->max_cpus = 1;
+    mc->is_default = 0;
+    mc->block_default_type = IF_SCSI;
+}
+
+DEFINE_MACHINE("q800", q800_machine_init)
diff --git a/hw/nubus/nubus-device.c b/hw/nubus/nubus-device.c
index 0c8023d46a..7fd1e03909 100644
--- a/hw/nubus/nubus-device.c
+++ b/hw/nubus/nubus-device.c
@@ -238,22 +238,9 @@  static void nubus_device_init(Object *obj)
 {
 }
 
-static int nubus_qdev_init(DeviceState *qdev)
-{
-    NubusDevice *dev = NUBUS_DEVICE(qdev);
-    NubusDeviceClass *klass = NUBUS_DEVICE_GET_CLASS(dev);
-
-    if (klass->init) {
-        return klass->init(dev);
-    }
-
-    return 0;
-}
-
 static void nubus_device_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *k = DEVICE_CLASS(klass);
-    k->init = nubus_qdev_init;
     k->bus_type = TYPE_NUBUS_BUS;
 }
 
diff --git a/tests/qom-test.c b/tests/qom-test.c
index e6f712cbd3..373699fda4 100644
--- a/tests/qom-test.c
+++ b/tests/qom-test.c
@@ -19,12 +19,17 @@  static const char *blacklist_x86[] = {
     "xenfv", "xenpv", NULL
 };
 
+static const char *blacklist_m68k[] = {
+    "q800", NULL
+};
+
 static const struct {
     const char *arch;
     const char **machine;
 } blacklists[] = {
     { "i386", blacklist_x86 },
     { "x86_64", blacklist_x86 },
+    { "m68k", blacklist_m68k },
 };
 
 static bool is_blacklisted(const char *arch, const char *mach)
diff --git a/tests/test-hmp.c b/tests/test-hmp.c
index 5352c9c088..f3b79d5bdf 100644
--- a/tests/test-hmp.c
+++ b/tests/test-hmp.c
@@ -139,7 +139,8 @@  static void add_machine_test_case(const char *mname)
     char *path;
 
     /* Ignore blacklisted machines that have known problems */
-    if (!strcmp("xenfv", mname) || !strcmp("xenpv", mname)) {
+    if (!strcmp("xenfv", mname) || !strcmp("xenpv", mname) ||
+        !strcmp("q800", mname)) {
         return;
     }