2019-10-26 18:45:45 +02:00
|
|
|
/*
|
|
|
|
* 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 "qemu/units.h"
|
|
|
|
#include "qemu-common.h"
|
|
|
|
#include "sysemu/sysemu.h"
|
|
|
|
#include "cpu.h"
|
|
|
|
#include "hw/hw.h"
|
|
|
|
#include "hw/boards.h"
|
|
|
|
#include "hw/irq.h"
|
|
|
|
#include "elf.h"
|
|
|
|
#include "hw/loader.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/nubus/mac-nubus-bridge.h"
|
|
|
|
#include "hw/display/macfb.h"
|
|
|
|
#include "hw/block/swim.h"
|
|
|
|
#include "net/net.h"
|
|
|
|
#include "qapi/error.h"
|
|
|
|
#include "sysemu/qtest.h"
|
|
|
|
#include "sysemu/runstate.h"
|
|
|
|
#include "sysemu/reset.h"
|
|
|
|
|
2020-01-02 13:01:50 +01:00
|
|
|
#define MACROM_ADDR 0x40800000
|
2019-10-26 18:45:45 +02:00
|
|
|
#define MACROM_SIZE 0x00100000
|
|
|
|
|
|
|
|
#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
|
|
|
|
|
2019-11-04 11:15:13 +01:00
|
|
|
#define IO_BASE 0x50000000
|
|
|
|
#define IO_SLICE 0x00040000
|
|
|
|
#define IO_SIZE 0x04000000
|
|
|
|
|
|
|
|
#define VIA_BASE (IO_BASE + 0x00000)
|
|
|
|
#define SONIC_PROM_BASE (IO_BASE + 0x08000)
|
|
|
|
#define SONIC_BASE (IO_BASE + 0x0a000)
|
|
|
|
#define SCC_BASE (IO_BASE + 0x0c020)
|
|
|
|
#define ESP_BASE (IO_BASE + 0x10000)
|
|
|
|
#define ESP_PDMA (IO_BASE + 0x10100)
|
|
|
|
#define ASC_BASE (IO_BASE + 0x14000)
|
|
|
|
#define SWIM_BASE (IO_BASE + 0x1E000)
|
|
|
|
|
2019-10-26 18:45:45 +02:00
|
|
|
#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
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The GLUE (General Logic Unit) is an Apple custom integrated circuit chip
|
|
|
|
* that performs a variety of functions (RAM management, clock generation, ...).
|
|
|
|
* The GLUE chip receives interrupt requests from various devices,
|
|
|
|
* assign priority to each, and asserts one or more interrupt line to the
|
|
|
|
* CPU.
|
|
|
|
*/
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
M68kCPU *cpu;
|
|
|
|
uint8_t ipr;
|
|
|
|
} GLUEState;
|
|
|
|
|
|
|
|
static void GLUE_set_irq(void *opaque, int irq, int level)
|
|
|
|
{
|
|
|
|
GLUEState *s = opaque;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2020-01-02 13:01:50 +01:00
|
|
|
static uint8_t fake_mac_rom[] = {
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
|
|
|
/* offset: 0xa - mac_reset */
|
|
|
|
|
|
|
|
/* via2[vDirB] |= VIA2B_vPower */
|
|
|
|
0x20, 0x7C, 0x50, 0xF0, 0x24, 0x00, /* moveal VIA2_BASE+vDirB,%a0 */
|
|
|
|
0x10, 0x10, /* moveb %a0@,%d0 */
|
|
|
|
0x00, 0x00, 0x00, 0x04, /* orib #4,%d0 */
|
|
|
|
0x10, 0x80, /* moveb %d0,%a0@ */
|
|
|
|
|
|
|
|
/* via2[vBufB] &= ~VIA2B_vPower */
|
|
|
|
0x20, 0x7C, 0x50, 0xF0, 0x20, 0x00, /* moveal VIA2_BASE+vBufB,%a0 */
|
|
|
|
0x10, 0x10, /* moveb %a0@,%d0 */
|
|
|
|
0x02, 0x00, 0xFF, 0xFB, /* andib #-5,%d0 */
|
|
|
|
0x10, 0x80, /* moveb %d0,%a0@ */
|
|
|
|
|
|
|
|
/* while (true) ; */
|
|
|
|
0x60, 0xFE /* bras [self] */
|
|
|
|
};
|
|
|
|
|
2019-10-26 18:45:45 +02:00
|
|
|
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;
|
2019-11-04 11:15:13 +01:00
|
|
|
MemoryRegion *io;
|
|
|
|
const int io_slice_nb = (IO_SIZE / IO_SLICE) - 1;
|
|
|
|
int i;
|
2019-10-26 18:45:45 +02:00
|
|
|
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;
|
|
|
|
hwaddr parameters_base;
|
|
|
|
CPUState *cs;
|
|
|
|
DeviceState *dev;
|
|
|
|
DeviceState *via_dev;
|
|
|
|
SysBusESPState *sysbus_esp;
|
|
|
|
ESPState *esp;
|
|
|
|
SysBusDevice *sysbus;
|
|
|
|
BusState *adb_bus;
|
|
|
|
NubusBus *nubus;
|
|
|
|
GLUEState *irq;
|
|
|
|
qemu_irq *pic;
|
2019-12-19 21:14:39 +01:00
|
|
|
DriveInfo *dinfo;
|
2019-10-26 18:45:45 +02:00
|
|
|
|
|
|
|
linux_boot = (kernel_filename != NULL);
|
|
|
|
|
|
|
|
if (ram_size > 1 * GiB) {
|
|
|
|
error_report("Too much memory for this machine: %" PRId64 " MiB, "
|
|
|
|
"maximum 1024 MiB", ram_size / MiB);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* init CPUs */
|
|
|
|
cpu = M68K_CPU(cpu_create(machine->cpu_type));
|
|
|
|
qemu_register_reset(main_cpu_reset, cpu);
|
|
|
|
|
2019-11-04 11:15:13 +01:00
|
|
|
/* RAM */
|
2020-02-19 17:09:21 +01:00
|
|
|
memory_region_add_subregion(get_system_memory(), 0, machine->ram);
|
2019-10-26 18:45:45 +02:00
|
|
|
|
2019-11-04 11:15:13 +01:00
|
|
|
/*
|
|
|
|
* Memory from IO_BASE to IO_BASE + IO_SLICE is repeated
|
|
|
|
* from IO_BASE + IO_SLICE to IO_BASE + IO_SIZE
|
|
|
|
*/
|
|
|
|
io = g_new(MemoryRegion, io_slice_nb);
|
|
|
|
for (i = 0; i < io_slice_nb; i++) {
|
|
|
|
char *name = g_strdup_printf("mac_m68k.io[%d]", i + 1);
|
|
|
|
|
|
|
|
memory_region_init_alias(&io[i], NULL, name, get_system_memory(),
|
|
|
|
IO_BASE, IO_SLICE);
|
|
|
|
memory_region_add_subregion(get_system_memory(),
|
|
|
|
IO_BASE + (i + 1) * IO_SLICE, &io[i]);
|
|
|
|
g_free(name);
|
|
|
|
}
|
|
|
|
|
2019-10-26 18:45:45 +02:00
|
|
|
/* IRQ Glue */
|
|
|
|
|
|
|
|
irq = g_new0(GLUEState, 1);
|
|
|
|
irq->cpu = cpu;
|
|
|
|
pic = qemu_allocate_irqs(GLUE_set_irq, irq, 8);
|
|
|
|
|
|
|
|
/* VIA */
|
|
|
|
|
qdev: Convert uses of qdev_create() with Coccinelle
This is the transformation explained in the commit before previous.
Takes care of just one pattern that needs conversion. More to come in
this series.
Coccinelle script:
@ depends on !(file in "hw/arm/highbank.c")@
expression bus, type_name, dev, expr;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr;
identifier DOWN;
@@
- dev = DOWN(qdev_create(bus, type_name));
+ dev = DOWN(qdev_new(type_name));
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize_and_unref(DEVICE(dev), bus, &error_fatal);
@@
expression bus, type_name, expr;
identifier dev;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr, errp;
symbol true;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
@@
expression bus, type_name, expr, errp;
identifier dev;
symbol true;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
The first rule exempts hw/arm/highbank.c, because it matches along two
control flow paths there, with different @type_name. Covered by the
next commit's manual conversions.
Missing #include "qapi/error.h" added manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-10-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:31:58 +02:00
|
|
|
via_dev = qdev_new(TYPE_MAC_VIA);
|
2019-12-19 21:14:39 +01:00
|
|
|
dinfo = drive_get(IF_MTD, 0, 0);
|
|
|
|
if (dinfo) {
|
qdev: Make qdev_prop_set_drive() match the other helpers
qdev_prop_set_drive() can fail. None of the other qdev_prop_set_FOO()
can; they abort on error.
To clean up this inconsistency, rename qdev_prop_set_drive() to
qdev_prop_set_drive_err(), and create a qdev_prop_set_drive() that
aborts on error.
Coccinelle script to update callers:
@ depends on !(file in "hw/core/qdev-properties-system.c")@
expression dev, name, value;
symbol error_abort;
@@
- qdev_prop_set_drive(dev, name, value, &error_abort);
+ qdev_prop_set_drive(dev, name, value);
@@
expression dev, name, value, errp;
@@
- qdev_prop_set_drive(dev, name, value, errp);
+ qdev_prop_set_drive_err(dev, name, value, errp);
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200622094227.1271650-14-armbru@redhat.com>
2020-06-22 11:42:24 +02:00
|
|
|
qdev_prop_set_drive(via_dev, "drive", blk_by_legacy_dinfo(dinfo));
|
2019-12-19 21:14:39 +01:00
|
|
|
}
|
2019-10-26 18:45:45 +02:00
|
|
|
sysbus = SYS_BUS_DEVICE(via_dev);
|
sysbus: Convert to sysbus_realize() etc. with Coccinelle
Convert from qdev_realize(), qdev_realize_and_unref() with null @bus
argument to sysbus_realize(), sysbus_realize_and_unref().
Coccinelle script:
@@
expression dev, errp;
@@
- qdev_realize(DEVICE(dev), NULL, errp);
+ sysbus_realize(SYS_BUS_DEVICE(dev), errp);
@@
expression sysbus_dev, dev, errp;
@@
+ sysbus_dev = SYS_BUS_DEVICE(dev);
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
- sysbus_dev = SYS_BUS_DEVICE(dev);
@@
expression sysbus_dev, dev, errp;
expression expr;
@@
sysbus_dev = SYS_BUS_DEVICE(dev);
... when != dev = expr;
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(DEVICE(dev), NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
Whitespace changes minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-46-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:32:34 +02:00
|
|
|
sysbus_realize_and_unref(sysbus, &error_fatal);
|
2019-10-26 18:45:45 +02:00
|
|
|
sysbus_mmio_map(sysbus, 0, VIA_BASE);
|
|
|
|
qdev_connect_gpio_out_named(DEVICE(sysbus), "irq", 0, pic[0]);
|
|
|
|
qdev_connect_gpio_out_named(DEVICE(sysbus), "irq", 1, pic[1]);
|
|
|
|
|
|
|
|
|
|
|
|
adb_bus = qdev_get_child_bus(via_dev, "adb.0");
|
qdev: Convert uses of qdev_create() with Coccinelle
This is the transformation explained in the commit before previous.
Takes care of just one pattern that needs conversion. More to come in
this series.
Coccinelle script:
@ depends on !(file in "hw/arm/highbank.c")@
expression bus, type_name, dev, expr;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr;
identifier DOWN;
@@
- dev = DOWN(qdev_create(bus, type_name));
+ dev = DOWN(qdev_new(type_name));
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize_and_unref(DEVICE(dev), bus, &error_fatal);
@@
expression bus, type_name, expr;
identifier dev;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr, errp;
symbol true;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
@@
expression bus, type_name, expr, errp;
identifier dev;
symbol true;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
The first rule exempts hw/arm/highbank.c, because it matches along two
control flow paths there, with different @type_name. Covered by the
next commit's manual conversions.
Missing #include "qapi/error.h" added manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-10-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:31:58 +02:00
|
|
|
dev = qdev_new(TYPE_ADB_KEYBOARD);
|
|
|
|
qdev_realize_and_unref(dev, adb_bus, &error_fatal);
|
|
|
|
dev = qdev_new(TYPE_ADB_MOUSE);
|
|
|
|
qdev_realize_and_unref(dev, adb_bus, &error_fatal);
|
2019-10-26 18:45:45 +02:00
|
|
|
|
|
|
|
/* MACSONIC */
|
|
|
|
|
|
|
|
if (nb_nics > 1) {
|
|
|
|
error_report("q800 can only have one ethernet interface");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
qemu_check_nic_model(&nd_table[0], "dp83932");
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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;
|
|
|
|
|
qdev: Convert uses of qdev_create() with Coccinelle
This is the transformation explained in the commit before previous.
Takes care of just one pattern that needs conversion. More to come in
this series.
Coccinelle script:
@ depends on !(file in "hw/arm/highbank.c")@
expression bus, type_name, dev, expr;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr;
identifier DOWN;
@@
- dev = DOWN(qdev_create(bus, type_name));
+ dev = DOWN(qdev_new(type_name));
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize_and_unref(DEVICE(dev), bus, &error_fatal);
@@
expression bus, type_name, expr;
identifier dev;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr, errp;
symbol true;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
@@
expression bus, type_name, expr, errp;
identifier dev;
symbol true;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
The first rule exempts hw/arm/highbank.c, because it matches along two
control flow paths there, with different @type_name. Covered by the
next commit's manual conversions.
Missing #include "qapi/error.h" added manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-10-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:31:58 +02:00
|
|
|
dev = qdev_new("dp8393x");
|
2019-10-26 18:45:45 +02:00
|
|
|
qdev_set_nic_properties(dev, &nd_table[0]);
|
|
|
|
qdev_prop_set_uint8(dev, "it_shift", 2);
|
|
|
|
qdev_prop_set_bit(dev, "big_endian", true);
|
qom: Put name parameter before value / visitor parameter
The object_property_set_FOO() setters take property name and value in
an unusual order:
void object_property_set_FOO(Object *obj, FOO_TYPE value,
const char *name, Error **errp)
Having to pass value before name feels grating. Swap them.
Same for object_property_set(), object_property_get(), and
object_property_parse().
Convert callers with this Coccinelle script:
@@
identifier fun = {
object_property_get, object_property_parse, object_property_set_str,
object_property_set_link, object_property_set_bool,
object_property_set_int, object_property_set_uint, object_property_set,
object_property_set_qobject
};
expression obj, v, name, errp;
@@
- fun(obj, v, name, errp)
+ fun(obj, name, v, errp)
Chokes on hw/arm/musicpal.c's lcd_refresh() with the unhelpful error
message "no position information". Convert that one manually.
Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.
Fails to convert hw/rx/rx-gdbsim.c, because Coccinelle gets confused
by RXCPU being used both as typedef and function-like macro there.
Convert manually. The other files using RXCPU that way don't need
conversion.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-27-armbru@redhat.com>
[Straightforwad conflict with commit 2336172d9b "audio: set default
value for pcspk.iobase property" resolved]
2020-07-07 18:05:54 +02:00
|
|
|
object_property_set_link(OBJECT(dev), "dma_mr",
|
|
|
|
OBJECT(get_system_memory()), &error_abort);
|
2019-10-26 18:45:45 +02:00
|
|
|
sysbus = SYS_BUS_DEVICE(dev);
|
sysbus: Convert to sysbus_realize() etc. with Coccinelle
Convert from qdev_realize(), qdev_realize_and_unref() with null @bus
argument to sysbus_realize(), sysbus_realize_and_unref().
Coccinelle script:
@@
expression dev, errp;
@@
- qdev_realize(DEVICE(dev), NULL, errp);
+ sysbus_realize(SYS_BUS_DEVICE(dev), errp);
@@
expression sysbus_dev, dev, errp;
@@
+ sysbus_dev = SYS_BUS_DEVICE(dev);
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
- sysbus_dev = SYS_BUS_DEVICE(dev);
@@
expression sysbus_dev, dev, errp;
expression expr;
@@
sysbus_dev = SYS_BUS_DEVICE(dev);
... when != dev = expr;
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(DEVICE(dev), NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
Whitespace changes minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-46-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:32:34 +02:00
|
|
|
sysbus_realize_and_unref(sysbus, &error_fatal);
|
2019-10-26 18:45:45 +02:00
|
|
|
sysbus_mmio_map(sysbus, 0, SONIC_BASE);
|
|
|
|
sysbus_mmio_map(sysbus, 1, SONIC_PROM_BASE);
|
|
|
|
sysbus_connect_irq(sysbus, 0, pic[2]);
|
|
|
|
|
|
|
|
/* SCC */
|
|
|
|
|
qdev: Convert uses of qdev_create() with Coccinelle
This is the transformation explained in the commit before previous.
Takes care of just one pattern that needs conversion. More to come in
this series.
Coccinelle script:
@ depends on !(file in "hw/arm/highbank.c")@
expression bus, type_name, dev, expr;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr;
identifier DOWN;
@@
- dev = DOWN(qdev_create(bus, type_name));
+ dev = DOWN(qdev_new(type_name));
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize_and_unref(DEVICE(dev), bus, &error_fatal);
@@
expression bus, type_name, expr;
identifier dev;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr, errp;
symbol true;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
@@
expression bus, type_name, expr, errp;
identifier dev;
symbol true;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
The first rule exempts hw/arm/highbank.c, because it matches along two
control flow paths there, with different @type_name. Covered by the
next commit's manual conversions.
Missing #include "qapi/error.h" added manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-10-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:31:58 +02:00
|
|
|
dev = qdev_new(TYPE_ESCC);
|
2019-10-26 18:45:45 +02:00
|
|
|
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);
|
|
|
|
sysbus = SYS_BUS_DEVICE(dev);
|
sysbus: Convert to sysbus_realize() etc. with Coccinelle
Convert from qdev_realize(), qdev_realize_and_unref() with null @bus
argument to sysbus_realize(), sysbus_realize_and_unref().
Coccinelle script:
@@
expression dev, errp;
@@
- qdev_realize(DEVICE(dev), NULL, errp);
+ sysbus_realize(SYS_BUS_DEVICE(dev), errp);
@@
expression sysbus_dev, dev, errp;
@@
+ sysbus_dev = SYS_BUS_DEVICE(dev);
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
- sysbus_dev = SYS_BUS_DEVICE(dev);
@@
expression sysbus_dev, dev, errp;
expression expr;
@@
sysbus_dev = SYS_BUS_DEVICE(dev);
... when != dev = expr;
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(DEVICE(dev), NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
Whitespace changes minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-46-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:32:34 +02:00
|
|
|
sysbus_realize_and_unref(sysbus, &error_fatal);
|
2019-10-26 18:45:45 +02:00
|
|
|
sysbus_connect_irq(sysbus, 0, pic[3]);
|
|
|
|
sysbus_connect_irq(sysbus, 1, pic[3]);
|
|
|
|
sysbus_mmio_map(sysbus, 0, SCC_BASE);
|
|
|
|
|
|
|
|
/* SCSI */
|
|
|
|
|
qdev: Convert uses of qdev_create() with Coccinelle
This is the transformation explained in the commit before previous.
Takes care of just one pattern that needs conversion. More to come in
this series.
Coccinelle script:
@ depends on !(file in "hw/arm/highbank.c")@
expression bus, type_name, dev, expr;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr;
identifier DOWN;
@@
- dev = DOWN(qdev_create(bus, type_name));
+ dev = DOWN(qdev_new(type_name));
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize_and_unref(DEVICE(dev), bus, &error_fatal);
@@
expression bus, type_name, expr;
identifier dev;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr, errp;
symbol true;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
@@
expression bus, type_name, expr, errp;
identifier dev;
symbol true;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
The first rule exempts hw/arm/highbank.c, because it matches along two
control flow paths there, with different @type_name. Covered by the
next commit's manual conversions.
Missing #include "qapi/error.h" added manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-10-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:31:58 +02:00
|
|
|
dev = qdev_new(TYPE_ESP);
|
2019-10-26 18:45:45 +02:00
|
|
|
sysbus_esp = ESP_STATE(dev);
|
|
|
|
esp = &sysbus_esp->esp;
|
|
|
|
esp->dma_memory_read = NULL;
|
|
|
|
esp->dma_memory_write = NULL;
|
|
|
|
esp->dma_opaque = NULL;
|
|
|
|
sysbus_esp->it_shift = 4;
|
|
|
|
esp->dma_enabled = 1;
|
|
|
|
|
|
|
|
sysbus = SYS_BUS_DEVICE(dev);
|
sysbus: Convert to sysbus_realize() etc. with Coccinelle
Convert from qdev_realize(), qdev_realize_and_unref() with null @bus
argument to sysbus_realize(), sysbus_realize_and_unref().
Coccinelle script:
@@
expression dev, errp;
@@
- qdev_realize(DEVICE(dev), NULL, errp);
+ sysbus_realize(SYS_BUS_DEVICE(dev), errp);
@@
expression sysbus_dev, dev, errp;
@@
+ sysbus_dev = SYS_BUS_DEVICE(dev);
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
- sysbus_dev = SYS_BUS_DEVICE(dev);
@@
expression sysbus_dev, dev, errp;
expression expr;
@@
sysbus_dev = SYS_BUS_DEVICE(dev);
... when != dev = expr;
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(DEVICE(dev), NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
Whitespace changes minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-46-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:32:34 +02:00
|
|
|
sysbus_realize_and_unref(sysbus, &error_fatal);
|
2019-10-26 18:45:45 +02:00
|
|
|
sysbus_connect_irq(sysbus, 0, qdev_get_gpio_in_named(via_dev,
|
|
|
|
"via2-irq",
|
|
|
|
VIA2_IRQ_SCSI_BIT));
|
|
|
|
sysbus_connect_irq(sysbus, 1,
|
|
|
|
qdev_get_gpio_in_named(via_dev, "via2-irq",
|
|
|
|
VIA2_IRQ_SCSI_DATA_BIT));
|
|
|
|
sysbus_mmio_map(sysbus, 0, ESP_BASE);
|
|
|
|
sysbus_mmio_map(sysbus, 1, ESP_PDMA);
|
|
|
|
|
|
|
|
scsi_bus_legacy_handle_cmdline(&esp->bus);
|
|
|
|
|
|
|
|
/* SWIM floppy controller */
|
|
|
|
|
qdev: Convert uses of qdev_create() with Coccinelle
This is the transformation explained in the commit before previous.
Takes care of just one pattern that needs conversion. More to come in
this series.
Coccinelle script:
@ depends on !(file in "hw/arm/highbank.c")@
expression bus, type_name, dev, expr;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr;
identifier DOWN;
@@
- dev = DOWN(qdev_create(bus, type_name));
+ dev = DOWN(qdev_new(type_name));
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize_and_unref(DEVICE(dev), bus, &error_fatal);
@@
expression bus, type_name, expr;
identifier dev;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr, errp;
symbol true;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
@@
expression bus, type_name, expr, errp;
identifier dev;
symbol true;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
The first rule exempts hw/arm/highbank.c, because it matches along two
control flow paths there, with different @type_name. Covered by the
next commit's manual conversions.
Missing #include "qapi/error.h" added manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-10-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:31:58 +02:00
|
|
|
dev = qdev_new(TYPE_SWIM);
|
sysbus: Convert to sysbus_realize() etc. with Coccinelle
Convert from qdev_realize(), qdev_realize_and_unref() with null @bus
argument to sysbus_realize(), sysbus_realize_and_unref().
Coccinelle script:
@@
expression dev, errp;
@@
- qdev_realize(DEVICE(dev), NULL, errp);
+ sysbus_realize(SYS_BUS_DEVICE(dev), errp);
@@
expression sysbus_dev, dev, errp;
@@
+ sysbus_dev = SYS_BUS_DEVICE(dev);
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
- sysbus_dev = SYS_BUS_DEVICE(dev);
@@
expression sysbus_dev, dev, errp;
expression expr;
@@
sysbus_dev = SYS_BUS_DEVICE(dev);
... when != dev = expr;
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(DEVICE(dev), NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
Whitespace changes minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-46-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:32:34 +02:00
|
|
|
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
|
2019-10-26 18:45:45 +02:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, SWIM_BASE);
|
|
|
|
|
|
|
|
/* NuBus */
|
|
|
|
|
qdev: Convert uses of qdev_create() with Coccinelle
This is the transformation explained in the commit before previous.
Takes care of just one pattern that needs conversion. More to come in
this series.
Coccinelle script:
@ depends on !(file in "hw/arm/highbank.c")@
expression bus, type_name, dev, expr;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr;
identifier DOWN;
@@
- dev = DOWN(qdev_create(bus, type_name));
+ dev = DOWN(qdev_new(type_name));
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize_and_unref(DEVICE(dev), bus, &error_fatal);
@@
expression bus, type_name, expr;
identifier dev;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr, errp;
symbol true;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
@@
expression bus, type_name, expr, errp;
identifier dev;
symbol true;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
The first rule exempts hw/arm/highbank.c, because it matches along two
control flow paths there, with different @type_name. Covered by the
next commit's manual conversions.
Missing #include "qapi/error.h" added manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-10-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:31:58 +02:00
|
|
|
dev = qdev_new(TYPE_MAC_NUBUS_BRIDGE);
|
sysbus: Convert to sysbus_realize() etc. with Coccinelle
Convert from qdev_realize(), qdev_realize_and_unref() with null @bus
argument to sysbus_realize(), sysbus_realize_and_unref().
Coccinelle script:
@@
expression dev, errp;
@@
- qdev_realize(DEVICE(dev), NULL, errp);
+ sysbus_realize(SYS_BUS_DEVICE(dev), errp);
@@
expression sysbus_dev, dev, errp;
@@
+ sysbus_dev = SYS_BUS_DEVICE(dev);
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
- sysbus_dev = SYS_BUS_DEVICE(dev);
@@
expression sysbus_dev, dev, errp;
expression expr;
@@
sysbus_dev = SYS_BUS_DEVICE(dev);
... when != dev = expr;
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(DEVICE(dev), NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
Whitespace changes minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-46-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:32:34 +02:00
|
|
|
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
|
2019-10-26 18:45:45 +02:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, NUBUS_SUPER_SLOT_BASE);
|
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 1, NUBUS_SLOT_BASE);
|
|
|
|
|
|
|
|
nubus = MAC_NUBUS_BRIDGE(dev)->bus;
|
|
|
|
|
|
|
|
/* framebuffer in nubus slot #9 */
|
|
|
|
|
qdev: Convert uses of qdev_create() with Coccinelle
This is the transformation explained in the commit before previous.
Takes care of just one pattern that needs conversion. More to come in
this series.
Coccinelle script:
@ depends on !(file in "hw/arm/highbank.c")@
expression bus, type_name, dev, expr;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr;
identifier DOWN;
@@
- dev = DOWN(qdev_create(bus, type_name));
+ dev = DOWN(qdev_new(type_name));
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize_and_unref(DEVICE(dev), bus, &error_fatal);
@@
expression bus, type_name, expr;
identifier dev;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr, errp;
symbol true;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
@@
expression bus, type_name, expr, errp;
identifier dev;
symbol true;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
The first rule exempts hw/arm/highbank.c, because it matches along two
control flow paths there, with different @type_name. Covered by the
next commit's manual conversions.
Missing #include "qapi/error.h" added manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-10-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:31:58 +02:00
|
|
|
dev = qdev_new(TYPE_NUBUS_MACFB);
|
2019-10-26 18:45:45 +02:00
|
|
|
qdev_prop_set_uint32(dev, "width", graphic_width);
|
|
|
|
qdev_prop_set_uint32(dev, "height", graphic_height);
|
|
|
|
qdev_prop_set_uint8(dev, "depth", graphic_depth);
|
qdev: Convert uses of qdev_create() with Coccinelle
This is the transformation explained in the commit before previous.
Takes care of just one pattern that needs conversion. More to come in
this series.
Coccinelle script:
@ depends on !(file in "hw/arm/highbank.c")@
expression bus, type_name, dev, expr;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr;
identifier DOWN;
@@
- dev = DOWN(qdev_create(bus, type_name));
+ dev = DOWN(qdev_new(type_name));
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize_and_unref(DEVICE(dev), bus, &error_fatal);
@@
expression bus, type_name, expr;
identifier dev;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr, errp;
symbol true;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
@@
expression bus, type_name, expr, errp;
identifier dev;
symbol true;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
The first rule exempts hw/arm/highbank.c, because it matches along two
control flow paths there, with different @type_name. Covered by the
next commit's manual conversions.
Missing #include "qapi/error.h" added manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-10-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:31:58 +02:00
|
|
|
qdev_realize_and_unref(dev, BUS(nubus), &error_fatal);
|
2019-10-26 18:45:45 +02:00
|
|
|
|
|
|
|
cs = CPU(cpu);
|
|
|
|
if (linux_boot) {
|
|
|
|
uint64_t high;
|
|
|
|
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
|
2020-01-26 23:55:04 +01:00
|
|
|
&elf_entry, NULL, &high, NULL, 1,
|
2019-10-26 18:45:45 +02:00
|
|
|
EM_68K, 0, 0);
|
|
|
|
if (kernel_size < 0) {
|
|
|
|
error_report("could not load kernel '%s'", 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);
|
|
|
|
|
2020-01-02 13:01:50 +01:00
|
|
|
rom = g_malloc(sizeof(*rom));
|
|
|
|
memory_region_init_ram_ptr(rom, NULL, "m68k_fake_mac.rom",
|
|
|
|
sizeof(fake_mac_rom), fake_mac_rom);
|
|
|
|
memory_region_set_readonly(rom, true);
|
|
|
|
memory_region_add_subregion(get_system_memory(), MACROM_ADDR, rom);
|
|
|
|
|
2019-10-26 18:45:45 +02:00
|
|
|
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) {
|
|
|
|
error_report("could not load initial ram disk '%s'",
|
|
|
|
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));
|
2020-02-24 19:51:23 +01:00
|
|
|
memory_region_init_rom(rom, NULL, "m68k_mac.rom", MACROM_SIZE,
|
2019-10-26 18:45:45 +02:00
|
|
|
&error_abort);
|
|
|
|
if (bios_name == NULL) {
|
|
|
|
bios_name = MACROM_FILENAME;
|
|
|
|
}
|
|
|
|
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Remove qtest_enabled() check once firmware files are in the tree */
|
|
|
|
if (!qtest_enabled()) {
|
|
|
|
if (bios_size < 0 || bios_size > MACROM_SIZE) {
|
|
|
|
error_report("could not load MacROM '%s'", bios_name);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
ptr = rom_ptr(MACROM_ADDR, MACROM_SIZE);
|
|
|
|
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_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
mc->desc = "Macintosh Quadra 800";
|
|
|
|
mc->init = q800_init;
|
|
|
|
mc->default_cpu_type = M68K_CPU_TYPE_NAME("m68040");
|
|
|
|
mc->max_cpus = 1;
|
|
|
|
mc->block_default_type = IF_SCSI;
|
2020-02-19 17:09:21 +01:00
|
|
|
mc->default_ram_id = "m68k_mac.ram";
|
2019-10-26 18:45:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static const TypeInfo q800_machine_typeinfo = {
|
|
|
|
.name = MACHINE_TYPE_NAME("q800"),
|
|
|
|
.parent = TYPE_MACHINE,
|
|
|
|
.class_init = q800_machine_class_init,
|
|
|
|
};
|
|
|
|
|
|
|
|
static void q800_machine_register_types(void)
|
|
|
|
{
|
|
|
|
type_register_static(&q800_machine_typeinfo);
|
|
|
|
}
|
|
|
|
|
|
|
|
type_init(q800_machine_register_types)
|