2004-10-01 00:13:50 +02:00
|
|
|
/*
|
2007-12-28 21:59:23 +01:00
|
|
|
* QEMU Sun4m & Sun4d & Sun4c System Emulator
|
2007-09-16 23:08:06 +02:00
|
|
|
*
|
2005-04-06 22:43:37 +02:00
|
|
|
* Copyright (c) 2003-2005 Fabrice Bellard
|
2007-09-16 23:08:06 +02:00
|
|
|
*
|
2004-10-01 00:13:50 +02:00
|
|
|
* 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.
|
|
|
|
*/
|
2019-08-12 07:23:38 +02:00
|
|
|
|
2016-01-26 19:16:59 +01:00
|
|
|
#include "qemu/osdep.h"
|
2018-06-25 14:42:10 +02:00
|
|
|
#include "qemu/units.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 09:01:28 +01:00
|
|
|
#include "qapi/error.h"
|
2020-10-28 12:36:57 +01:00
|
|
|
#include "qemu/datadir.h"
|
2016-01-19 21:51:44 +01:00
|
|
|
#include "qemu-common.h"
|
|
|
|
#include "cpu.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/sysbus.h"
|
2013-10-15 22:03:04 +02:00
|
|
|
#include "qemu/error-report.h"
|
2012-12-17 18:20:00 +01:00
|
|
|
#include "qemu/timer.h"
|
2018-01-08 19:16:34 +01:00
|
|
|
#include "hw/sparc/sun4m_iommu.h"
|
2019-10-04 01:03:54 +02:00
|
|
|
#include "hw/rtc/m48t59.h"
|
2019-08-12 07:23:45 +02:00
|
|
|
#include "migration/vmstate.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/sparc/sparc32_dma.h"
|
|
|
|
#include "hw/block/fdc.h"
|
2019-08-12 07:23:38 +02:00
|
|
|
#include "sysemu/reset.h"
|
2019-08-12 07:23:59 +02:00
|
|
|
#include "sysemu/runstate.h"
|
2012-12-17 18:20:04 +01:00
|
|
|
#include "sysemu/sysemu.h"
|
2012-10-24 08:43:34 +02:00
|
|
|
#include "net/net.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/boards.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/scsi/esp.h"
|
2016-10-18 22:46:44 +02:00
|
|
|
#include "hw/nvram/sun_nvram.h"
|
2019-08-12 07:23:51 +02:00
|
|
|
#include "hw/qdev-properties.h"
|
2016-10-18 22:46:41 +02:00
|
|
|
#include "hw/nvram/chrp_nvram.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/nvram/fw_cfg.h"
|
|
|
|
#include "hw/char/escc.h"
|
2019-06-24 17:17:32 +02:00
|
|
|
#include "hw/misc/empty_slot.h"
|
2018-10-01 22:27:22 +02:00
|
|
|
#include "hw/misc/unimp.h"
|
2019-08-12 07:23:42 +02:00
|
|
|
#include "hw/irq.h"
|
2020-12-19 12:19:34 +01:00
|
|
|
#include "hw/or-irq.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/loader.h"
|
2009-09-20 16:58:02 +02:00
|
|
|
#include "elf.h"
|
2010-10-31 10:24:14 +01:00
|
|
|
#include "trace.h"
|
2020-09-03 22:43:22 +02:00
|
|
|
#include "qom/object.h"
|
2004-10-01 00:13:50 +02:00
|
|
|
|
2007-04-01 17:44:43 +02:00
|
|
|
/*
|
|
|
|
* Sun4m architecture was used in the following machines:
|
|
|
|
*
|
|
|
|
* SPARCserver 6xxMP/xx
|
2008-05-12 18:13:33 +02:00
|
|
|
* SPARCclassic (SPARCclassic Server)(SPARCstation LC) (4/15),
|
|
|
|
* SPARCclassic X (4/10)
|
2007-04-01 17:44:43 +02:00
|
|
|
* SPARCstation LX/ZX (4/30)
|
|
|
|
* SPARCstation Voyager
|
|
|
|
* SPARCstation 10/xx, SPARCserver 10/xx
|
|
|
|
* SPARCstation 5, SPARCserver 5
|
|
|
|
* SPARCstation 20/xx, SPARCserver 20
|
|
|
|
* SPARCstation 4
|
|
|
|
*
|
|
|
|
* See for example: http://www.sunhelp.org/faq/sunref1.html
|
|
|
|
*/
|
|
|
|
|
2004-10-01 00:13:50 +02:00
|
|
|
#define KERNEL_LOAD_ADDR 0x00004000
|
2005-03-01 22:51:04 +01:00
|
|
|
#define CMDLINE_ADDR 0x007ff000
|
2005-02-22 20:08:41 +01:00
|
|
|
#define INITRD_LOAD_ADDR 0x00800000
|
2018-06-25 14:42:10 +02:00
|
|
|
#define PROM_SIZE_MAX (1 * MiB)
|
2007-09-24 21:44:09 +02:00
|
|
|
#define PROM_VADDR 0xffd00000
|
2007-10-06 13:28:21 +02:00
|
|
|
#define PROM_FILENAME "openbios-sparc32"
|
2008-09-18 20:27:29 +02:00
|
|
|
#define CFG_ADDR 0xd00000510ULL
|
2008-09-18 20:34:28 +02:00
|
|
|
#define FW_CFG_SUN4M_DEPTH (FW_CFG_ARCH_LOCAL + 0x00)
|
2013-07-26 22:42:51 +02:00
|
|
|
#define FW_CFG_SUN4M_WIDTH (FW_CFG_ARCH_LOCAL + 0x01)
|
|
|
|
#define FW_CFG_SUN4M_HEIGHT (FW_CFG_ARCH_LOCAL + 0x02)
|
2006-09-10 21:25:12 +02:00
|
|
|
|
2005-12-05 21:31:52 +01:00
|
|
|
#define MAX_CPUS 16
|
2007-05-27 18:42:29 +02:00
|
|
|
#define MAX_PILS 16
|
2010-07-13 18:05:24 +02:00
|
|
|
#define MAX_VSIMMS 4
|
2004-10-01 00:13:50 +02:00
|
|
|
|
2009-01-12 18:38:28 +01:00
|
|
|
#define ESCC_CLOCK 4915200
|
|
|
|
|
2008-10-27 16:56:56 +01:00
|
|
|
struct sun4m_hwdef {
|
2012-10-23 12:30:10 +02:00
|
|
|
hwaddr iommu_base, iommu_pad_base, iommu_pad_len, slavio_base;
|
|
|
|
hwaddr intctl_base, counter_base, nvram_base, ms_kb_base;
|
|
|
|
hwaddr serial_base, fd_base;
|
|
|
|
hwaddr afx_base, idreg_base, dma_base, esp_base, le_base;
|
|
|
|
hwaddr tcx_base, cs_base, apc_base, aux1_base, aux2_base;
|
|
|
|
hwaddr bpp_base, dbri_base, sx_base;
|
2010-07-13 18:05:24 +02:00
|
|
|
struct {
|
2012-10-23 12:30:10 +02:00
|
|
|
hwaddr reg_base, vram_base;
|
2010-07-13 18:05:24 +02:00
|
|
|
} vsimm[MAX_VSIMMS];
|
2012-10-23 12:30:10 +02:00
|
|
|
hwaddr ecc_base;
|
2007-11-28 21:54:33 +01:00
|
|
|
uint64_t max_mem;
|
sun4m: avoid structure holes spotted by pahole
Edited report from pahole on amd64 host:
struct sun4c_hwdef {
...
uint8_t nvram_machine_id; /* 112 1 */
/* XXX 1 byte hole, try to pack */
...
/* size: 136, cachelines: 3 */
/* sum members: 135, holes: 1, sum holes: 1 */
/* last cacheline: 8 bytes */
}; /* definitions: 1 */
struct sun4d_hwdef {
...
uint8_t nvram_machine_id; /* 128 1 */
/* XXX 1 byte hole, try to pack */
...
/* size: 152, cachelines: 3 */
/* sum members: 151, holes: 1, sum holes: 1 */
/* last cacheline: 24 bytes */
}; /* definitions: 1 */
struct sun4m_hwdef {
...
uint8_t nvram_machine_id; /* 260 1 */
/* XXX 1 byte hole, try to pack */
uint16_t machine_id; /* 262 2 */
uint32_t iommu_version; /* 264 4 */
/* XXX 4 bytes hole, try to pack */
...
/* size: 288, cachelines: 5 */
/* sum members: 283, holes: 2, sum holes: 5 */
/* last cacheline: 32 bytes */
}; /* definitions: 1 */
Fix by rearranging the structures to avoid padding.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2011-08-07 21:22:46 +02:00
|
|
|
uint32_t ecc_version;
|
|
|
|
uint32_t iommu_version;
|
|
|
|
uint16_t machine_id;
|
|
|
|
uint8_t nvram_machine_id;
|
2007-04-01 17:44:43 +02:00
|
|
|
};
|
|
|
|
|
2021-05-03 19:12:59 +02:00
|
|
|
struct Sun4mMachineClass {
|
|
|
|
/*< private >*/
|
|
|
|
MachineClass parent_obj;
|
|
|
|
/*< public >*/
|
|
|
|
const struct sun4m_hwdef *hwdef;
|
|
|
|
};
|
|
|
|
typedef struct Sun4mMachineClass Sun4mMachineClass;
|
|
|
|
|
2021-05-03 19:12:58 +02:00
|
|
|
#define TYPE_SUN4M_MACHINE MACHINE_TYPE_NAME("sun4m-common")
|
2021-05-03 19:12:59 +02:00
|
|
|
DECLARE_CLASS_CHECKERS(Sun4mMachineClass, SUN4M_MACHINE, TYPE_SUN4M_MACHINE)
|
2021-05-03 19:12:58 +02:00
|
|
|
|
2019-04-22 15:51:17 +02:00
|
|
|
const char *fw_cfg_arch_key_name(uint16_t key)
|
|
|
|
{
|
|
|
|
static const struct {
|
|
|
|
uint16_t key;
|
|
|
|
const char *name;
|
|
|
|
} fw_cfg_arch_wellknown_keys[] = {
|
|
|
|
{FW_CFG_SUN4M_DEPTH, "depth"},
|
|
|
|
{FW_CFG_SUN4M_WIDTH, "width"},
|
|
|
|
{FW_CFG_SUN4M_HEIGHT, "height"},
|
|
|
|
};
|
|
|
|
|
|
|
|
for (size_t i = 0; i < ARRAY_SIZE(fw_cfg_arch_wellknown_keys); i++) {
|
|
|
|
if (fw_cfg_arch_wellknown_keys[i].key == key) {
|
|
|
|
return fw_cfg_arch_wellknown_keys[i].name;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2014-12-03 20:04:02 +01:00
|
|
|
static void fw_cfg_boot_set(void *opaque, const char *boot_device,
|
|
|
|
Error **errp)
|
2008-06-20 18:25:56 +02:00
|
|
|
{
|
2015-06-08 20:10:45 +02:00
|
|
|
fw_cfg_modify_i16(opaque, FW_CFG_BOOT_DEVICE, boot_device[0]);
|
2008-06-20 18:25:56 +02:00
|
|
|
}
|
|
|
|
|
2015-03-02 23:23:27 +01:00
|
|
|
static void nvram_init(Nvram *nvram, uint8_t *macaddr,
|
2010-02-07 09:05:03 +01:00
|
|
|
const char *cmdline, const char *boot_devices,
|
|
|
|
ram_addr_t RAM_size, uint32_t kernel_size,
|
2007-10-06 13:28:21 +02:00
|
|
|
int width, int height, int depth,
|
2008-09-18 20:33:18 +02:00
|
|
|
int nvram_machine_id, const char *arch)
|
2004-12-20 00:18:01 +01:00
|
|
|
{
|
2007-11-14 20:35:16 +01:00
|
|
|
unsigned int i;
|
2016-10-18 22:46:41 +02:00
|
|
|
int sysp_end;
|
2007-11-14 20:35:16 +01:00
|
|
|
uint8_t image[0x1ff0];
|
2015-03-02 23:23:27 +01:00
|
|
|
NvramClass *k = NVRAM_GET_CLASS(nvram);
|
2007-11-14 20:35:16 +01:00
|
|
|
|
|
|
|
memset(image, '\0', sizeof(image));
|
2004-12-20 00:18:01 +01:00
|
|
|
|
2016-10-18 22:46:41 +02:00
|
|
|
/* OpenBIOS nvram variables partition */
|
nvram: Exit QEMU if NVRAM cannot contain all -prom-env data
Since commit 61f20b9dc5b7 ("spapr_nvram: Pre-initialize the NVRAM to
support the -prom-env parameter"), pseries machines can pre-initialize
the "system" partition in the NVRAM with the data passed to all -prom-env
parameters on the QEMU command line.
In this case it is assumed that all the data fits in 64 KiB, but the user
can easily pass more and crash QEMU:
$ qemu-system-ppc64 -M pseries $(for ((x=0;x<128;x++)); do \
echo -n " -prom-env " ; printf "%0.sx" {1..1024}; \
done) # this requires ~128 Kib
malloc(): corrupted top size
Aborted (core dumped)
This happens because we don't check if all the prom-env data fits in
the NVRAM and chrp_nvram_set_var() happily memcpy() it passed the
buffer.
This crash affects basically all ppc/ppc64 machine types that use -prom-env:
- pseries (all versions)
- g3beige
- mac99
and also sparc/sparc64 machine types:
- LX
- SPARCClassic
- SPARCbook
- SS-10
- SS-20
- SS-4
- SS-5
- SS-600MP
- Voyager
- sun4u
- sun4v
Add a max_len argument to chrp_nvram_create_system_partition() so that
it can check the available size before writing to memory.
Since NVRAM is populated at machine init, it seems reasonable to consider
this error as fatal. So, instead of reporting an error when we detect that
the NVRAM is too small and adapt all machine types to handle it, we simply
exit QEMU in all cases. This is still better than crashing. If someone
wants another behavior, I guess this can be reworked later.
Tested with:
$ yes q | \
(for arch in ppc ppc64 sparc sparc64; do \
echo == $arch ==; \
qemu=${arch}-softmmu/qemu-system-$arch; \
for mach in $($qemu -M help | awk '! /^Supported/ { print $1 }'); do \
echo $mach; \
$qemu -M $mach -monitor stdio -nodefaults -nographic \
$(for ((x=0;x<128;x++)); do \
echo -n " -prom-env " ; printf "%0.sx" {1..1024}; \
done) >/dev/null; \
done; echo; \
done)
Without the patch, affected machine types cause QEMU to report some
memory corruption and crash:
malloc(): corrupted top size
free(): invalid size
*** stack smashing detected ***: terminated
With the patch, QEMU prints the following message and exits:
NVRAM is too small. Try to pass less data to -prom-env
It seems that the conditions for the crash have always existed, but it
affects pseries, the machine type I care for, since commit 61f20b9dc5b7
only.
Fixes: 61f20b9dc5b7 ("spapr_nvram: Pre-initialize the NVRAM to support the -prom-env parameter")
RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1867739
Reported-by: John Snow <jsnow@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <159736033937.350502.12402444542194031035.stgit@bahia.lan>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2020-08-14 01:12:19 +02:00
|
|
|
sysp_end = chrp_nvram_create_system_partition(image, 0, 0x1fd0);
|
2005-03-01 22:51:04 +01:00
|
|
|
|
2016-10-18 22:46:41 +02:00
|
|
|
/* Free space partition */
|
|
|
|
chrp_nvram_create_free_partition(&image[sysp_end], 0x1fd0 - sysp_end);
|
2007-11-14 20:35:16 +01:00
|
|
|
|
2008-09-18 20:33:18 +02:00
|
|
|
Sun_init_header((struct Sun_nvram *)&image[0x1fd8], macaddr,
|
|
|
|
nvram_machine_id);
|
2007-11-14 20:35:16 +01:00
|
|
|
|
2015-03-02 23:23:27 +01:00
|
|
|
for (i = 0; i < sizeof(image); i++) {
|
|
|
|
(k->write)(nvram, i, image[i]);
|
|
|
|
}
|
2004-12-20 00:18:01 +01:00
|
|
|
}
|
|
|
|
|
2012-10-12 04:23:05 +02:00
|
|
|
static void cpu_kick_irq(SPARCCPU *cpu)
|
2011-03-12 17:43:57 +01:00
|
|
|
{
|
2012-10-12 04:23:05 +02:00
|
|
|
CPUSPARCState *env = &cpu->env;
|
2013-01-17 18:51:17 +01:00
|
|
|
CPUState *cs = CPU(cpu);
|
2012-10-12 04:23:05 +02:00
|
|
|
|
2013-01-17 18:51:17 +01:00
|
|
|
cs->halted = 0;
|
2011-03-12 17:43:57 +01:00
|
|
|
cpu_check_irqs(env);
|
2013-01-17 18:51:17 +01:00
|
|
|
qemu_cpu_kick(cs);
|
2011-03-12 17:43:57 +01:00
|
|
|
}
|
|
|
|
|
2007-05-27 18:42:29 +02:00
|
|
|
static void cpu_set_irq(void *opaque, int irq, int level)
|
|
|
|
{
|
2012-10-12 04:23:04 +02:00
|
|
|
SPARCCPU *cpu = opaque;
|
|
|
|
CPUSPARCState *env = &cpu->env;
|
2007-05-27 18:42:29 +02:00
|
|
|
|
|
|
|
if (level) {
|
2010-10-31 10:24:14 +01:00
|
|
|
trace_sun4m_cpu_set_irq_raise(irq);
|
2007-08-04 12:50:30 +02:00
|
|
|
env->pil_in |= 1 << irq;
|
2012-10-12 04:23:05 +02:00
|
|
|
cpu_kick_irq(cpu);
|
2007-05-27 18:42:29 +02:00
|
|
|
} else {
|
2010-10-31 10:24:14 +01:00
|
|
|
trace_sun4m_cpu_set_irq_lower(irq);
|
2007-08-04 12:50:30 +02:00
|
|
|
env->pil_in &= ~(1 << irq);
|
|
|
|
cpu_check_irqs(env);
|
2007-05-27 18:42:29 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void dummy_cpu_set_irq(void *opaque, int irq, int level)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2020-08-26 07:55:34 +02:00
|
|
|
static void sun4m_cpu_reset(void *opaque)
|
2005-11-22 00:33:12 +01:00
|
|
|
{
|
2012-05-03 03:21:31 +02:00
|
|
|
SPARCCPU *cpu = opaque;
|
2013-01-17 18:51:17 +01:00
|
|
|
CPUState *cs = CPU(cpu);
|
2007-05-17 21:21:46 +02:00
|
|
|
|
2013-01-17 18:51:17 +01:00
|
|
|
cpu_reset(cs);
|
2007-05-17 21:21:46 +02:00
|
|
|
}
|
|
|
|
|
2008-11-02 11:51:05 +01:00
|
|
|
static void cpu_halt_signal(void *opaque, int irq, int level)
|
|
|
|
{
|
2013-05-27 05:17:50 +02:00
|
|
|
if (level && current_cpu) {
|
|
|
|
cpu_interrupt(current_cpu, CPU_INTERRUPT_HALT);
|
2013-01-18 15:03:43 +01:00
|
|
|
}
|
2008-11-02 11:51:05 +01:00
|
|
|
}
|
|
|
|
|
2010-03-14 21:20:59 +01:00
|
|
|
static uint64_t translate_kernel_address(void *opaque, uint64_t addr)
|
|
|
|
{
|
|
|
|
return addr - 0xf0000000ULL;
|
|
|
|
}
|
|
|
|
|
2007-11-28 21:54:33 +01:00
|
|
|
static unsigned long sun4m_load_kernel(const char *kernel_filename,
|
2008-05-12 19:22:13 +02:00
|
|
|
const char *initrd_filename,
|
2019-01-25 17:30:04 +01:00
|
|
|
ram_addr_t RAM_size,
|
|
|
|
uint32_t *initrd_size)
|
2007-11-28 21:54:33 +01:00
|
|
|
{
|
|
|
|
int linux_boot;
|
|
|
|
unsigned int i;
|
2019-01-25 17:30:04 +01:00
|
|
|
long kernel_size;
|
2009-10-07 13:37:06 +02:00
|
|
|
uint8_t *ptr;
|
2007-11-28 21:54:33 +01:00
|
|
|
|
|
|
|
linux_boot = (kernel_filename != NULL);
|
|
|
|
|
|
|
|
kernel_size = 0;
|
|
|
|
if (linux_boot) {
|
2009-09-20 16:58:02 +02:00
|
|
|
int bswap_needed;
|
|
|
|
|
|
|
|
#ifdef BSWAP_NEEDED
|
|
|
|
bswap_needed = 1;
|
|
|
|
#else
|
|
|
|
bswap_needed = 0;
|
|
|
|
#endif
|
2019-01-15 13:18:03 +01:00
|
|
|
kernel_size = load_elf(kernel_filename, NULL,
|
|
|
|
translate_kernel_address, NULL,
|
2020-01-26 23:55:04 +01:00
|
|
|
NULL, NULL, NULL, NULL, 1, EM_SPARC, 0, 0);
|
2007-11-28 21:54:33 +01:00
|
|
|
if (kernel_size < 0)
|
2008-05-12 19:22:13 +02:00
|
|
|
kernel_size = load_aout(kernel_filename, KERNEL_LOAD_ADDR,
|
2009-09-20 16:58:02 +02:00
|
|
|
RAM_size - KERNEL_LOAD_ADDR, bswap_needed,
|
|
|
|
TARGET_PAGE_SIZE);
|
2007-11-28 21:54:33 +01:00
|
|
|
if (kernel_size < 0)
|
2008-05-12 19:22:13 +02:00
|
|
|
kernel_size = load_image_targphys(kernel_filename,
|
|
|
|
KERNEL_LOAD_ADDR,
|
|
|
|
RAM_size - KERNEL_LOAD_ADDR);
|
2007-11-28 21:54:33 +01:00
|
|
|
if (kernel_size < 0) {
|
hw/sparc*: Replace fprintf(stderr, "*\n" with error_report()
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then
compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
Some lines where then manually tweaked to pass checkpatch.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Fabien Chouteau <chouteau@adacore.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Artyom Tarasenko <atar4qemu@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-12-armbru@redhat.com>
2018-02-03 09:43:12 +01:00
|
|
|
error_report("could not load kernel '%s'", kernel_filename);
|
2007-11-28 21:54:33 +01:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* load initrd */
|
2019-01-25 17:30:04 +01:00
|
|
|
*initrd_size = 0;
|
2007-11-28 21:54:33 +01:00
|
|
|
if (initrd_filename) {
|
2019-01-25 17:30:04 +01:00
|
|
|
*initrd_size = load_image_targphys(initrd_filename,
|
|
|
|
INITRD_LOAD_ADDR,
|
|
|
|
RAM_size - INITRD_LOAD_ADDR);
|
|
|
|
if ((int)*initrd_size < 0) {
|
hw/sparc*: Replace fprintf(stderr, "*\n" with error_report()
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then
compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
Some lines where then manually tweaked to pass checkpatch.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Fabien Chouteau <chouteau@adacore.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Artyom Tarasenko <atar4qemu@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-12-armbru@redhat.com>
2018-02-03 09:43:12 +01:00
|
|
|
error_report("could not load initial ram disk '%s'",
|
|
|
|
initrd_filename);
|
2007-11-28 21:54:33 +01:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
2019-01-25 17:30:04 +01:00
|
|
|
if (*initrd_size > 0) {
|
2007-11-28 21:54:33 +01:00
|
|
|
for (i = 0; i < 64 * TARGET_PAGE_SIZE; i += TARGET_PAGE_SIZE) {
|
2018-06-26 11:35:40 +02:00
|
|
|
ptr = rom_ptr(KERNEL_LOAD_ADDR + i, 24);
|
|
|
|
if (ptr && ldl_p(ptr) == 0x48647253) { /* HdrS */
|
2009-10-07 13:37:06 +02:00
|
|
|
stl_p(ptr + 16, INITRD_LOAD_ADDR);
|
2019-01-25 17:30:04 +01:00
|
|
|
stl_p(ptr + 20, *initrd_size);
|
2007-11-28 21:54:33 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return kernel_size;
|
|
|
|
}
|
|
|
|
|
2012-10-23 12:30:10 +02:00
|
|
|
static void *iommu_init(hwaddr addr, uint32_t version, qemu_irq irq)
|
2009-08-08 22:24:47 +02:00
|
|
|
{
|
|
|
|
DeviceState *dev;
|
|
|
|
SysBusDevice *s;
|
|
|
|
|
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_SUN4M_IOMMU);
|
2009-08-08 22:24:47 +02:00
|
|
|
qdev_prop_set_uint32(dev, "version", version);
|
2013-01-20 02:47:33 +01:00
|
|
|
s = 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(s, &error_fatal);
|
2009-08-08 22:24:47 +02:00
|
|
|
sysbus_connect_irq(s, 0, irq);
|
|
|
|
sysbus_mmio_map(s, 0, addr);
|
|
|
|
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
2017-10-14 14:22:22 +02:00
|
|
|
static void *sparc32_dma_init(hwaddr dma_base,
|
|
|
|
hwaddr esp_base, qemu_irq espdma_irq,
|
2020-09-26 16:02:14 +02:00
|
|
|
hwaddr le_base, qemu_irq ledma_irq, NICInfo *nd)
|
2009-08-08 23:43:12 +02:00
|
|
|
{
|
2017-10-14 14:22:22 +02:00
|
|
|
DeviceState *dma;
|
|
|
|
ESPDMADeviceState *espdma;
|
|
|
|
LEDMADeviceState *ledma;
|
|
|
|
SysBusESPState *esp;
|
|
|
|
SysBusPCNetState *lance;
|
2009-08-08 23:43:12 +02:00
|
|
|
|
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
|
|
|
dma = qdev_new(TYPE_SPARC32_DMA);
|
2017-10-14 14:22:22 +02:00
|
|
|
espdma = SPARC32_ESPDMA_DEVICE(object_resolve_path_component(
|
|
|
|
OBJECT(dma), "espdma"));
|
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(espdma), 0, espdma_irq);
|
|
|
|
|
2021-03-04 23:10:23 +01:00
|
|
|
esp = SYSBUS_ESP(object_resolve_path_component(OBJECT(espdma), "esp"));
|
2017-10-14 14:22:22 +02:00
|
|
|
|
|
|
|
ledma = SPARC32_LEDMA_DEVICE(object_resolve_path_component(
|
|
|
|
OBJECT(dma), "ledma"));
|
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(ledma), 0, ledma_irq);
|
|
|
|
|
|
|
|
lance = SYSBUS_PCNET(object_resolve_path_component(
|
|
|
|
OBJECT(ledma), "lance"));
|
2020-09-26 16:02:14 +02:00
|
|
|
qdev_set_nic_properties(DEVICE(lance), nd);
|
|
|
|
|
|
|
|
sysbus_realize_and_unref(SYS_BUS_DEVICE(dma), &error_fatal);
|
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(dma), 0, dma_base);
|
|
|
|
|
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(esp), 0, esp_base);
|
|
|
|
scsi_bus_legacy_handle_cmdline(&esp->esp.bus);
|
|
|
|
|
2017-10-14 14:22:22 +02:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(lance), 0, le_base);
|
|
|
|
|
|
|
|
return dma;
|
2009-08-08 23:43:12 +02:00
|
|
|
}
|
|
|
|
|
2012-10-23 12:30:10 +02:00
|
|
|
static DeviceState *slavio_intctl_init(hwaddr addr,
|
|
|
|
hwaddr addrg,
|
2009-08-25 20:29:36 +02:00
|
|
|
qemu_irq **parent_irq)
|
2009-08-08 22:24:47 +02:00
|
|
|
{
|
|
|
|
DeviceState *dev;
|
|
|
|
SysBusDevice *s;
|
|
|
|
unsigned int i, j;
|
|
|
|
|
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("slavio_intctl");
|
2009-08-08 22:24:47 +02:00
|
|
|
|
2013-01-20 02:47:33 +01:00
|
|
|
s = 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(s, &error_fatal);
|
2009-08-08 22:24:47 +02:00
|
|
|
|
|
|
|
for (i = 0; i < MAX_CPUS; i++) {
|
|
|
|
for (j = 0; j < MAX_PILS; j++) {
|
|
|
|
sysbus_connect_irq(s, i * MAX_PILS + j, parent_irq[i][j]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sysbus_mmio_map(s, 0, addrg);
|
|
|
|
for (i = 0; i < MAX_CPUS; i++) {
|
|
|
|
sysbus_mmio_map(s, i + 1, addr + i * TARGET_PAGE_SIZE);
|
|
|
|
}
|
|
|
|
|
|
|
|
return dev;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define SYS_TIMER_OFFSET 0x10000ULL
|
|
|
|
#define CPU_TIMER_OFFSET(cpu) (0x1000ULL * cpu)
|
|
|
|
|
2012-10-23 12:30:10 +02:00
|
|
|
static void slavio_timer_init_all(hwaddr addr, qemu_irq master_irq,
|
2009-08-08 22:24:47 +02:00
|
|
|
qemu_irq *cpu_irqs, unsigned int num_cpus)
|
|
|
|
{
|
|
|
|
DeviceState *dev;
|
|
|
|
SysBusDevice *s;
|
|
|
|
unsigned int i;
|
|
|
|
|
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("slavio_timer");
|
2009-08-08 22:24:47 +02:00
|
|
|
qdev_prop_set_uint32(dev, "num_cpus", num_cpus);
|
2013-01-20 02:47:33 +01:00
|
|
|
s = 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(s, &error_fatal);
|
2009-08-08 22:24:47 +02:00
|
|
|
sysbus_connect_irq(s, 0, master_irq);
|
|
|
|
sysbus_mmio_map(s, 0, addr + SYS_TIMER_OFFSET);
|
|
|
|
|
|
|
|
for (i = 0; i < MAX_CPUS; i++) {
|
2012-10-23 12:30:10 +02:00
|
|
|
sysbus_mmio_map(s, i + 1, addr + (hwaddr)CPU_TIMER_OFFSET(i));
|
2009-08-08 22:24:47 +02:00
|
|
|
sysbus_connect_irq(s, i + 1, cpu_irqs[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-05 23:06:24 +02:00
|
|
|
static qemu_irq slavio_system_powerdown;
|
|
|
|
|
|
|
|
static void slavio_powerdown_req(Notifier *n, void *opaque)
|
|
|
|
{
|
|
|
|
qemu_irq_raise(slavio_system_powerdown);
|
|
|
|
}
|
|
|
|
|
|
|
|
static Notifier slavio_system_powerdown_notifier = {
|
|
|
|
.notify = slavio_powerdown_req
|
|
|
|
};
|
|
|
|
|
2009-08-08 22:24:47 +02:00
|
|
|
#define MISC_LEDS 0x01600000
|
|
|
|
#define MISC_CFG 0x01800000
|
|
|
|
#define MISC_DIAG 0x01a00000
|
|
|
|
#define MISC_MDM 0x01b00000
|
|
|
|
#define MISC_SYS 0x01f00000
|
|
|
|
|
2012-10-23 12:30:10 +02:00
|
|
|
static void slavio_misc_init(hwaddr base,
|
|
|
|
hwaddr aux1_base,
|
|
|
|
hwaddr aux2_base, qemu_irq irq,
|
2009-08-09 09:27:29 +02:00
|
|
|
qemu_irq fdc_tc)
|
2009-08-08 22:24:47 +02:00
|
|
|
{
|
|
|
|
DeviceState *dev;
|
|
|
|
SysBusDevice *s;
|
|
|
|
|
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("slavio_misc");
|
2013-01-20 02:47:33 +01:00
|
|
|
s = 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(s, &error_fatal);
|
2009-08-08 22:24:47 +02:00
|
|
|
if (base) {
|
|
|
|
/* 8 bit registers */
|
|
|
|
/* Slavio control */
|
|
|
|
sysbus_mmio_map(s, 0, base + MISC_CFG);
|
|
|
|
/* Diagnostics */
|
|
|
|
sysbus_mmio_map(s, 1, base + MISC_DIAG);
|
|
|
|
/* Modem control */
|
|
|
|
sysbus_mmio_map(s, 2, base + MISC_MDM);
|
|
|
|
/* 16 bit registers */
|
|
|
|
/* ss600mp diag LEDs */
|
|
|
|
sysbus_mmio_map(s, 3, base + MISC_LEDS);
|
|
|
|
/* 32 bit registers */
|
|
|
|
/* System control */
|
|
|
|
sysbus_mmio_map(s, 4, base + MISC_SYS);
|
|
|
|
}
|
|
|
|
if (aux1_base) {
|
|
|
|
/* AUX 1 (Misc System Functions) */
|
|
|
|
sysbus_mmio_map(s, 5, aux1_base);
|
|
|
|
}
|
|
|
|
if (aux2_base) {
|
|
|
|
/* AUX 2 (Software Powerdown Control) */
|
|
|
|
sysbus_mmio_map(s, 6, aux2_base);
|
|
|
|
}
|
|
|
|
sysbus_connect_irq(s, 0, irq);
|
|
|
|
sysbus_connect_irq(s, 1, fdc_tc);
|
2012-09-05 23:06:24 +02:00
|
|
|
slavio_system_powerdown = qdev_get_gpio_in(dev, 0);
|
|
|
|
qemu_register_powerdown_notifier(&slavio_system_powerdown_notifier);
|
2009-08-08 22:24:47 +02:00
|
|
|
}
|
|
|
|
|
2012-10-23 12:30:10 +02:00
|
|
|
static void ecc_init(hwaddr base, qemu_irq irq, uint32_t version)
|
2009-08-08 22:24:47 +02:00
|
|
|
{
|
|
|
|
DeviceState *dev;
|
|
|
|
SysBusDevice *s;
|
|
|
|
|
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("eccmemctl");
|
2009-08-08 22:24:47 +02:00
|
|
|
qdev_prop_set_uint32(dev, "version", version);
|
2013-01-20 02:47:33 +01:00
|
|
|
s = 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(s, &error_fatal);
|
2009-08-08 22:24:47 +02:00
|
|
|
sysbus_connect_irq(s, 0, irq);
|
|
|
|
sysbus_mmio_map(s, 0, base);
|
|
|
|
if (version == 0) { // SS-600MP only
|
|
|
|
sysbus_mmio_map(s, 1, base + 0x1000);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-10-23 12:30:10 +02:00
|
|
|
static void apc_init(hwaddr power_base, qemu_irq cpu_halt)
|
2009-08-08 22:24:47 +02:00
|
|
|
{
|
|
|
|
DeviceState *dev;
|
|
|
|
SysBusDevice *s;
|
|
|
|
|
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("apc");
|
2013-01-20 02:47:33 +01:00
|
|
|
s = 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(s, &error_fatal);
|
2009-08-08 22:24:47 +02:00
|
|
|
/* Power management (APC) XXX: not a Slavio device */
|
|
|
|
sysbus_mmio_map(s, 0, power_base);
|
|
|
|
sysbus_connect_irq(s, 0, cpu_halt);
|
|
|
|
}
|
|
|
|
|
2014-09-13 11:44:07 +02:00
|
|
|
static void tcx_init(hwaddr addr, qemu_irq irq, int vram_size, int width,
|
2009-08-08 22:24:47 +02:00
|
|
|
int height, int depth)
|
|
|
|
{
|
|
|
|
DeviceState *dev;
|
|
|
|
SysBusDevice *s;
|
|
|
|
|
hw: Replace anti-social QOM type names
Several QOM type names contain ',':
ARM,bitband-memory
etraxfs,pic
etraxfs,serial
etraxfs,timer
fsl,imx25
fsl,imx31
fsl,imx6
fsl,imx6ul
fsl,imx7
grlib,ahbpnp
grlib,apbpnp
grlib,apbuart
grlib,gptimer
grlib,irqmp
qemu,register
SUNW,bpp
SUNW,CS4231
SUNW,DBRI
SUNW,DBRI.prom
SUNW,fdtwo
SUNW,sx
SUNW,tcx
xilinx,zynq_slcr
xlnx,zynqmp
xlnx,zynqmp-pmu-soc
xlnx,zynq-xadc
These are all device types. They can't be plugged with -device /
device_add, except for xlnx,zynqmp-pmu-soc, and I doubt that one
actually works.
They *can* be used with -device / device_add to request help.
Usability is poor, though: you have to double the comma, like this:
$ qemu-system-x86_64 -device SUNW,,fdtwo,help
Trap for the unwary. The fact that this was broken in
device-introspect-test for more than six years until commit e27bd49876
fixed it demonstrates that "the unwary" includes seasoned developers.
One QOM type name contains ' ': "ICH9 SMB". Because having to
remember just one way to quote would be too easy.
Rename the "SUNW,FOO types to "sun-FOO". Summarily replace ',' and '
' by '-' in the other type names.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210304140229.575481-2-armbru@redhat.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
2021-03-04 15:02:28 +01:00
|
|
|
dev = qdev_new("sun-tcx");
|
2009-08-08 22:24:47 +02:00
|
|
|
qdev_prop_set_uint32(dev, "vram_size", vram_size);
|
|
|
|
qdev_prop_set_uint16(dev, "width", width);
|
|
|
|
qdev_prop_set_uint16(dev, "height", height);
|
|
|
|
qdev_prop_set_uint16(dev, "depth", depth);
|
2013-01-20 02:47:33 +01:00
|
|
|
s = 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(s, &error_fatal);
|
2014-09-13 11:44:07 +02:00
|
|
|
|
|
|
|
/* 10/ROM : FCode ROM */
|
2013-11-02 17:03:50 +01:00
|
|
|
sysbus_mmio_map(s, 0, addr);
|
2014-09-13 11:44:07 +02:00
|
|
|
/* 2/STIP : Stipple */
|
|
|
|
sysbus_mmio_map(s, 1, addr + 0x04000000ULL);
|
|
|
|
/* 3/BLIT : Blitter */
|
|
|
|
sysbus_mmio_map(s, 2, addr + 0x06000000ULL);
|
|
|
|
/* 5/RSTIP : Raw Stipple */
|
|
|
|
sysbus_mmio_map(s, 3, addr + 0x0c000000ULL);
|
|
|
|
/* 6/RBLIT : Raw Blitter */
|
|
|
|
sysbus_mmio_map(s, 4, addr + 0x0e000000ULL);
|
|
|
|
/* 7/TEC : Transform Engine */
|
|
|
|
sysbus_mmio_map(s, 5, addr + 0x00700000ULL);
|
|
|
|
/* 8/CMAP : DAC */
|
|
|
|
sysbus_mmio_map(s, 6, addr + 0x00200000ULL);
|
|
|
|
/* 9/THC : */
|
|
|
|
if (depth == 8) {
|
|
|
|
sysbus_mmio_map(s, 7, addr + 0x00300000ULL);
|
2009-08-08 22:24:47 +02:00
|
|
|
} else {
|
2014-09-13 11:44:07 +02:00
|
|
|
sysbus_mmio_map(s, 7, addr + 0x00301000ULL);
|
2009-08-08 22:24:47 +02:00
|
|
|
}
|
2014-09-13 11:44:07 +02:00
|
|
|
/* 11/DHC : */
|
|
|
|
sysbus_mmio_map(s, 8, addr + 0x00240000ULL);
|
|
|
|
/* 12/ALT : */
|
|
|
|
sysbus_mmio_map(s, 9, addr + 0x00280000ULL);
|
|
|
|
/* 0/DFB8 : 8-bit plane */
|
|
|
|
sysbus_mmio_map(s, 10, addr + 0x00800000ULL);
|
|
|
|
/* 1/DFB24 : 24bit plane */
|
|
|
|
sysbus_mmio_map(s, 11, addr + 0x02000000ULL);
|
|
|
|
/* 4/RDFB32: Raw framebuffer. Control plane */
|
|
|
|
sysbus_mmio_map(s, 12, addr + 0x0a000000ULL);
|
|
|
|
/* 9/THC24bits : NetBSD writes here even with 8-bit display: dummy */
|
|
|
|
if (depth == 8) {
|
|
|
|
sysbus_mmio_map(s, 13, addr + 0x00301000ULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
sysbus_connect_irq(s, 0, irq);
|
2009-08-08 22:24:47 +02:00
|
|
|
}
|
|
|
|
|
2013-10-15 22:03:04 +02:00
|
|
|
static void cg3_init(hwaddr addr, qemu_irq irq, int vram_size, int width,
|
|
|
|
int height, int depth)
|
|
|
|
{
|
|
|
|
DeviceState *dev;
|
|
|
|
SysBusDevice *s;
|
|
|
|
|
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("cgthree");
|
2013-10-15 22:03:04 +02:00
|
|
|
qdev_prop_set_uint32(dev, "vram-size", vram_size);
|
|
|
|
qdev_prop_set_uint16(dev, "width", width);
|
|
|
|
qdev_prop_set_uint16(dev, "height", height);
|
|
|
|
qdev_prop_set_uint16(dev, "depth", depth);
|
|
|
|
s = 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(s, &error_fatal);
|
2013-10-15 22:03:04 +02:00
|
|
|
|
|
|
|
/* FCode ROM */
|
|
|
|
sysbus_mmio_map(s, 0, addr);
|
|
|
|
/* DAC */
|
|
|
|
sysbus_mmio_map(s, 1, addr + 0x400000ULL);
|
|
|
|
/* 8-bit plane */
|
|
|
|
sysbus_mmio_map(s, 2, addr + 0x800000ULL);
|
|
|
|
|
|
|
|
sysbus_connect_irq(s, 0, irq);
|
|
|
|
}
|
|
|
|
|
2009-07-13 18:11:08 +02:00
|
|
|
/* NCR89C100/MACIO Internal ID register */
|
2013-07-27 13:33:46 +02:00
|
|
|
|
|
|
|
#define TYPE_MACIO_ID_REGISTER "macio_idreg"
|
|
|
|
|
2009-07-13 18:11:08 +02:00
|
|
|
static const uint8_t idreg_data[] = { 0xfe, 0x81, 0x01, 0x03 };
|
|
|
|
|
2012-10-23 12:30:10 +02:00
|
|
|
static void idreg_init(hwaddr addr)
|
2009-07-13 18:11:08 +02:00
|
|
|
{
|
|
|
|
DeviceState *dev;
|
|
|
|
SysBusDevice *s;
|
|
|
|
|
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_MACIO_ID_REGISTER);
|
2013-01-20 02:47:33 +01:00
|
|
|
s = 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(s, &error_fatal);
|
2009-07-13 18:11:08 +02:00
|
|
|
|
|
|
|
sysbus_mmio_map(s, 0, addr);
|
2018-12-14 14:30:48 +01:00
|
|
|
address_space_write_rom(&address_space_memory, addr,
|
|
|
|
MEMTXATTRS_UNSPECIFIED,
|
|
|
|
idreg_data, sizeof(idreg_data));
|
2009-07-13 18:11:08 +02:00
|
|
|
}
|
|
|
|
|
2020-09-16 20:25:19 +02:00
|
|
|
OBJECT_DECLARE_SIMPLE_TYPE(IDRegState, MACIO_ID_REGISTER)
|
2013-07-27 13:33:46 +02:00
|
|
|
|
2020-09-03 22:43:22 +02:00
|
|
|
struct IDRegState {
|
2013-07-27 13:33:46 +02:00
|
|
|
SysBusDevice parent_obj;
|
|
|
|
|
2011-10-03 14:27:32 +02:00
|
|
|
MemoryRegion mem;
|
2020-09-03 22:43:22 +02:00
|
|
|
};
|
2011-10-03 14:27:32 +02:00
|
|
|
|
hw/sparc/sun4m: Fix problems with device introspection
Several devices of the sun4m machines are using &error_fatal in
their instance_init function and thus can cause QEMU to abort
unexpectedly:
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'openprom'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.prom" already registered, abort!
Aborted (core dumped)
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'macio_idreg'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.idreg" already registered, abort!
Aborted (core dumped)
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'tcx_afx'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-5 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.afx" already registered, abort!
Aborted (core dumped)
Fix the issues by converting the instance_init functions into realize()
functions instead, which are allowed to fail (and not called during
device introspection).
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
2018-04-05 12:43:03 +02:00
|
|
|
static void idreg_realize(DeviceState *ds, Error **errp)
|
2009-07-13 18:11:08 +02:00
|
|
|
{
|
hw/sparc/sun4m: Fix problems with device introspection
Several devices of the sun4m machines are using &error_fatal in
their instance_init function and thus can cause QEMU to abort
unexpectedly:
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'openprom'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.prom" already registered, abort!
Aborted (core dumped)
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'macio_idreg'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.idreg" already registered, abort!
Aborted (core dumped)
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'tcx_afx'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-5 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.afx" already registered, abort!
Aborted (core dumped)
Fix the issues by converting the instance_init functions into realize()
functions instead, which are allowed to fail (and not called during
device introspection).
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
2018-04-05 12:43:03 +02:00
|
|
|
IDRegState *s = MACIO_ID_REGISTER(ds);
|
|
|
|
SysBusDevice *dev = SYS_BUS_DEVICE(ds);
|
|
|
|
Error *local_err = NULL;
|
|
|
|
|
|
|
|
memory_region_init_ram_nomigrate(&s->mem, OBJECT(ds), "sun4m.idreg",
|
|
|
|
sizeof(idreg_data), &local_err);
|
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
return;
|
|
|
|
}
|
2009-07-13 18:11:08 +02:00
|
|
|
|
2011-12-20 14:59:12 +01:00
|
|
|
vmstate_register_ram_global(&s->mem);
|
2011-10-03 14:27:32 +02:00
|
|
|
memory_region_set_readonly(&s->mem, true);
|
2011-11-27 10:38:10 +01:00
|
|
|
sysbus_init_mmio(dev, &s->mem);
|
2012-01-24 20:12:29 +01:00
|
|
|
}
|
|
|
|
|
hw/sparc/sun4m: Fix problems with device introspection
Several devices of the sun4m machines are using &error_fatal in
their instance_init function and thus can cause QEMU to abort
unexpectedly:
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'openprom'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.prom" already registered, abort!
Aborted (core dumped)
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'macio_idreg'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.idreg" already registered, abort!
Aborted (core dumped)
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'tcx_afx'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-5 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.afx" already registered, abort!
Aborted (core dumped)
Fix the issues by converting the instance_init functions into realize()
functions instead, which are allowed to fail (and not called during
device introspection).
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
2018-04-05 12:43:03 +02:00
|
|
|
static void idreg_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
|
|
|
|
|
|
dc->realize = idreg_realize;
|
|
|
|
}
|
|
|
|
|
2013-01-10 16:19:07 +01:00
|
|
|
static const TypeInfo idreg_info = {
|
2013-07-27 13:33:46 +02:00
|
|
|
.name = TYPE_MACIO_ID_REGISTER,
|
2011-12-08 04:34:16 +01:00
|
|
|
.parent = TYPE_SYS_BUS_DEVICE,
|
|
|
|
.instance_size = sizeof(IDRegState),
|
hw/sparc/sun4m: Fix problems with device introspection
Several devices of the sun4m machines are using &error_fatal in
their instance_init function and thus can cause QEMU to abort
unexpectedly:
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'openprom'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.prom" already registered, abort!
Aborted (core dumped)
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'macio_idreg'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.idreg" already registered, abort!
Aborted (core dumped)
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'tcx_afx'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-5 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.afx" already registered, abort!
Aborted (core dumped)
Fix the issues by converting the instance_init functions into realize()
functions instead, which are allowed to fail (and not called during
device introspection).
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
2018-04-05 12:43:03 +02:00
|
|
|
.class_init = idreg_class_init,
|
2009-07-13 18:11:08 +02:00
|
|
|
};
|
|
|
|
|
2013-07-27 13:38:44 +02:00
|
|
|
#define TYPE_TCX_AFX "tcx_afx"
|
2020-09-16 20:25:19 +02:00
|
|
|
OBJECT_DECLARE_SIMPLE_TYPE(AFXState, TCX_AFX)
|
2013-07-27 13:38:44 +02:00
|
|
|
|
2020-09-03 22:43:22 +02:00
|
|
|
struct AFXState {
|
2013-07-27 13:38:44 +02:00
|
|
|
SysBusDevice parent_obj;
|
|
|
|
|
2011-10-03 14:27:32 +02:00
|
|
|
MemoryRegion mem;
|
2020-09-03 22:43:22 +02:00
|
|
|
};
|
2011-10-03 14:27:32 +02:00
|
|
|
|
2009-12-13 14:30:19 +01:00
|
|
|
/* SS-5 TCX AFX register */
|
2012-10-23 12:30:10 +02:00
|
|
|
static void afx_init(hwaddr addr)
|
2009-12-13 14:30:19 +01:00
|
|
|
{
|
|
|
|
DeviceState *dev;
|
|
|
|
SysBusDevice *s;
|
|
|
|
|
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_TCX_AFX);
|
2013-01-20 02:47:33 +01:00
|
|
|
s = 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(s, &error_fatal);
|
2009-12-13 14:30:19 +01:00
|
|
|
|
|
|
|
sysbus_mmio_map(s, 0, addr);
|
|
|
|
}
|
|
|
|
|
hw/sparc/sun4m: Fix problems with device introspection
Several devices of the sun4m machines are using &error_fatal in
their instance_init function and thus can cause QEMU to abort
unexpectedly:
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'openprom'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.prom" already registered, abort!
Aborted (core dumped)
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'macio_idreg'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.idreg" already registered, abort!
Aborted (core dumped)
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'tcx_afx'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-5 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.afx" already registered, abort!
Aborted (core dumped)
Fix the issues by converting the instance_init functions into realize()
functions instead, which are allowed to fail (and not called during
device introspection).
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
2018-04-05 12:43:03 +02:00
|
|
|
static void afx_realize(DeviceState *ds, Error **errp)
|
2009-12-13 14:30:19 +01:00
|
|
|
{
|
hw/sparc/sun4m: Fix problems with device introspection
Several devices of the sun4m machines are using &error_fatal in
their instance_init function and thus can cause QEMU to abort
unexpectedly:
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'openprom'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.prom" already registered, abort!
Aborted (core dumped)
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'macio_idreg'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.idreg" already registered, abort!
Aborted (core dumped)
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'tcx_afx'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-5 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.afx" already registered, abort!
Aborted (core dumped)
Fix the issues by converting the instance_init functions into realize()
functions instead, which are allowed to fail (and not called during
device introspection).
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
2018-04-05 12:43:03 +02:00
|
|
|
AFXState *s = TCX_AFX(ds);
|
|
|
|
SysBusDevice *dev = SYS_BUS_DEVICE(ds);
|
|
|
|
Error *local_err = NULL;
|
|
|
|
|
|
|
|
memory_region_init_ram_nomigrate(&s->mem, OBJECT(ds), "sun4m.afx", 4,
|
|
|
|
&local_err);
|
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
return;
|
|
|
|
}
|
2009-12-13 14:30:19 +01:00
|
|
|
|
2011-12-20 14:59:12 +01:00
|
|
|
vmstate_register_ram_global(&s->mem);
|
2011-11-27 10:38:10 +01:00
|
|
|
sysbus_init_mmio(dev, &s->mem);
|
2012-01-24 20:12:29 +01:00
|
|
|
}
|
|
|
|
|
hw/sparc/sun4m: Fix problems with device introspection
Several devices of the sun4m machines are using &error_fatal in
their instance_init function and thus can cause QEMU to abort
unexpectedly:
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'openprom'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.prom" already registered, abort!
Aborted (core dumped)
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'macio_idreg'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.idreg" already registered, abort!
Aborted (core dumped)
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'tcx_afx'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-5 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.afx" already registered, abort!
Aborted (core dumped)
Fix the issues by converting the instance_init functions into realize()
functions instead, which are allowed to fail (and not called during
device introspection).
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
2018-04-05 12:43:03 +02:00
|
|
|
static void afx_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
|
|
|
|
|
|
dc->realize = afx_realize;
|
|
|
|
}
|
|
|
|
|
2013-01-10 16:19:07 +01:00
|
|
|
static const TypeInfo afx_info = {
|
2013-07-27 13:38:44 +02:00
|
|
|
.name = TYPE_TCX_AFX,
|
2011-12-08 04:34:16 +01:00
|
|
|
.parent = TYPE_SYS_BUS_DEVICE,
|
|
|
|
.instance_size = sizeof(AFXState),
|
hw/sparc/sun4m: Fix problems with device introspection
Several devices of the sun4m machines are using &error_fatal in
their instance_init function and thus can cause QEMU to abort
unexpectedly:
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'openprom'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.prom" already registered, abort!
Aborted (core dumped)
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'macio_idreg'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.idreg" already registered, abort!
Aborted (core dumped)
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'tcx_afx'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-5 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.afx" already registered, abort!
Aborted (core dumped)
Fix the issues by converting the instance_init functions into realize()
functions instead, which are allowed to fail (and not called during
device introspection).
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
2018-04-05 12:43:03 +02:00
|
|
|
.class_init = afx_class_init,
|
2009-12-13 14:30:19 +01:00
|
|
|
};
|
|
|
|
|
2013-07-27 13:42:29 +02:00
|
|
|
#define TYPE_OPENPROM "openprom"
|
2020-09-03 22:43:22 +02:00
|
|
|
typedef struct PROMState PROMState;
|
2020-08-31 23:07:33 +02:00
|
|
|
DECLARE_INSTANCE_CHECKER(PROMState, OPENPROM,
|
|
|
|
TYPE_OPENPROM)
|
2013-07-27 13:42:29 +02:00
|
|
|
|
2020-09-03 22:43:22 +02:00
|
|
|
struct PROMState {
|
2013-07-27 13:42:29 +02:00
|
|
|
SysBusDevice parent_obj;
|
|
|
|
|
2011-10-03 14:27:32 +02:00
|
|
|
MemoryRegion prom;
|
2020-09-03 22:43:22 +02:00
|
|
|
};
|
2011-10-03 14:27:32 +02:00
|
|
|
|
2009-07-16 15:48:10 +02:00
|
|
|
/* Boot PROM (OpenBIOS) */
|
2010-03-14 21:20:59 +01:00
|
|
|
static uint64_t translate_prom_address(void *opaque, uint64_t addr)
|
|
|
|
{
|
2012-10-23 12:30:10 +02:00
|
|
|
hwaddr *base_addr = (hwaddr *)opaque;
|
2010-03-14 21:20:59 +01:00
|
|
|
return addr + *base_addr - PROM_VADDR;
|
|
|
|
}
|
|
|
|
|
2012-10-23 12:30:10 +02:00
|
|
|
static void prom_init(hwaddr addr, const char *bios_name)
|
2009-07-16 15:48:10 +02:00
|
|
|
{
|
|
|
|
DeviceState *dev;
|
|
|
|
SysBusDevice *s;
|
|
|
|
char *filename;
|
|
|
|
int ret;
|
|
|
|
|
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_OPENPROM);
|
2013-01-20 02:47:33 +01:00
|
|
|
s = 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(s, &error_fatal);
|
2009-07-16 15:48:10 +02:00
|
|
|
|
|
|
|
sysbus_mmio_map(s, 0, addr);
|
|
|
|
|
|
|
|
/* load boot prom */
|
|
|
|
if (bios_name == NULL) {
|
|
|
|
bios_name = PROM_FILENAME;
|
|
|
|
}
|
|
|
|
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
|
|
|
|
if (filename) {
|
2019-01-15 13:18:03 +01:00
|
|
|
ret = load_elf(filename, NULL,
|
|
|
|
translate_prom_address, &addr, NULL,
|
2020-01-26 23:55:04 +01:00
|
|
|
NULL, NULL, NULL, 1, EM_SPARC, 0, 0);
|
2009-07-16 15:48:10 +02:00
|
|
|
if (ret < 0 || ret > PROM_SIZE_MAX) {
|
|
|
|
ret = load_image_targphys(filename, addr, PROM_SIZE_MAX);
|
|
|
|
}
|
2011-08-21 05:09:37 +02:00
|
|
|
g_free(filename);
|
2009-07-16 15:48:10 +02:00
|
|
|
} else {
|
|
|
|
ret = -1;
|
|
|
|
}
|
|
|
|
if (ret < 0 || ret > PROM_SIZE_MAX) {
|
hw/sparc*: Replace fprintf(stderr, "*\n" with error_report()
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then
compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
Some lines where then manually tweaked to pass checkpatch.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Fabien Chouteau <chouteau@adacore.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Artyom Tarasenko <atar4qemu@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-12-armbru@redhat.com>
2018-02-03 09:43:12 +01:00
|
|
|
error_report("could not load prom '%s'", bios_name);
|
2009-07-16 15:48:10 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
hw/sparc/sun4m: Fix problems with device introspection
Several devices of the sun4m machines are using &error_fatal in
their instance_init function and thus can cause QEMU to abort
unexpectedly:
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'openprom'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.prom" already registered, abort!
Aborted (core dumped)
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'macio_idreg'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.idreg" already registered, abort!
Aborted (core dumped)
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'tcx_afx'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-5 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.afx" already registered, abort!
Aborted (core dumped)
Fix the issues by converting the instance_init functions into realize()
functions instead, which are allowed to fail (and not called during
device introspection).
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
2018-04-05 12:43:03 +02:00
|
|
|
static void prom_realize(DeviceState *ds, Error **errp)
|
2009-07-16 15:48:10 +02:00
|
|
|
{
|
hw/sparc/sun4m: Fix problems with device introspection
Several devices of the sun4m machines are using &error_fatal in
their instance_init function and thus can cause QEMU to abort
unexpectedly:
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'openprom'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.prom" already registered, abort!
Aborted (core dumped)
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'macio_idreg'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.idreg" already registered, abort!
Aborted (core dumped)
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'tcx_afx'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-5 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.afx" already registered, abort!
Aborted (core dumped)
Fix the issues by converting the instance_init functions into realize()
functions instead, which are allowed to fail (and not called during
device introspection).
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
2018-04-05 12:43:03 +02:00
|
|
|
PROMState *s = OPENPROM(ds);
|
|
|
|
SysBusDevice *dev = SYS_BUS_DEVICE(ds);
|
|
|
|
Error *local_err = NULL;
|
|
|
|
|
|
|
|
memory_region_init_ram_nomigrate(&s->prom, OBJECT(ds), "sun4m.prom",
|
|
|
|
PROM_SIZE_MAX, &local_err);
|
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
return;
|
|
|
|
}
|
2009-07-16 15:48:10 +02:00
|
|
|
|
2011-12-20 14:59:12 +01:00
|
|
|
vmstate_register_ram_global(&s->prom);
|
2011-10-03 14:27:32 +02:00
|
|
|
memory_region_set_readonly(&s->prom, true);
|
2011-11-27 10:38:10 +01:00
|
|
|
sysbus_init_mmio(dev, &s->prom);
|
2009-07-16 15:48:10 +02:00
|
|
|
}
|
|
|
|
|
2012-01-24 20:12:29 +01:00
|
|
|
static Property prom_properties[] = {
|
|
|
|
{/* end of property list */},
|
|
|
|
};
|
|
|
|
|
|
|
|
static void prom_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
2011-12-08 04:34:16 +01:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
2012-01-24 20:12:29 +01:00
|
|
|
|
2020-01-10 16:30:32 +01:00
|
|
|
device_class_set_props(dc, prom_properties);
|
hw/sparc/sun4m: Fix problems with device introspection
Several devices of the sun4m machines are using &error_fatal in
their instance_init function and thus can cause QEMU to abort
unexpectedly:
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'openprom'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.prom" already registered, abort!
Aborted (core dumped)
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'macio_idreg'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.idreg" already registered, abort!
Aborted (core dumped)
$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'tcx_afx'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-5 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
"package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.afx" already registered, abort!
Aborted (core dumped)
Fix the issues by converting the instance_init functions into realize()
functions instead, which are allowed to fail (and not called during
device introspection).
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
2018-04-05 12:43:03 +02:00
|
|
|
dc->realize = prom_realize;
|
2012-01-24 20:12:29 +01:00
|
|
|
}
|
|
|
|
|
2013-01-10 16:19:07 +01:00
|
|
|
static const TypeInfo prom_info = {
|
2013-07-27 13:42:29 +02:00
|
|
|
.name = TYPE_OPENPROM,
|
2011-12-08 04:34:16 +01:00
|
|
|
.parent = TYPE_SYS_BUS_DEVICE,
|
|
|
|
.instance_size = sizeof(PROMState),
|
|
|
|
.class_init = prom_class_init,
|
2009-07-16 15:48:10 +02:00
|
|
|
};
|
|
|
|
|
2013-07-27 13:45:23 +02:00
|
|
|
#define TYPE_SUN4M_MEMORY "memory"
|
2020-09-03 22:43:22 +02:00
|
|
|
typedef struct RamDevice RamDevice;
|
2020-08-31 23:07:33 +02:00
|
|
|
DECLARE_INSTANCE_CHECKER(RamDevice, SUN4M_RAM,
|
|
|
|
TYPE_SUN4M_MEMORY)
|
2013-07-27 13:45:23 +02:00
|
|
|
|
2020-09-03 22:43:22 +02:00
|
|
|
struct RamDevice {
|
2013-07-27 13:45:23 +02:00
|
|
|
SysBusDevice parent_obj;
|
2020-02-19 17:09:44 +01:00
|
|
|
HostMemoryBackend *memdev;
|
2020-09-03 22:43:22 +02:00
|
|
|
};
|
2009-07-15 13:43:31 +02:00
|
|
|
|
2009-07-16 15:48:14 +02:00
|
|
|
/* System RAM */
|
2017-05-25 15:34:50 +02:00
|
|
|
static void ram_realize(DeviceState *dev, Error **errp)
|
2009-07-16 15:48:14 +02:00
|
|
|
{
|
2013-07-27 13:45:23 +02:00
|
|
|
RamDevice *d = SUN4M_RAM(dev);
|
2020-02-19 17:09:44 +01:00
|
|
|
MemoryRegion *ram = host_memory_backend_get_memory(d->memdev);
|
2009-07-16 15:48:14 +02:00
|
|
|
|
2020-02-19 17:09:44 +01:00
|
|
|
sysbus_init_mmio(SYS_BUS_DEVICE(dev), ram);
|
2009-07-16 15:48:14 +02:00
|
|
|
}
|
|
|
|
|
2020-02-19 17:09:44 +01:00
|
|
|
static void ram_initfn(Object *obj)
|
2009-07-16 15:48:14 +02:00
|
|
|
{
|
2020-02-19 17:09:44 +01:00
|
|
|
RamDevice *d = SUN4M_RAM(obj);
|
|
|
|
object_property_add_link(obj, "memdev", TYPE_MEMORY_BACKEND,
|
|
|
|
(Object **)&d->memdev,
|
|
|
|
object_property_allow_set_link,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 17:29:22 +02:00
|
|
|
OBJ_PROP_LINK_STRONG);
|
2020-02-19 17:09:44 +01:00
|
|
|
object_property_set_description(obj, "memdev", "Set RAM backend"
|
2020-05-05 17:29:15 +02:00
|
|
|
"Valid value is ID of a hostmem backend");
|
2009-07-16 15:48:14 +02:00
|
|
|
}
|
|
|
|
|
2012-01-24 20:12:29 +01:00
|
|
|
static void ram_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
2011-12-08 04:34:16 +01:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
2012-01-24 20:12:29 +01:00
|
|
|
|
2017-05-25 15:34:50 +02:00
|
|
|
dc->realize = ram_realize;
|
2012-01-24 20:12:29 +01:00
|
|
|
}
|
|
|
|
|
2013-01-10 16:19:07 +01:00
|
|
|
static const TypeInfo ram_info = {
|
2013-07-27 13:45:23 +02:00
|
|
|
.name = TYPE_SUN4M_MEMORY,
|
2011-12-08 04:34:16 +01:00
|
|
|
.parent = TYPE_SYS_BUS_DEVICE,
|
|
|
|
.instance_size = sizeof(RamDevice),
|
2020-02-19 17:09:44 +01:00
|
|
|
.instance_init = ram_initfn,
|
2011-12-08 04:34:16 +01:00
|
|
|
.class_init = ram_class_init,
|
2009-07-16 15:48:14 +02:00
|
|
|
};
|
|
|
|
|
2017-10-05 15:51:07 +02:00
|
|
|
static void cpu_devinit(const char *cpu_type, unsigned int id,
|
2010-01-13 19:52:50 +01:00
|
|
|
uint64_t prom_addr, qemu_irq **cpu_irqs)
|
2009-07-16 15:48:20 +02:00
|
|
|
{
|
2012-05-03 03:14:37 +02:00
|
|
|
SPARCCPU *cpu;
|
2012-03-14 01:38:24 +01:00
|
|
|
CPUSPARCState *env;
|
2009-07-16 15:48:20 +02:00
|
|
|
|
2020-08-26 07:55:34 +02:00
|
|
|
cpu = SPARC_CPU(object_new(cpu_type));
|
2012-05-03 03:14:37 +02:00
|
|
|
env = &cpu->env;
|
2009-07-16 15:48:20 +02:00
|
|
|
|
|
|
|
cpu_sparc_set_id(env, id);
|
2020-08-26 07:55:34 +02:00
|
|
|
qemu_register_reset(sun4m_cpu_reset, cpu);
|
|
|
|
object_property_set_bool(OBJECT(cpu), "start-powered-off", id != 0,
|
|
|
|
&error_fatal);
|
|
|
|
qdev_realize_and_unref(DEVICE(cpu), NULL, &error_fatal);
|
2012-10-12 04:23:04 +02:00
|
|
|
*cpu_irqs = qemu_allocate_irqs(cpu_set_irq, cpu, MAX_PILS);
|
2009-07-16 15:48:20 +02:00
|
|
|
env->prom_addr = prom_addr;
|
|
|
|
}
|
|
|
|
|
2012-07-30 17:24:23 +02:00
|
|
|
static void dummy_fdc_tc(void *opaque, int irq, int level)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2021-05-03 19:12:59 +02:00
|
|
|
static void sun4m_hw_init(MachineState *machine)
|
2004-10-01 00:13:50 +02:00
|
|
|
{
|
2021-05-03 19:12:59 +02:00
|
|
|
const struct sun4m_hwdef *hwdef = SUN4M_MACHINE_GET_CLASS(machine)->hwdef;
|
2016-09-26 22:23:27 +02:00
|
|
|
DeviceState *slavio_intctl;
|
2005-02-22 20:08:41 +01:00
|
|
|
unsigned int i;
|
2020-10-16 20:27:36 +02:00
|
|
|
Nvram *nvram;
|
2017-10-14 14:22:21 +02:00
|
|
|
qemu_irq *cpu_irqs[MAX_CPUS], slavio_irq[32], slavio_cpu_irq[MAX_CPUS];
|
2009-07-13 18:51:27 +02:00
|
|
|
qemu_irq fdc_tc;
|
2008-11-05 20:25:39 +01:00
|
|
|
unsigned long kernel_size;
|
2019-01-25 17:30:04 +01:00
|
|
|
uint32_t initrd_size;
|
2009-09-22 13:53:18 +02:00
|
|
|
DriveInfo *fd[MAX_FD];
|
2013-04-16 02:24:08 +02:00
|
|
|
FWCfgState *fw_cfg;
|
2020-12-19 12:19:34 +01:00
|
|
|
DeviceState *dev, *ms_kb_orgate, *serial_orgate;
|
2018-02-14 07:35:58 +01:00
|
|
|
SysBusDevice *s;
|
2019-05-18 22:54:27 +02:00
|
|
|
unsigned int smp_cpus = machine->smp.cpus;
|
|
|
|
unsigned int max_cpus = machine->smp.max_cpus;
|
2020-02-19 17:09:44 +01:00
|
|
|
Object *ram_memdev = object_resolve_path_type(machine->ram_memdev_id,
|
|
|
|
TYPE_MEMORY_BACKEND, NULL);
|
2020-09-26 16:02:14 +02:00
|
|
|
NICInfo *nd = &nd_table[0];
|
2020-02-19 17:09:44 +01:00
|
|
|
|
|
|
|
if (machine->ram_size > hwdef->max_mem) {
|
|
|
|
error_report("Too much memory for this machine: %" PRId64 ","
|
|
|
|
" maximum %" PRId64,
|
|
|
|
machine->ram_size / MiB, hwdef->max_mem / MiB);
|
|
|
|
exit(1);
|
|
|
|
}
|
2004-10-01 00:13:50 +02:00
|
|
|
|
2005-12-05 21:31:52 +01:00
|
|
|
/* init CPUs */
|
|
|
|
for(i = 0; i < smp_cpus; i++) {
|
2017-10-05 15:51:07 +02:00
|
|
|
cpu_devinit(machine->cpu_type, i, hwdef->slavio_base, &cpu_irqs[i]);
|
2005-12-05 21:31:52 +01:00
|
|
|
}
|
2007-05-27 18:42:29 +02:00
|
|
|
|
|
|
|
for (i = smp_cpus; i < MAX_CPUS; i++)
|
|
|
|
cpu_irqs[i] = qemu_allocate_irqs(dummy_cpu_set_irq, NULL, MAX_PILS);
|
|
|
|
|
2020-02-19 17:09:44 +01:00
|
|
|
/* Create and map RAM frontend */
|
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("memory");
|
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), "memdev", ram_memdev, &error_fatal);
|
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);
|
2020-02-19 17:09:44 +01:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0);
|
2007-11-28 21:54:33 +01:00
|
|
|
|
2010-04-18 00:34:03 +02:00
|
|
|
/* models without ECC don't trap when missing ram is accessed */
|
|
|
|
if (!hwdef->ecc_base) {
|
2019-06-24 18:55:47 +02:00
|
|
|
empty_slot_init("ecc", machine->ram_size,
|
|
|
|
hwdef->max_mem - machine->ram_size);
|
2010-04-18 00:34:03 +02:00
|
|
|
}
|
2009-07-16 15:48:14 +02:00
|
|
|
|
2020-10-26 15:30:27 +01:00
|
|
|
prom_init(hwdef->slavio_base, machine->firmware);
|
2009-07-16 15:48:10 +02:00
|
|
|
|
2009-08-23 14:23:30 +02:00
|
|
|
slavio_intctl = slavio_intctl_init(hwdef->intctl_base,
|
|
|
|
hwdef->intctl_base + 0x10000ULL,
|
2009-08-25 20:29:36 +02:00
|
|
|
cpu_irqs);
|
2009-07-16 16:15:34 +02:00
|
|
|
|
|
|
|
for (i = 0; i < 32; i++) {
|
2009-08-23 14:23:30 +02:00
|
|
|
slavio_irq[i] = qdev_get_gpio_in(slavio_intctl, i);
|
2009-07-16 16:15:34 +02:00
|
|
|
}
|
|
|
|
for (i = 0; i < MAX_CPUS; i++) {
|
2009-08-23 14:23:30 +02:00
|
|
|
slavio_cpu_irq[i] = qdev_get_gpio_in(slavio_intctl, 32 + i);
|
2009-07-16 16:15:34 +02:00
|
|
|
}
|
2007-05-27 18:42:29 +02:00
|
|
|
|
2008-12-24 21:21:18 +01:00
|
|
|
if (hwdef->idreg_base) {
|
2009-07-13 18:11:08 +02:00
|
|
|
idreg_init(hwdef->idreg_base);
|
2007-12-27 21:26:23 +01:00
|
|
|
}
|
|
|
|
|
2009-12-13 14:30:19 +01:00
|
|
|
if (hwdef->afx_base) {
|
|
|
|
afx_init(hwdef->afx_base);
|
|
|
|
}
|
|
|
|
|
2017-10-14 14:22:22 +02:00
|
|
|
iommu_init(hwdef->iommu_base, hwdef->iommu_version, slavio_irq[30]);
|
2008-01-01 18:04:45 +01:00
|
|
|
|
2010-05-08 16:10:14 +02:00
|
|
|
if (hwdef->iommu_pad_base) {
|
|
|
|
/* On the real hardware (SS-5, LX) the MMU is not padded, but aliased.
|
|
|
|
Software shouldn't use aliased addresses, neither should it crash
|
|
|
|
when does. Using empty_slot instead of aliasing can help with
|
|
|
|
debugging such accesses */
|
2019-06-24 18:55:47 +02:00
|
|
|
empty_slot_init("iommu.alias",
|
|
|
|
hwdef->iommu_pad_base, hwdef->iommu_pad_len);
|
2010-05-08 16:10:14 +02:00
|
|
|
}
|
|
|
|
|
2020-09-26 16:02:14 +02:00
|
|
|
qemu_check_nic_model(nd, TYPE_LANCE);
|
2017-10-14 14:22:22 +02:00
|
|
|
sparc32_dma_init(hwdef->dma_base,
|
|
|
|
hwdef->esp_base, slavio_irq[18],
|
2020-09-26 16:02:14 +02:00
|
|
|
hwdef->le_base, slavio_irq[16], nd);
|
2017-10-14 14:22:22 +02:00
|
|
|
|
2007-04-21 21:45:49 +02:00
|
|
|
if (graphic_depth != 8 && graphic_depth != 24) {
|
2013-10-15 22:03:04 +02:00
|
|
|
error_report("Unsupported depth: %d", graphic_depth);
|
2007-04-21 21:45:49 +02:00
|
|
|
exit (1);
|
|
|
|
}
|
2019-03-19 15:37:47 +01:00
|
|
|
if (vga_interface_type != VGA_NONE) {
|
2013-10-15 22:03:04 +02:00
|
|
|
if (vga_interface_type == VGA_CG3) {
|
|
|
|
if (graphic_depth != 8) {
|
|
|
|
error_report("Unsupported depth: %d", graphic_depth);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(graphic_width == 1024 && graphic_height == 768) &&
|
|
|
|
!(graphic_width == 1152 && graphic_height == 900)) {
|
|
|
|
error_report("Unsupported resolution: %d x %d", graphic_width,
|
|
|
|
graphic_height);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* sbus irq 5 */
|
|
|
|
cg3_init(hwdef->tcx_base, slavio_irq[11], 0x00100000,
|
|
|
|
graphic_width, graphic_height, graphic_depth);
|
|
|
|
} else {
|
|
|
|
/* If no display specified, default to TCX */
|
|
|
|
if (graphic_depth != 8 && graphic_depth != 24) {
|
|
|
|
error_report("Unsupported depth: %d", graphic_depth);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(graphic_width == 1024 && graphic_height == 768)) {
|
|
|
|
error_report("Unsupported resolution: %d x %d",
|
|
|
|
graphic_width, graphic_height);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2014-09-13 11:44:07 +02:00
|
|
|
tcx_init(hwdef->tcx_base, slavio_irq[11], 0x00100000,
|
|
|
|
graphic_width, graphic_height, graphic_depth);
|
2013-10-15 22:03:04 +02:00
|
|
|
}
|
2010-07-13 18:05:24 +02:00
|
|
|
}
|
|
|
|
|
2019-03-19 15:37:47 +01:00
|
|
|
for (i = 0; i < MAX_VSIMMS; i++) {
|
2010-07-13 18:05:24 +02:00
|
|
|
/* vsimm registers probed by OBP */
|
|
|
|
if (hwdef->vsimm[i].reg_base) {
|
2019-06-24 18:55:47 +02:00
|
|
|
char *name = g_strdup_printf("vsimm[%d]", i);
|
|
|
|
empty_slot_init(name, hwdef->vsimm[i].reg_base, 0x2000);
|
|
|
|
g_free(name);
|
2010-07-13 18:05:24 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (hwdef->sx_base) {
|
hw: Replace anti-social QOM type names
Several QOM type names contain ',':
ARM,bitband-memory
etraxfs,pic
etraxfs,serial
etraxfs,timer
fsl,imx25
fsl,imx31
fsl,imx6
fsl,imx6ul
fsl,imx7
grlib,ahbpnp
grlib,apbpnp
grlib,apbuart
grlib,gptimer
grlib,irqmp
qemu,register
SUNW,bpp
SUNW,CS4231
SUNW,DBRI
SUNW,DBRI.prom
SUNW,fdtwo
SUNW,sx
SUNW,tcx
xilinx,zynq_slcr
xlnx,zynqmp
xlnx,zynqmp-pmu-soc
xlnx,zynq-xadc
These are all device types. They can't be plugged with -device /
device_add, except for xlnx,zynqmp-pmu-soc, and I doubt that one
actually works.
They *can* be used with -device / device_add to request help.
Usability is poor, though: you have to double the comma, like this:
$ qemu-system-x86_64 -device SUNW,,fdtwo,help
Trap for the unwary. The fact that this was broken in
device-introspect-test for more than six years until commit e27bd49876
fixed it demonstrates that "the unwary" includes seasoned developers.
One QOM type name contains ' ': "ICH9 SMB". Because having to
remember just one way to quote would be too easy.
Rename the "SUNW,FOO types to "sun-FOO". Summarily replace ',' and '
' by '-' in the other type names.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210304140229.575481-2-armbru@redhat.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
2021-03-04 15:02:28 +01:00
|
|
|
create_unimplemented_device("sun-sx", hwdef->sx_base, 0x2000);
|
2010-07-13 18:05:24 +02:00
|
|
|
}
|
2007-05-27 21:38:20 +02:00
|
|
|
|
2020-10-16 20:27:36 +02:00
|
|
|
dev = qdev_new("sysbus-m48t08");
|
|
|
|
qdev_prop_set_int32(dev, "base-year", 1968);
|
|
|
|
s = SYS_BUS_DEVICE(dev);
|
|
|
|
sysbus_realize_and_unref(s, &error_fatal);
|
|
|
|
sysbus_connect_irq(s, 0, slavio_irq[0]);
|
|
|
|
sysbus_mmio_map(s, 0, hwdef->nvram_base);
|
|
|
|
nvram = NVRAM(dev);
|
2007-10-06 13:25:43 +02:00
|
|
|
|
2009-08-08 22:55:37 +02:00
|
|
|
slavio_timer_init_all(hwdef->counter_base, slavio_irq[19], slavio_cpu_irq, smp_cpus);
|
2007-10-06 13:25:43 +02:00
|
|
|
|
2012-04-07 09:23:39 +02:00
|
|
|
/* Slavio TTYA (base+4, Linux ttyS0) is the first QEMU serial device
|
|
|
|
Slavio TTYB (base+0, Linux ttyS1) is the second QEMU serial device */
|
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);
|
2018-02-14 07:35:58 +01:00
|
|
|
qdev_prop_set_uint32(dev, "disabled", !machine->enable_graphics);
|
|
|
|
qdev_prop_set_uint32(dev, "frequency", ESCC_CLOCK);
|
|
|
|
qdev_prop_set_uint32(dev, "it_shift", 1);
|
|
|
|
qdev_prop_set_chr(dev, "chrB", NULL);
|
|
|
|
qdev_prop_set_chr(dev, "chrA", NULL);
|
|
|
|
qdev_prop_set_uint32(dev, "chnBtype", escc_mouse);
|
|
|
|
qdev_prop_set_uint32(dev, "chnAtype", escc_kbd);
|
|
|
|
s = 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(s, &error_fatal);
|
2018-02-14 07:35:58 +01:00
|
|
|
sysbus_mmio_map(s, 0, hwdef->ms_kb_base);
|
|
|
|
|
2020-12-19 12:19:34 +01:00
|
|
|
/* Logically OR both its IRQs together */
|
|
|
|
ms_kb_orgate = DEVICE(object_new(TYPE_OR_IRQ));
|
|
|
|
object_property_set_int(OBJECT(ms_kb_orgate), "num-lines", 2, &error_fatal);
|
|
|
|
qdev_realize_and_unref(ms_kb_orgate, NULL, &error_fatal);
|
|
|
|
sysbus_connect_irq(s, 0, qdev_get_gpio_in(ms_kb_orgate, 0));
|
|
|
|
sysbus_connect_irq(s, 1, qdev_get_gpio_in(ms_kb_orgate, 1));
|
|
|
|
qdev_connect_gpio_out(DEVICE(ms_kb_orgate), 0, slavio_irq[14]);
|
|
|
|
|
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);
|
2018-02-14 07:35:58 +01:00
|
|
|
qdev_prop_set_uint32(dev, "disabled", 0);
|
|
|
|
qdev_prop_set_uint32(dev, "frequency", ESCC_CLOCK);
|
|
|
|
qdev_prop_set_uint32(dev, "it_shift", 1);
|
2018-04-20 16:52:43 +02:00
|
|
|
qdev_prop_set_chr(dev, "chrB", serial_hd(1));
|
|
|
|
qdev_prop_set_chr(dev, "chrA", serial_hd(0));
|
2018-02-14 07:35:58 +01:00
|
|
|
qdev_prop_set_uint32(dev, "chnBtype", escc_serial);
|
|
|
|
qdev_prop_set_uint32(dev, "chnAtype", escc_serial);
|
|
|
|
|
|
|
|
s = 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(s, &error_fatal);
|
2018-02-14 07:35:58 +01:00
|
|
|
sysbus_mmio_map(s, 0, hwdef->serial_base);
|
2007-11-04 12:59:15 +01:00
|
|
|
|
2020-12-19 12:19:34 +01:00
|
|
|
/* Logically OR both its IRQs together */
|
|
|
|
serial_orgate = DEVICE(object_new(TYPE_OR_IRQ));
|
|
|
|
object_property_set_int(OBJECT(serial_orgate), "num-lines", 2,
|
|
|
|
&error_fatal);
|
|
|
|
qdev_realize_and_unref(serial_orgate, NULL, &error_fatal);
|
|
|
|
sysbus_connect_irq(s, 0, qdev_get_gpio_in(serial_orgate, 0));
|
|
|
|
sysbus_connect_irq(s, 1, qdev_get_gpio_in(serial_orgate, 1));
|
|
|
|
qdev_connect_gpio_out(DEVICE(serial_orgate), 0, slavio_irq[15]);
|
|
|
|
|
2009-07-13 18:51:27 +02:00
|
|
|
if (hwdef->apc_base) {
|
2015-05-29 07:27:04 +02:00
|
|
|
apc_init(hwdef->apc_base, qemu_allocate_irq(cpu_halt_signal, NULL, 0));
|
2009-07-13 18:51:27 +02:00
|
|
|
}
|
2008-03-21 19:05:23 +01:00
|
|
|
|
2008-12-24 21:21:18 +01:00
|
|
|
if (hwdef->fd_base) {
|
2007-12-02 05:51:10 +01:00
|
|
|
/* there is zero or one floppy drive */
|
2008-02-29 20:26:20 +01:00
|
|
|
memset(fd, 0, sizeof(fd));
|
2009-09-22 13:53:18 +02:00
|
|
|
fd[0] = drive_get(IF_FLOPPY, 0, 0);
|
2009-08-08 22:55:37 +02:00
|
|
|
sun4m_fdctrl_init(slavio_irq[22], hwdef->fd_base, fd,
|
2009-07-13 18:51:27 +02:00
|
|
|
&fdc_tc);
|
2012-07-30 17:24:23 +02:00
|
|
|
} else {
|
2015-05-29 07:27:04 +02:00
|
|
|
fdc_tc = qemu_allocate_irq(dummy_fdc_tc, NULL, 0);
|
2007-12-02 05:51:10 +01:00
|
|
|
}
|
|
|
|
|
2012-07-30 17:24:23 +02:00
|
|
|
slavio_misc_init(hwdef->slavio_base, hwdef->aux1_base, hwdef->aux2_base,
|
|
|
|
slavio_irq[30], fdc_tc);
|
|
|
|
|
2009-07-16 15:47:45 +02:00
|
|
|
if (hwdef->cs_base) {
|
hw: Replace anti-social QOM type names
Several QOM type names contain ',':
ARM,bitband-memory
etraxfs,pic
etraxfs,serial
etraxfs,timer
fsl,imx25
fsl,imx31
fsl,imx6
fsl,imx6ul
fsl,imx7
grlib,ahbpnp
grlib,apbpnp
grlib,apbuart
grlib,gptimer
grlib,irqmp
qemu,register
SUNW,bpp
SUNW,CS4231
SUNW,DBRI
SUNW,DBRI.prom
SUNW,fdtwo
SUNW,sx
SUNW,tcx
xilinx,zynq_slcr
xlnx,zynqmp
xlnx,zynqmp-pmu-soc
xlnx,zynq-xadc
These are all device types. They can't be plugged with -device /
device_add, except for xlnx,zynqmp-pmu-soc, and I doubt that one
actually works.
They *can* be used with -device / device_add to request help.
Usability is poor, though: you have to double the comma, like this:
$ qemu-system-x86_64 -device SUNW,,fdtwo,help
Trap for the unwary. The fact that this was broken in
device-introspect-test for more than six years until commit e27bd49876
fixed it demonstrates that "the unwary" includes seasoned developers.
One QOM type name contains ' ': "ICH9 SMB". Because having to
remember just one way to quote would be too easy.
Rename the "SUNW,FOO types to "sun-FOO". Summarily replace ',' and '
' by '-' in the other type names.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210304140229.575481-2-armbru@redhat.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
2021-03-04 15:02:28 +01:00
|
|
|
sysbus_create_simple("sun-CS4231", hwdef->cs_base,
|
2009-08-08 22:55:37 +02:00
|
|
|
slavio_irq[5]);
|
2009-07-16 15:47:45 +02:00
|
|
|
}
|
2007-06-25 21:56:13 +02:00
|
|
|
|
2010-07-13 18:05:24 +02:00
|
|
|
if (hwdef->dbri_base) {
|
|
|
|
/* ISDN chip with attached CS4215 audio codec */
|
|
|
|
/* prom space */
|
hw: Replace anti-social QOM type names
Several QOM type names contain ',':
ARM,bitband-memory
etraxfs,pic
etraxfs,serial
etraxfs,timer
fsl,imx25
fsl,imx31
fsl,imx6
fsl,imx6ul
fsl,imx7
grlib,ahbpnp
grlib,apbpnp
grlib,apbuart
grlib,gptimer
grlib,irqmp
qemu,register
SUNW,bpp
SUNW,CS4231
SUNW,DBRI
SUNW,DBRI.prom
SUNW,fdtwo
SUNW,sx
SUNW,tcx
xilinx,zynq_slcr
xlnx,zynqmp
xlnx,zynqmp-pmu-soc
xlnx,zynq-xadc
These are all device types. They can't be plugged with -device /
device_add, except for xlnx,zynqmp-pmu-soc, and I doubt that one
actually works.
They *can* be used with -device / device_add to request help.
Usability is poor, though: you have to double the comma, like this:
$ qemu-system-x86_64 -device SUNW,,fdtwo,help
Trap for the unwary. The fact that this was broken in
device-introspect-test for more than six years until commit e27bd49876
fixed it demonstrates that "the unwary" includes seasoned developers.
One QOM type name contains ' ': "ICH9 SMB". Because having to
remember just one way to quote would be too easy.
Rename the "SUNW,FOO types to "sun-FOO". Summarily replace ',' and '
' by '-' in the other type names.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210304140229.575481-2-armbru@redhat.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
2021-03-04 15:02:28 +01:00
|
|
|
create_unimplemented_device("sun-DBRI.prom",
|
2018-10-01 22:27:22 +02:00
|
|
|
hwdef->dbri_base + 0x1000, 0x30);
|
2010-07-13 18:05:24 +02:00
|
|
|
/* reg space */
|
hw: Replace anti-social QOM type names
Several QOM type names contain ',':
ARM,bitband-memory
etraxfs,pic
etraxfs,serial
etraxfs,timer
fsl,imx25
fsl,imx31
fsl,imx6
fsl,imx6ul
fsl,imx7
grlib,ahbpnp
grlib,apbpnp
grlib,apbuart
grlib,gptimer
grlib,irqmp
qemu,register
SUNW,bpp
SUNW,CS4231
SUNW,DBRI
SUNW,DBRI.prom
SUNW,fdtwo
SUNW,sx
SUNW,tcx
xilinx,zynq_slcr
xlnx,zynqmp
xlnx,zynqmp-pmu-soc
xlnx,zynq-xadc
These are all device types. They can't be plugged with -device /
device_add, except for xlnx,zynqmp-pmu-soc, and I doubt that one
actually works.
They *can* be used with -device / device_add to request help.
Usability is poor, though: you have to double the comma, like this:
$ qemu-system-x86_64 -device SUNW,,fdtwo,help
Trap for the unwary. The fact that this was broken in
device-introspect-test for more than six years until commit e27bd49876
fixed it demonstrates that "the unwary" includes seasoned developers.
One QOM type name contains ' ': "ICH9 SMB". Because having to
remember just one way to quote would be too easy.
Rename the "SUNW,FOO types to "sun-FOO". Summarily replace ',' and '
' by '-' in the other type names.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210304140229.575481-2-armbru@redhat.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
2021-03-04 15:02:28 +01:00
|
|
|
create_unimplemented_device("sun-DBRI",
|
2018-10-01 22:27:22 +02:00
|
|
|
hwdef->dbri_base + 0x10000, 0x100);
|
2010-07-13 18:05:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (hwdef->bpp_base) {
|
|
|
|
/* parallel port */
|
hw: Replace anti-social QOM type names
Several QOM type names contain ',':
ARM,bitband-memory
etraxfs,pic
etraxfs,serial
etraxfs,timer
fsl,imx25
fsl,imx31
fsl,imx6
fsl,imx6ul
fsl,imx7
grlib,ahbpnp
grlib,apbpnp
grlib,apbuart
grlib,gptimer
grlib,irqmp
qemu,register
SUNW,bpp
SUNW,CS4231
SUNW,DBRI
SUNW,DBRI.prom
SUNW,fdtwo
SUNW,sx
SUNW,tcx
xilinx,zynq_slcr
xlnx,zynqmp
xlnx,zynqmp-pmu-soc
xlnx,zynq-xadc
These are all device types. They can't be plugged with -device /
device_add, except for xlnx,zynqmp-pmu-soc, and I doubt that one
actually works.
They *can* be used with -device / device_add to request help.
Usability is poor, though: you have to double the comma, like this:
$ qemu-system-x86_64 -device SUNW,,fdtwo,help
Trap for the unwary. The fact that this was broken in
device-introspect-test for more than six years until commit e27bd49876
fixed it demonstrates that "the unwary" includes seasoned developers.
One QOM type name contains ' ': "ICH9 SMB". Because having to
remember just one way to quote would be too easy.
Rename the "SUNW,FOO types to "sun-FOO". Summarily replace ',' and '
' by '-' in the other type names.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210304140229.575481-2-armbru@redhat.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
2021-03-04 15:02:28 +01:00
|
|
|
create_unimplemented_device("sun-bpp", hwdef->bpp_base, 0x20);
|
2010-07-13 18:05:24 +02:00
|
|
|
}
|
|
|
|
|
2019-01-25 17:30:04 +01:00
|
|
|
initrd_size = 0;
|
2014-05-07 16:42:57 +02:00
|
|
|
kernel_size = sun4m_load_kernel(machine->kernel_filename,
|
|
|
|
machine->initrd_filename,
|
2019-01-25 17:30:04 +01:00
|
|
|
machine->ram_size, &initrd_size);
|
2007-04-01 17:44:43 +02:00
|
|
|
|
2020-09-26 16:02:14 +02:00
|
|
|
nvram_init(nvram, (uint8_t *)&nd->macaddr, machine->kernel_cmdline,
|
2014-05-07 16:42:57 +02:00
|
|
|
machine->boot_order, machine->ram_size, kernel_size,
|
|
|
|
graphic_width, graphic_height, graphic_depth,
|
|
|
|
hwdef->nvram_machine_id, "Sun4m");
|
2007-12-09 18:03:50 +01:00
|
|
|
|
2008-12-24 21:21:18 +01:00
|
|
|
if (hwdef->ecc_base)
|
2009-08-08 22:55:37 +02:00
|
|
|
ecc_init(hwdef->ecc_base, slavio_irq[28],
|
2008-01-17 22:04:16 +01:00
|
|
|
hwdef->ecc_version);
|
2008-09-18 20:27:29 +02:00
|
|
|
|
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_FW_CFG_MEM);
|
2018-08-10 13:41:10 +02:00
|
|
|
fw_cfg = FW_CFG(dev);
|
|
|
|
qdev_prop_set_uint32(dev, "data_width", 1);
|
|
|
|
qdev_prop_set_bit(dev, "dma_enabled", false);
|
|
|
|
object_property_add_child(OBJECT(qdev_get_machine()), TYPE_FW_CFG,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 17:29:22 +02:00
|
|
|
OBJECT(fw_cfg));
|
2018-08-10 13:41:10 +02:00
|
|
|
s = 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(s, &error_fatal);
|
2018-08-10 13:41:10 +02:00
|
|
|
sysbus_mmio_map(s, 0, CFG_ADDR);
|
|
|
|
sysbus_mmio_map(s, 1, CFG_ADDR + 2);
|
|
|
|
|
2016-11-15 13:17:15 +01:00
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, (uint16_t)smp_cpus);
|
2013-01-22 21:25:03 +01:00
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, (uint16_t)max_cpus);
|
2020-02-19 17:09:44 +01:00
|
|
|
fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)machine->ram_size);
|
2008-09-18 20:33:18 +02:00
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_MACHINE_ID, hwdef->machine_id);
|
2008-09-18 20:34:28 +02:00
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_DEPTH, graphic_depth);
|
2013-07-26 22:42:51 +02:00
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_WIDTH, graphic_width);
|
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_HEIGHT, graphic_height);
|
2009-03-08 10:51:29 +01:00
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, KERNEL_LOAD_ADDR);
|
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size);
|
2014-05-07 16:42:57 +02:00
|
|
|
if (machine->kernel_cmdline) {
|
2009-03-08 10:51:29 +01:00
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_CMDLINE, CMDLINE_ADDR);
|
2013-08-16 13:13:47 +02:00
|
|
|
pstrcpy_targphys("cmdline", CMDLINE_ADDR, TARGET_PAGE_SIZE,
|
2014-05-07 16:42:57 +02:00
|
|
|
machine->kernel_cmdline);
|
|
|
|
fw_cfg_add_string(fw_cfg, FW_CFG_CMDLINE_DATA, machine->kernel_cmdline);
|
2010-08-03 23:00:58 +02:00
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE,
|
2014-05-07 16:42:57 +02:00
|
|
|
strlen(machine->kernel_cmdline) + 1);
|
2009-03-08 10:51:29 +01:00
|
|
|
} else {
|
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_CMDLINE, 0);
|
2010-08-03 23:00:58 +02:00
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE, 0);
|
2009-03-08 10:51:29 +01:00
|
|
|
}
|
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_ADDR, INITRD_LOAD_ADDR);
|
2019-01-25 17:30:04 +01:00
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_SIZE, initrd_size);
|
2014-05-07 16:42:57 +02:00
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_BOOT_DEVICE, machine->boot_order[0]);
|
2009-03-08 10:51:29 +01:00
|
|
|
qemu_register_boot_set(fw_cfg_boot_set, fw_cfg);
|
2007-04-01 17:44:43 +02:00
|
|
|
}
|
|
|
|
|
2008-09-18 20:33:18 +02:00
|
|
|
enum {
|
|
|
|
ss5_id = 32,
|
|
|
|
vger_id,
|
|
|
|
lx_id,
|
|
|
|
ss4_id,
|
|
|
|
scls_id,
|
|
|
|
sbook_id,
|
|
|
|
ss10_id = 64,
|
|
|
|
ss20_id,
|
|
|
|
ss600mp_id,
|
|
|
|
};
|
|
|
|
|
2021-05-03 19:13:03 +02:00
|
|
|
static void sun4m_machine_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
|
|
|
|
mc->init = sun4m_hw_init;
|
|
|
|
mc->block_default_type = IF_SCSI;
|
|
|
|
mc->default_boot_order = "c";
|
|
|
|
mc->default_display = "tcx";
|
|
|
|
mc->default_ram_id = "sun4m.ram";
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ss5_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
Sun4mMachineClass *smc = SUN4M_MACHINE_CLASS(mc);
|
|
|
|
static const struct sun4m_hwdef ss5_hwdef = {
|
2007-04-01 17:44:43 +02:00
|
|
|
.iommu_base = 0x10000000,
|
2010-05-08 16:10:14 +02:00
|
|
|
.iommu_pad_base = 0x10004000,
|
|
|
|
.iommu_pad_len = 0x0fffb000,
|
2007-04-01 17:44:43 +02:00
|
|
|
.tcx_base = 0x50000000,
|
|
|
|
.cs_base = 0x6c000000,
|
2007-05-06 19:33:14 +02:00
|
|
|
.slavio_base = 0x70000000,
|
2007-04-01 17:44:43 +02:00
|
|
|
.ms_kb_base = 0x71000000,
|
|
|
|
.serial_base = 0x71100000,
|
|
|
|
.nvram_base = 0x71200000,
|
|
|
|
.fd_base = 0x71400000,
|
|
|
|
.counter_base = 0x71d00000,
|
|
|
|
.intctl_base = 0x71e00000,
|
2007-12-27 21:26:23 +01:00
|
|
|
.idreg_base = 0x78000000,
|
2007-04-01 17:44:43 +02:00
|
|
|
.dma_base = 0x78400000,
|
|
|
|
.esp_base = 0x78800000,
|
|
|
|
.le_base = 0x78c00000,
|
2008-02-01 21:12:40 +01:00
|
|
|
.apc_base = 0x6a000000,
|
2009-12-13 14:30:19 +01:00
|
|
|
.afx_base = 0x6e000000,
|
2008-01-27 10:49:28 +01:00
|
|
|
.aux1_base = 0x71900000,
|
|
|
|
.aux2_base = 0x71910000,
|
2008-09-18 20:33:18 +02:00
|
|
|
.nvram_machine_id = 0x80,
|
|
|
|
.machine_id = ss5_id,
|
2007-12-29 10:07:00 +01:00
|
|
|
.iommu_version = 0x05000000,
|
2007-11-28 21:54:33 +01:00
|
|
|
.max_mem = 0x10000000,
|
2021-05-03 19:13:03 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
mc->desc = "Sun4m platform, SPARCstation 5";
|
|
|
|
mc->is_default = true;
|
|
|
|
mc->default_cpu_type = SPARC_CPU_TYPE_NAME("Fujitsu-MB86904");
|
|
|
|
smc->hwdef = &ss5_hwdef;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ss10_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
Sun4mMachineClass *smc = SUN4M_MACHINE_CLASS(mc);
|
|
|
|
static const struct sun4m_hwdef ss10_hwdef = {
|
2007-05-19 14:58:30 +02:00
|
|
|
.iommu_base = 0xfe0000000ULL,
|
|
|
|
.tcx_base = 0xe20000000ULL,
|
|
|
|
.slavio_base = 0xff0000000ULL,
|
|
|
|
.ms_kb_base = 0xff1000000ULL,
|
|
|
|
.serial_base = 0xff1100000ULL,
|
|
|
|
.nvram_base = 0xff1200000ULL,
|
|
|
|
.fd_base = 0xff1700000ULL,
|
|
|
|
.counter_base = 0xff1300000ULL,
|
|
|
|
.intctl_base = 0xff1400000ULL,
|
2007-12-27 21:26:23 +01:00
|
|
|
.idreg_base = 0xef0000000ULL,
|
2007-05-19 14:58:30 +02:00
|
|
|
.dma_base = 0xef0400000ULL,
|
|
|
|
.esp_base = 0xef0800000ULL,
|
|
|
|
.le_base = 0xef0c00000ULL,
|
2021-05-03 19:13:02 +02:00
|
|
|
.apc_base = 0xefa000000ULL, /* XXX should not exist */
|
2008-02-01 21:12:40 +01:00
|
|
|
.aux1_base = 0xff1800000ULL,
|
|
|
|
.aux2_base = 0xff1a01000ULL,
|
2007-12-09 18:03:50 +01:00
|
|
|
.ecc_base = 0xf00000000ULL,
|
2021-05-03 19:13:02 +02:00
|
|
|
.ecc_version = 0x10000000, /* version 0, implementation 1 */
|
2008-09-18 20:33:18 +02:00
|
|
|
.nvram_machine_id = 0x72,
|
|
|
|
.machine_id = ss10_id,
|
2007-11-17 10:04:09 +01:00
|
|
|
.iommu_version = 0x03000000,
|
2008-05-01 20:21:46 +02:00
|
|
|
.max_mem = 0xf00000000ULL,
|
2021-05-03 19:13:03 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
mc->desc = "Sun4m platform, SPARCstation 10";
|
|
|
|
mc->max_cpus = 4;
|
|
|
|
mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-SuperSparc-II");
|
|
|
|
smc->hwdef = &ss10_hwdef;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ss600mp_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
Sun4mMachineClass *smc = SUN4M_MACHINE_CLASS(mc);
|
|
|
|
static const struct sun4m_hwdef ss600mp_hwdef = {
|
2007-11-11 18:56:38 +01:00
|
|
|
.iommu_base = 0xfe0000000ULL,
|
|
|
|
.tcx_base = 0xe20000000ULL,
|
|
|
|
.slavio_base = 0xff0000000ULL,
|
|
|
|
.ms_kb_base = 0xff1000000ULL,
|
|
|
|
.serial_base = 0xff1100000ULL,
|
|
|
|
.nvram_base = 0xff1200000ULL,
|
|
|
|
.counter_base = 0xff1300000ULL,
|
|
|
|
.intctl_base = 0xff1400000ULL,
|
|
|
|
.dma_base = 0xef0081000ULL,
|
|
|
|
.esp_base = 0xef0080000ULL,
|
|
|
|
.le_base = 0xef0060000ULL,
|
2021-05-03 19:13:02 +02:00
|
|
|
.apc_base = 0xefa000000ULL, /* XXX should not exist */
|
2008-02-01 21:12:40 +01:00
|
|
|
.aux1_base = 0xff1800000ULL,
|
2021-05-03 19:13:02 +02:00
|
|
|
.aux2_base = 0xff1a01000ULL, /* XXX should not exist */
|
2007-12-09 18:03:50 +01:00
|
|
|
.ecc_base = 0xf00000000ULL,
|
2021-05-03 19:13:02 +02:00
|
|
|
.ecc_version = 0x00000000, /* version 0, implementation 0 */
|
2008-09-18 20:33:18 +02:00
|
|
|
.nvram_machine_id = 0x71,
|
|
|
|
.machine_id = ss600mp_id,
|
2007-11-17 10:04:09 +01:00
|
|
|
.iommu_version = 0x01000000,
|
2008-05-01 20:21:46 +02:00
|
|
|
.max_mem = 0xf00000000ULL,
|
2021-05-03 19:13:03 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
mc->desc = "Sun4m platform, SPARCserver 600MP";
|
|
|
|
mc->max_cpus = 4;
|
|
|
|
mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-SuperSparc-II");
|
|
|
|
smc->hwdef = &ss600mp_hwdef;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ss20_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
Sun4mMachineClass *smc = SUN4M_MACHINE_CLASS(mc);
|
|
|
|
static const struct sun4m_hwdef ss20_hwdef = {
|
2007-12-10 21:00:11 +01:00
|
|
|
.iommu_base = 0xfe0000000ULL,
|
|
|
|
.tcx_base = 0xe20000000ULL,
|
|
|
|
.slavio_base = 0xff0000000ULL,
|
|
|
|
.ms_kb_base = 0xff1000000ULL,
|
|
|
|
.serial_base = 0xff1100000ULL,
|
|
|
|
.nvram_base = 0xff1200000ULL,
|
|
|
|
.fd_base = 0xff1700000ULL,
|
|
|
|
.counter_base = 0xff1300000ULL,
|
|
|
|
.intctl_base = 0xff1400000ULL,
|
2007-12-27 21:26:23 +01:00
|
|
|
.idreg_base = 0xef0000000ULL,
|
2007-12-10 21:00:11 +01:00
|
|
|
.dma_base = 0xef0400000ULL,
|
|
|
|
.esp_base = 0xef0800000ULL,
|
|
|
|
.le_base = 0xef0c00000ULL,
|
2010-07-13 18:05:24 +02:00
|
|
|
.bpp_base = 0xef4800000ULL,
|
2021-05-03 19:13:02 +02:00
|
|
|
.apc_base = 0xefa000000ULL, /* XXX should not exist */
|
2008-02-11 21:01:36 +01:00
|
|
|
.aux1_base = 0xff1800000ULL,
|
|
|
|
.aux2_base = 0xff1a01000ULL,
|
2010-07-13 18:05:24 +02:00
|
|
|
.dbri_base = 0xee0000000ULL,
|
|
|
|
.sx_base = 0xf80000000ULL,
|
|
|
|
.vsimm = {
|
|
|
|
{
|
|
|
|
.reg_base = 0x9c000000ULL,
|
|
|
|
.vram_base = 0xfc000000ULL
|
|
|
|
}, {
|
|
|
|
.reg_base = 0x90000000ULL,
|
|
|
|
.vram_base = 0xf0000000ULL
|
|
|
|
}, {
|
|
|
|
.reg_base = 0x94000000ULL
|
|
|
|
}, {
|
|
|
|
.reg_base = 0x98000000ULL
|
|
|
|
}
|
|
|
|
},
|
2007-12-10 21:00:11 +01:00
|
|
|
.ecc_base = 0xf00000000ULL,
|
2021-05-03 19:13:02 +02:00
|
|
|
.ecc_version = 0x20000000, /* version 0, implementation 2 */
|
2008-09-18 20:33:18 +02:00
|
|
|
.nvram_machine_id = 0x72,
|
|
|
|
.machine_id = ss20_id,
|
2007-12-10 21:00:11 +01:00
|
|
|
.iommu_version = 0x13000000,
|
2008-05-01 20:21:46 +02:00
|
|
|
.max_mem = 0xf00000000ULL,
|
2021-05-03 19:13:03 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
mc->desc = "Sun4m platform, SPARCstation 20";
|
|
|
|
mc->max_cpus = 4;
|
|
|
|
mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-SuperSparc-II");
|
|
|
|
smc->hwdef = &ss20_hwdef;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void voyager_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
Sun4mMachineClass *smc = SUN4M_MACHINE_CLASS(mc);
|
|
|
|
static const struct sun4m_hwdef voyager_hwdef = {
|
2008-03-05 19:27:45 +01:00
|
|
|
.iommu_base = 0x10000000,
|
|
|
|
.tcx_base = 0x50000000,
|
|
|
|
.slavio_base = 0x70000000,
|
|
|
|
.ms_kb_base = 0x71000000,
|
|
|
|
.serial_base = 0x71100000,
|
|
|
|
.nvram_base = 0x71200000,
|
|
|
|
.fd_base = 0x71400000,
|
|
|
|
.counter_base = 0x71d00000,
|
|
|
|
.intctl_base = 0x71e00000,
|
|
|
|
.idreg_base = 0x78000000,
|
|
|
|
.dma_base = 0x78400000,
|
|
|
|
.esp_base = 0x78800000,
|
|
|
|
.le_base = 0x78c00000,
|
2021-05-03 19:13:02 +02:00
|
|
|
.apc_base = 0x71300000, /* pmc */
|
2008-03-05 19:27:45 +01:00
|
|
|
.aux1_base = 0x71900000,
|
|
|
|
.aux2_base = 0x71910000,
|
2008-09-18 20:33:18 +02:00
|
|
|
.nvram_machine_id = 0x80,
|
|
|
|
.machine_id = vger_id,
|
2008-03-05 19:27:45 +01:00
|
|
|
.iommu_version = 0x05000000,
|
|
|
|
.max_mem = 0x10000000,
|
2021-05-03 19:13:03 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
mc->desc = "Sun4m platform, SPARCstation Voyager";
|
|
|
|
mc->default_cpu_type = SPARC_CPU_TYPE_NAME("Fujitsu-MB86904");
|
|
|
|
smc->hwdef = &voyager_hwdef;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ss_lx_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
Sun4mMachineClass *smc = SUN4M_MACHINE_CLASS(mc);
|
|
|
|
static const struct sun4m_hwdef ss_lx_hwdef = {
|
2008-03-05 19:27:45 +01:00
|
|
|
.iommu_base = 0x10000000,
|
2010-05-08 16:10:14 +02:00
|
|
|
.iommu_pad_base = 0x10004000,
|
|
|
|
.iommu_pad_len = 0x0fffb000,
|
2008-03-05 19:27:45 +01:00
|
|
|
.tcx_base = 0x50000000,
|
|
|
|
.slavio_base = 0x70000000,
|
|
|
|
.ms_kb_base = 0x71000000,
|
|
|
|
.serial_base = 0x71100000,
|
|
|
|
.nvram_base = 0x71200000,
|
|
|
|
.fd_base = 0x71400000,
|
|
|
|
.counter_base = 0x71d00000,
|
|
|
|
.intctl_base = 0x71e00000,
|
|
|
|
.idreg_base = 0x78000000,
|
|
|
|
.dma_base = 0x78400000,
|
|
|
|
.esp_base = 0x78800000,
|
|
|
|
.le_base = 0x78c00000,
|
|
|
|
.aux1_base = 0x71900000,
|
|
|
|
.aux2_base = 0x71910000,
|
2008-09-18 20:33:18 +02:00
|
|
|
.nvram_machine_id = 0x80,
|
|
|
|
.machine_id = lx_id,
|
2008-03-05 19:27:45 +01:00
|
|
|
.iommu_version = 0x04000000,
|
|
|
|
.max_mem = 0x10000000,
|
2021-05-03 19:13:03 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
mc->desc = "Sun4m platform, SPARCstation LX";
|
|
|
|
mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-MicroSparc-I");
|
|
|
|
smc->hwdef = &ss_lx_hwdef;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ss4_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
Sun4mMachineClass *smc = SUN4M_MACHINE_CLASS(mc);
|
|
|
|
static const struct sun4m_hwdef ss4_hwdef = {
|
2008-03-05 19:27:45 +01:00
|
|
|
.iommu_base = 0x10000000,
|
|
|
|
.tcx_base = 0x50000000,
|
|
|
|
.cs_base = 0x6c000000,
|
|
|
|
.slavio_base = 0x70000000,
|
|
|
|
.ms_kb_base = 0x71000000,
|
|
|
|
.serial_base = 0x71100000,
|
|
|
|
.nvram_base = 0x71200000,
|
|
|
|
.fd_base = 0x71400000,
|
|
|
|
.counter_base = 0x71d00000,
|
|
|
|
.intctl_base = 0x71e00000,
|
|
|
|
.idreg_base = 0x78000000,
|
|
|
|
.dma_base = 0x78400000,
|
|
|
|
.esp_base = 0x78800000,
|
|
|
|
.le_base = 0x78c00000,
|
|
|
|
.apc_base = 0x6a000000,
|
|
|
|
.aux1_base = 0x71900000,
|
|
|
|
.aux2_base = 0x71910000,
|
2008-09-18 20:33:18 +02:00
|
|
|
.nvram_machine_id = 0x80,
|
|
|
|
.machine_id = ss4_id,
|
2008-03-05 19:27:45 +01:00
|
|
|
.iommu_version = 0x05000000,
|
|
|
|
.max_mem = 0x10000000,
|
2021-05-03 19:13:03 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
mc->desc = "Sun4m platform, SPARCstation 4";
|
|
|
|
mc->default_cpu_type = SPARC_CPU_TYPE_NAME("Fujitsu-MB86904");
|
|
|
|
smc->hwdef = &ss4_hwdef;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void scls_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
Sun4mMachineClass *smc = SUN4M_MACHINE_CLASS(mc);
|
|
|
|
static const struct sun4m_hwdef scls_hwdef = {
|
2008-03-05 19:27:45 +01:00
|
|
|
.iommu_base = 0x10000000,
|
|
|
|
.tcx_base = 0x50000000,
|
|
|
|
.slavio_base = 0x70000000,
|
|
|
|
.ms_kb_base = 0x71000000,
|
|
|
|
.serial_base = 0x71100000,
|
|
|
|
.nvram_base = 0x71200000,
|
|
|
|
.fd_base = 0x71400000,
|
|
|
|
.counter_base = 0x71d00000,
|
|
|
|
.intctl_base = 0x71e00000,
|
|
|
|
.idreg_base = 0x78000000,
|
|
|
|
.dma_base = 0x78400000,
|
|
|
|
.esp_base = 0x78800000,
|
|
|
|
.le_base = 0x78c00000,
|
|
|
|
.apc_base = 0x6a000000,
|
|
|
|
.aux1_base = 0x71900000,
|
|
|
|
.aux2_base = 0x71910000,
|
2008-09-18 20:33:18 +02:00
|
|
|
.nvram_machine_id = 0x80,
|
|
|
|
.machine_id = scls_id,
|
2008-03-05 19:27:45 +01:00
|
|
|
.iommu_version = 0x05000000,
|
|
|
|
.max_mem = 0x10000000,
|
2021-05-03 19:13:03 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
mc->desc = "Sun4m platform, SPARCClassic";
|
|
|
|
mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-MicroSparc-I");
|
|
|
|
smc->hwdef = &scls_hwdef;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sbook_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
Sun4mMachineClass *smc = SUN4M_MACHINE_CLASS(mc);
|
|
|
|
static const struct sun4m_hwdef sbook_hwdef = {
|
2008-03-05 19:27:45 +01:00
|
|
|
.iommu_base = 0x10000000,
|
2021-05-03 19:13:02 +02:00
|
|
|
.tcx_base = 0x50000000, /* XXX */
|
2008-03-05 19:27:45 +01:00
|
|
|
.slavio_base = 0x70000000,
|
|
|
|
.ms_kb_base = 0x71000000,
|
|
|
|
.serial_base = 0x71100000,
|
|
|
|
.nvram_base = 0x71200000,
|
|
|
|
.fd_base = 0x71400000,
|
|
|
|
.counter_base = 0x71d00000,
|
|
|
|
.intctl_base = 0x71e00000,
|
|
|
|
.idreg_base = 0x78000000,
|
|
|
|
.dma_base = 0x78400000,
|
|
|
|
.esp_base = 0x78800000,
|
|
|
|
.le_base = 0x78c00000,
|
|
|
|
.apc_base = 0x6a000000,
|
|
|
|
.aux1_base = 0x71900000,
|
|
|
|
.aux2_base = 0x71910000,
|
2008-09-18 20:33:18 +02:00
|
|
|
.nvram_machine_id = 0x80,
|
|
|
|
.machine_id = sbook_id,
|
2008-03-05 19:27:45 +01:00
|
|
|
.iommu_version = 0x05000000,
|
|
|
|
.max_mem = 0x10000000,
|
2021-05-03 19:13:03 +02:00
|
|
|
};
|
2015-09-19 10:49:44 +02:00
|
|
|
|
2015-09-04 20:37:08 +02:00
|
|
|
mc->desc = "Sun4m platform, SPARCbook";
|
2017-10-05 15:51:07 +02:00
|
|
|
mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-MicroSparc-I");
|
2021-05-03 19:13:03 +02:00
|
|
|
smc->hwdef = &sbook_hwdef;
|
2015-09-04 20:37:08 +02:00
|
|
|
}
|
|
|
|
|
2021-05-03 19:12:58 +02:00
|
|
|
static const TypeInfo sun4m_machine_types[] = {
|
|
|
|
{
|
2021-05-03 19:13:01 +02:00
|
|
|
.name = MACHINE_TYPE_NAME("SS-5"),
|
|
|
|
.parent = TYPE_SUN4M_MACHINE,
|
|
|
|
.class_init = ss5_class_init,
|
|
|
|
}, {
|
|
|
|
.name = MACHINE_TYPE_NAME("SS-10"),
|
|
|
|
.parent = TYPE_SUN4M_MACHINE,
|
|
|
|
.class_init = ss10_class_init,
|
|
|
|
}, {
|
|
|
|
.name = MACHINE_TYPE_NAME("SS-600MP"),
|
|
|
|
.parent = TYPE_SUN4M_MACHINE,
|
|
|
|
.class_init = ss600mp_class_init,
|
|
|
|
}, {
|
|
|
|
.name = MACHINE_TYPE_NAME("SS-20"),
|
|
|
|
.parent = TYPE_SUN4M_MACHINE,
|
|
|
|
.class_init = ss20_class_init,
|
|
|
|
}, {
|
|
|
|
.name = MACHINE_TYPE_NAME("Voyager"),
|
|
|
|
.parent = TYPE_SUN4M_MACHINE,
|
|
|
|
.class_init = voyager_class_init,
|
|
|
|
}, {
|
|
|
|
.name = MACHINE_TYPE_NAME("LX"),
|
|
|
|
.parent = TYPE_SUN4M_MACHINE,
|
|
|
|
.class_init = ss_lx_class_init,
|
|
|
|
}, {
|
|
|
|
.name = MACHINE_TYPE_NAME("SS-4"),
|
|
|
|
.parent = TYPE_SUN4M_MACHINE,
|
|
|
|
.class_init = ss4_class_init,
|
|
|
|
}, {
|
|
|
|
.name = MACHINE_TYPE_NAME("SPARCClassic"),
|
|
|
|
.parent = TYPE_SUN4M_MACHINE,
|
|
|
|
.class_init = scls_class_init,
|
|
|
|
}, {
|
|
|
|
.name = MACHINE_TYPE_NAME("SPARCbook"),
|
|
|
|
.parent = TYPE_SUN4M_MACHINE,
|
|
|
|
.class_init = sbook_class_init,
|
|
|
|
}, {
|
2021-05-03 19:12:58 +02:00
|
|
|
.name = TYPE_SUN4M_MACHINE,
|
|
|
|
.parent = TYPE_MACHINE,
|
2021-05-03 19:12:59 +02:00
|
|
|
.class_size = sizeof(Sun4mMachineClass),
|
2021-05-03 19:13:00 +02:00
|
|
|
.class_init = sun4m_machine_class_init,
|
2021-05-03 19:12:58 +02:00
|
|
|
.abstract = true,
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
DEFINE_TYPES(sun4m_machine_types)
|
|
|
|
|
2012-02-09 15:20:55 +01:00
|
|
|
static void sun4m_register_types(void)
|
|
|
|
{
|
|
|
|
type_register_static(&idreg_info);
|
|
|
|
type_register_static(&afx_info);
|
|
|
|
type_register_static(&prom_info);
|
|
|
|
type_register_static(&ram_info);
|
2015-09-19 10:49:44 +02:00
|
|
|
}
|
|
|
|
|
2012-02-09 15:20:55 +01:00
|
|
|
type_init(sun4m_register_types)
|