2004-05-27 00:55:16 +02:00
|
|
|
/*
|
2007-10-29 00:42:18 +01:00
|
|
|
* QEMU PowerPC CHRP (currently NewWorld PowerMac) hardware System Emulator
|
2007-09-16 23:08:06 +02:00
|
|
|
*
|
2007-03-30 11:38:04 +02:00
|
|
|
* Copyright (c) 2004-2007 Fabrice Bellard
|
2007-10-29 00:42:18 +01:00
|
|
|
* Copyright (c) 2007 Jocelyn Mayer
|
2007-09-16 23:08:06 +02:00
|
|
|
*
|
2004-05-27 00:55:16 +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.
|
2010-02-09 17:37:03 +01:00
|
|
|
*
|
|
|
|
* PCI bus layout on a real G5 (U3 based):
|
|
|
|
*
|
|
|
|
* 0000:f0:0b.0 Host bridge [0600]: Apple Computer Inc. U3 AGP [106b:004b]
|
|
|
|
* 0000:f0:10.0 VGA compatible controller [0300]: ATI Technologies Inc RV350 AP [Radeon 9600] [1002:4150]
|
|
|
|
* 0001:00:00.0 Host bridge [0600]: Apple Computer Inc. CPC945 HT Bridge [106b:004a]
|
|
|
|
* 0001:00:01.0 PCI bridge [0604]: Advanced Micro Devices [AMD] AMD-8131 PCI-X Bridge [1022:7450] (rev 12)
|
|
|
|
* 0001:00:02.0 PCI bridge [0604]: Advanced Micro Devices [AMD] AMD-8131 PCI-X Bridge [1022:7450] (rev 12)
|
|
|
|
* 0001:00:03.0 PCI bridge [0604]: Apple Computer Inc. K2 HT-PCI Bridge [106b:0045]
|
|
|
|
* 0001:00:04.0 PCI bridge [0604]: Apple Computer Inc. K2 HT-PCI Bridge [106b:0046]
|
|
|
|
* 0001:00:05.0 PCI bridge [0604]: Apple Computer Inc. K2 HT-PCI Bridge [106b:0047]
|
|
|
|
* 0001:00:06.0 PCI bridge [0604]: Apple Computer Inc. K2 HT-PCI Bridge [106b:0048]
|
|
|
|
* 0001:00:07.0 PCI bridge [0604]: Apple Computer Inc. K2 HT-PCI Bridge [106b:0049]
|
|
|
|
* 0001:01:07.0 Class [ff00]: Apple Computer Inc. K2 KeyLargo Mac/IO [106b:0041] (rev 20)
|
|
|
|
* 0001:01:08.0 USB Controller [0c03]: Apple Computer Inc. K2 KeyLargo USB [106b:0040]
|
|
|
|
* 0001:01:09.0 USB Controller [0c03]: Apple Computer Inc. K2 KeyLargo USB [106b:0040]
|
|
|
|
* 0001:02:0b.0 USB Controller [0c03]: NEC Corporation USB [1033:0035] (rev 43)
|
|
|
|
* 0001:02:0b.1 USB Controller [0c03]: NEC Corporation USB [1033:0035] (rev 43)
|
|
|
|
* 0001:02:0b.2 USB Controller [0c03]: NEC Corporation USB 2.0 [1033:00e0] (rev 04)
|
|
|
|
* 0001:03:0d.0 Class [ff00]: Apple Computer Inc. K2 ATA/100 [106b:0043]
|
|
|
|
* 0001:03:0e.0 FireWire (IEEE 1394) [0c00]: Apple Computer Inc. K2 FireWire [106b:0042]
|
|
|
|
* 0001:04:0f.0 Ethernet controller [0200]: Apple Computer Inc. K2 GMAC (Sun GEM) [106b:004c]
|
|
|
|
* 0001:05:0c.0 IDE interface [0101]: Broadcom K2 SATA [1166:0240]
|
2004-05-27 00:55:16 +02:00
|
|
|
*/
|
2019-05-23 16:35:08 +02:00
|
|
|
|
2016-01-26 19:16:58 +01:00
|
|
|
#include "qemu/osdep.h"
|
2019-05-23 16:35:08 +02:00
|
|
|
#include "qemu-common.h"
|
2020-10-28 12:36:57 +01:00
|
|
|
#include "qemu/datadir.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"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/ppc/ppc.h"
|
2019-08-12 07:23:51 +02:00
|
|
|
#include "hw/qdev-properties.h"
|
2013-01-24 00:03:54 +01:00
|
|
|
#include "hw/ppc/mac.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/input/adb.h"
|
|
|
|
#include "hw/ppc/mac_dbdma.h"
|
2013-01-24 00:03:54 +01:00
|
|
|
#include "hw/pci/pci.h"
|
2012-10-24 08:43:34 +02:00
|
|
|
#include "net/net.h"
|
2012-12-17 18:20:04 +01:00
|
|
|
#include "sysemu/sysemu.h"
|
2013-01-24 00:03:54 +01:00
|
|
|
#include "hw/boards.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/nvram/fw_cfg.h"
|
|
|
|
#include "hw/char/escc.h"
|
2018-02-28 21:32:37 +01:00
|
|
|
#include "hw/misc/macio/macio.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/ppc/openpic.h"
|
2013-01-24 00:03:54 +01:00
|
|
|
#include "hw/loader.h"
|
2018-08-29 18:59:11 +02:00
|
|
|
#include "hw/fw-path-provider.h"
|
2009-09-20 16:58:02 +02:00
|
|
|
#include "elf.h"
|
2015-12-17 17:35:09 +01:00
|
|
|
#include "qemu/error-report.h"
|
2012-12-17 18:20:04 +01:00
|
|
|
#include "sysemu/kvm.h"
|
2019-08-12 07:23:38 +02:00
|
|
|
#include "sysemu/reset.h"
|
2010-02-09 17:37:05 +01:00
|
|
|
#include "kvm_ppc.h"
|
2010-02-09 17:37:08 +01:00
|
|
|
#include "hw/usb.h"
|
2012-12-17 18:19:49 +01:00
|
|
|
#include "exec/address-spaces.h"
|
2013-01-24 00:03:54 +01:00
|
|
|
#include "hw/sysbus.h"
|
2017-02-10 10:27:22 +01:00
|
|
|
#include "trace.h"
|
2004-06-03 20:46:20 +02:00
|
|
|
|
2007-12-02 05:51:10 +01:00
|
|
|
#define MAX_IDE_BUS 2
|
2009-02-08 16:59:36 +01:00
|
|
|
#define CFG_ADDR 0xf0000510
|
2013-06-29 17:34:58 +02:00
|
|
|
#define TBFREQ (100UL * 1000UL * 1000UL)
|
2017-09-17 19:15:42 +02:00
|
|
|
#define CLOCKFREQ (900UL * 1000UL * 1000UL)
|
2014-04-17 19:04:44 +02:00
|
|
|
#define BUSFREQ (100UL * 1000UL * 1000UL)
|
2007-12-02 05:51:10 +01:00
|
|
|
|
2017-05-01 15:43:33 +02:00
|
|
|
#define NDRV_VGA_FILENAME "qemu_vga.ndrv"
|
|
|
|
|
2020-10-16 01:47:17 +02:00
|
|
|
#define PROM_BASE 0xfff00000
|
|
|
|
#define PROM_SIZE (1 * MiB)
|
2005-06-05 17:11:17 +02:00
|
|
|
|
2014-12-03 20:04:02 +01:00
|
|
|
static void fw_cfg_boot_set(void *opaque, const char *boot_device,
|
|
|
|
Error **errp)
|
2009-03-08 10:51:29 +01:00
|
|
|
{
|
2015-06-08 20:10:45 +02:00
|
|
|
fw_cfg_modify_i16(opaque, FW_CFG_BOOT_DEVICE, boot_device[0]);
|
2009-03-08 10:51:29 +01:00
|
|
|
}
|
|
|
|
|
2010-03-14 21:20:59 +01:00
|
|
|
static uint64_t translate_kernel_address(void *opaque, uint64_t addr)
|
|
|
|
{
|
|
|
|
return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR;
|
|
|
|
}
|
|
|
|
|
2012-02-08 03:03:33 +01:00
|
|
|
static void ppc_core99_reset(void *opaque)
|
|
|
|
{
|
2012-05-04 17:30:25 +02:00
|
|
|
PowerPCCPU *cpu = opaque;
|
2012-02-08 03:03:33 +01:00
|
|
|
|
2012-05-04 17:30:25 +02:00
|
|
|
cpu_reset(CPU(cpu));
|
2013-04-04 18:45:07 +02:00
|
|
|
/* 970 CPUs want to get their initial IP as part of their boot protocol */
|
2020-10-16 01:47:17 +02:00
|
|
|
cpu->env.nip = PROM_BASE + 0x100;
|
2012-02-08 03:03:33 +01:00
|
|
|
}
|
|
|
|
|
2007-10-29 00:42:18 +01:00
|
|
|
/* PowerPC Mac99 hardware initialisation */
|
2014-05-07 16:42:57 +02:00
|
|
|
static void ppc_core99_init(MachineState *machine)
|
2004-05-27 00:55:16 +02:00
|
|
|
{
|
2014-05-07 16:42:57 +02:00
|
|
|
ram_addr_t ram_size = machine->ram_size;
|
2020-10-26 15:30:23 +01:00
|
|
|
const char *bios_name = machine->firmware ?: PROM_FILENAME;
|
2014-05-07 16:42:57 +02:00
|
|
|
const char *kernel_filename = machine->kernel_filename;
|
|
|
|
const char *kernel_cmdline = machine->kernel_cmdline;
|
|
|
|
const char *initrd_filename = machine->initrd_filename;
|
|
|
|
const char *boot_device = machine->boot_order;
|
2018-06-12 18:43:57 +02:00
|
|
|
Core99MachineState *core99_machine = CORE99_MACHINE(machine);
|
2012-05-04 17:29:07 +02:00
|
|
|
PowerPCCPU *cpu = NULL;
|
2012-03-14 01:38:23 +01:00
|
|
|
CPUPPCState *env = NULL;
|
2009-05-30 01:52:44 +02:00
|
|
|
char *filename;
|
2018-11-27 14:06:22 +01:00
|
|
|
IrqLines *openpic_irqs;
|
2012-12-08 05:17:14 +01:00
|
|
|
int linux_boot, i, j, k;
|
2020-02-19 17:09:34 +01:00
|
|
|
MemoryRegion *bios = g_new(MemoryRegion, 1);
|
2012-10-23 12:30:10 +02:00
|
|
|
hwaddr kernel_base, initrd_base, cmdline_base = 0;
|
2010-09-18 07:53:14 +02:00
|
|
|
long kernel_size, initrd_size;
|
2018-03-06 21:31:00 +01:00
|
|
|
UNINHostState *uninorth_pci;
|
2004-06-21 21:43:00 +02:00
|
|
|
PCIBus *pci_bus;
|
2020-06-10 07:32:03 +02:00
|
|
|
PCIDevice *macio;
|
2020-10-13 13:49:20 +02:00
|
|
|
ESCCState *escc;
|
2018-06-12 18:43:57 +02:00
|
|
|
bool has_pmu, has_adb;
|
2013-01-24 00:04:01 +01:00
|
|
|
MACIOIDEState *macio_ide;
|
2013-01-24 00:04:05 +01:00
|
|
|
BusState *adb_bus;
|
2007-10-29 00:42:18 +01:00
|
|
|
MacIONVRAMState *nvr;
|
2018-12-14 14:30:50 +01:00
|
|
|
int bios_size;
|
2007-11-11 02:50:45 +01:00
|
|
|
int ppc_boot_device;
|
2009-08-28 15:47:03 +02:00
|
|
|
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
|
2009-02-08 16:59:36 +01:00
|
|
|
void *fw_cfg;
|
2010-02-09 17:37:02 +01:00
|
|
|
int machine_arch;
|
2012-12-08 05:17:14 +01:00
|
|
|
SysBusDevice *s;
|
2018-02-28 21:32:41 +01:00
|
|
|
DeviceState *dev, *pic_dev;
|
2014-07-11 03:24:39 +02:00
|
|
|
hwaddr nvram_addr = 0xFFF04000;
|
2014-07-13 22:29:02 +02:00
|
|
|
uint64_t tbfreq;
|
2019-05-18 22:54:22 +02:00
|
|
|
unsigned int smp_cpus = machine->smp.cpus;
|
2004-06-21 21:43:00 +02:00
|
|
|
|
2004-05-27 00:55:16 +02:00
|
|
|
linux_boot = (kernel_filename != NULL);
|
|
|
|
|
2005-11-22 00:33:12 +01:00
|
|
|
/* init CPUs */
|
2007-04-10 00:45:36 +02:00
|
|
|
for (i = 0; i < smp_cpus; i++) {
|
2017-10-09 21:50:52 +02:00
|
|
|
cpu = POWERPC_CPU(cpu_create(machine->cpu_type));
|
2012-05-04 17:29:07 +02:00
|
|
|
env = &cpu->env;
|
|
|
|
|
2007-04-10 00:45:36 +02:00
|
|
|
/* Set time-base frequency to 100 Mhz */
|
2013-06-29 17:34:58 +02:00
|
|
|
cpu_ppc_tb_init(env, TBFREQ);
|
2012-05-04 17:30:25 +02:00
|
|
|
qemu_register_reset(ppc_core99_reset, cpu);
|
2007-04-10 00:45:36 +02:00
|
|
|
}
|
2005-11-22 00:33:12 +01:00
|
|
|
|
2004-05-27 00:55:16 +02:00
|
|
|
/* allocate RAM */
|
2020-02-19 17:09:34 +01:00
|
|
|
memory_region_add_subregion(get_system_memory(), 0, machine->ram);
|
2009-02-05 21:20:29 +01:00
|
|
|
|
2020-10-16 01:47:17 +02:00
|
|
|
/* allocate and load firmware ROM */
|
|
|
|
memory_region_init_rom(bios, NULL, "ppc_core99.bios", PROM_SIZE,
|
Fix bad error handling after memory_region_init_ram()
Symptom:
$ qemu-system-x86_64 -m 10000000
Unexpected error in ram_block_add() at /work/armbru/qemu/exec.c:1456:
upstream-qemu: cannot set up guest memory 'pc.ram': Cannot allocate memory
Aborted (core dumped)
Root cause: commit ef701d7 screwed up handling of out-of-memory
conditions. Before the commit, we report the error and exit(1), in
one place, ram_block_add(). The commit lifts the error handling up
the call chain some, to three places. Fine. Except it uses
&error_abort in these places, changing the behavior from exit(1) to
abort(), and thus undoing the work of commit 3922825 "exec: Don't
abort when we can't allocate guest memory".
The three places are:
* memory_region_init_ram()
Commit 4994653 (right after commit ef701d7) lifted the error
handling further, through memory_region_init_ram(), multiplying the
incorrect use of &error_abort. Later on, imitation of existing
(bad) code may have created more.
* memory_region_init_ram_ptr()
The &error_abort is still there.
* memory_region_init_rom_device()
Doesn't need fixing, because commit 33e0eb5 (soon after commit
ef701d7) lifted the error handling further, and in the process
changed it from &error_abort to passing it up the call chain.
Correct, because the callers are realize() methods.
Fix the error handling after memory_region_init_ram() with a
Coccinelle semantic patch:
@r@
expression mr, owner, name, size, err;
position p;
@@
memory_region_init_ram(mr, owner, name, size,
(
- &error_abort
+ &error_fatal
|
err@p
)
);
@script:python@
p << r.p;
@@
print "%s:%s:%s" % (p[0].file, p[0].line, p[0].column)
When the last argument is &error_abort, it gets replaced by
&error_fatal. This is the fix.
If the last argument is anything else, its position is reported. This
lets us check the fix is complete. Four positions get reported:
* ram_backend_memory_alloc()
Error is passed up the call chain, ultimately through
user_creatable_complete(). As far as I can tell, it's callers all
handle the error sanely.
* fsl_imx25_realize(), fsl_imx31_realize(), dp8393x_realize()
DeviceClass.realize() methods, errors handled sanely further up the
call chain.
We're good. Test case again behaves:
$ qemu-system-x86_64 -m 10000000
qemu-system-x86_64: cannot set up guest memory 'pc.ram': Cannot allocate memory
[Exit 1 ]
The next commits will repair the rest of commit ef701d7's damage.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1441983105-26376-3-git-send-email-armbru@redhat.com>
Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
2015-09-11 16:51:43 +02:00
|
|
|
&error_fatal);
|
2020-10-16 01:47:17 +02:00
|
|
|
memory_region_add_subregion(get_system_memory(), PROM_BASE, bios);
|
ppc: fix -mem-path failure
commit e938ba0c tried to enable -mem-path for ppc but breaked some ppc
boards.
The problems are:
1. it fails when allocating memory for rom, sram whose sizes are less
than huge page size:
./ppc-softmmu/qemu-system-ppc -m 512 -mem-path /hugepages/ \
-kernel /home/hutao/Downloads/vmlinux-ppc -initrd \
/home/hutao/Downloads/initrd-ppc.gz
qemu-system-ppc: /mnt/data/projects/qemu/exec.c:1184: qemu_ram_set_idstr: Assertion `new_block' failed.
2. if there is a numa node backed by memory backend object, qemu fails
with message:
./ppc-softmmu/qemu-system-ppc -m 512 \
-object memory-backend-file,size=512M,mem-path=/hugepages,id=f0 \
-numa node,nodeid=0,memdev=f0 \
-kernel /home/hutao/Downloads/vmlinux-ppc \
-initrd /home/hutao/Downloads/initrd-ppc.gz
qemu-system-ppc: memory backend f0 is used multiple times. Each -numa option must use a different memdev value.
This patch does following:
1. replaces memory_region_allocate_system_memory() with
memory_region_init_ram() for rom, sram. Then only system memory
is backed by hugepages when specifying mem-path.
2. for memory banks, allocates all ram with
one memory_region_allocate_system_memory(), and use
memory_region_init_alias() to initialize memory banks.
Tested machines: default(g3beige), mac99, taihu, bamboo, ref405ep.
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2014-07-21 11:30:17 +02:00
|
|
|
|
2009-05-30 01:52:44 +02:00
|
|
|
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
|
|
|
|
if (filename) {
|
2020-10-16 01:47:17 +02:00
|
|
|
/* Load OpenBIOS (ELF) */
|
2019-01-15 13:18:03 +01:00
|
|
|
bios_size = load_elf(filename, NULL, NULL, NULL, NULL,
|
2020-01-26 23:55:04 +01:00
|
|
|
NULL, NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0);
|
2009-09-20 16:58:02 +02:00
|
|
|
|
2020-10-16 01:47:17 +02:00
|
|
|
if (bios_size <= 0) {
|
|
|
|
/* or load binary ROM image */
|
|
|
|
bios_size = load_image_targphys(filename, PROM_BASE, PROM_SIZE);
|
|
|
|
}
|
2011-08-21 05:09:37 +02:00
|
|
|
g_free(filename);
|
2009-05-30 01:52:44 +02:00
|
|
|
} else {
|
|
|
|
bios_size = -1;
|
|
|
|
}
|
2020-10-16 01:47:17 +02:00
|
|
|
if (bios_size < 0 || bios_size > PROM_SIZE) {
|
2015-12-17 17:35:09 +01:00
|
|
|
error_report("could not load PowerPC bios '%s'", bios_name);
|
2004-05-27 00:55:16 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
2007-09-17 10:09:54 +02:00
|
|
|
|
2004-06-21 18:55:53 +02:00
|
|
|
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
|
2004-06-21 18:55:53 +02:00
|
|
|
kernel_base = KERNEL_LOAD_ADDR;
|
2009-03-08 10:51:29 +01:00
|
|
|
|
2019-01-15 13:18:03 +01:00
|
|
|
kernel_size = load_elf(kernel_filename, NULL,
|
2020-07-05 19:22:11 +02:00
|
|
|
translate_kernel_address, NULL, NULL, NULL,
|
|
|
|
NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0);
|
2009-03-08 10:51:29 +01:00
|
|
|
if (kernel_size < 0)
|
|
|
|
kernel_size = load_aout(kernel_filename, kernel_base,
|
2009-09-20 16:58:02 +02:00
|
|
|
ram_size - kernel_base, bswap_needed,
|
|
|
|
TARGET_PAGE_SIZE);
|
2009-03-08 10:51:29 +01:00
|
|
|
if (kernel_size < 0)
|
|
|
|
kernel_size = load_image_targphys(kernel_filename,
|
|
|
|
kernel_base,
|
|
|
|
ram_size - kernel_base);
|
2004-06-21 18:55:53 +02:00
|
|
|
if (kernel_size < 0) {
|
2015-12-17 17:35:09 +01:00
|
|
|
error_report("could not load kernel '%s'", kernel_filename);
|
2004-06-21 18:55:53 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
/* load initrd */
|
|
|
|
if (initrd_filename) {
|
2017-09-11 22:16:10 +02:00
|
|
|
initrd_base = TARGET_PAGE_ALIGN(kernel_base + kernel_size + KERNEL_GAP);
|
2009-04-10 02:26:15 +02:00
|
|
|
initrd_size = load_image_targphys(initrd_filename, initrd_base,
|
|
|
|
ram_size - initrd_base);
|
2004-06-21 18:55:53 +02:00
|
|
|
if (initrd_size < 0) {
|
2015-12-17 17:35:09 +01:00
|
|
|
error_report("could not load initial ram disk '%s'",
|
|
|
|
initrd_filename);
|
2004-06-21 18:55:53 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
2017-09-11 22:16:10 +02:00
|
|
|
cmdline_base = TARGET_PAGE_ALIGN(initrd_base + initrd_size);
|
2004-06-21 18:55:53 +02:00
|
|
|
} else {
|
|
|
|
initrd_base = 0;
|
|
|
|
initrd_size = 0;
|
2017-09-11 22:16:10 +02:00
|
|
|
cmdline_base = TARGET_PAGE_ALIGN(kernel_base + kernel_size + KERNEL_GAP);
|
2004-06-21 18:55:53 +02:00
|
|
|
}
|
2007-10-31 02:54:04 +01:00
|
|
|
ppc_boot_device = 'm';
|
2004-06-21 18:55:53 +02:00
|
|
|
} else {
|
|
|
|
kernel_base = 0;
|
|
|
|
kernel_size = 0;
|
|
|
|
initrd_base = 0;
|
|
|
|
initrd_size = 0;
|
2007-11-11 02:50:45 +01:00
|
|
|
ppc_boot_device = '\0';
|
|
|
|
/* We consider that NewWorld PowerMac never have any floppy drive
|
|
|
|
* For now, OHW cannot boot from the network.
|
|
|
|
*/
|
2007-11-11 15:44:28 +01:00
|
|
|
for (i = 0; boot_device[i] != '\0'; i++) {
|
|
|
|
if (boot_device[i] >= 'c' && boot_device[i] <= 'f') {
|
|
|
|
ppc_boot_device = boot_device[i];
|
2007-11-11 02:50:45 +01:00
|
|
|
break;
|
2007-11-11 15:44:28 +01:00
|
|
|
}
|
2007-11-11 02:50:45 +01:00
|
|
|
}
|
|
|
|
if (ppc_boot_device == '\0') {
|
hw/ppc: 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 were then manually tweaked to pass checkpatch and some curly
braces were added to match QEMU style.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: qemu-ppc@nongnu.org
Conversions that aren't followed by exit() dropped, because they might
be inappropriate.
Also trim trailing punctuation from error messages.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-10-armbru@redhat.com>
2018-02-03 09:43:10 +01:00
|
|
|
error_report("No valid boot device for Mac99 machine");
|
2007-11-11 02:50:45 +01:00
|
|
|
exit(1);
|
|
|
|
}
|
2004-06-21 18:55:53 +02:00
|
|
|
}
|
2005-06-05 17:11:17 +02:00
|
|
|
|
2018-05-03 22:24:39 +02:00
|
|
|
/* UniN init */
|
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_UNI_NORTH);
|
2018-05-03 22:24:39 +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-05-03 22:24:39 +02:00
|
|
|
memory_region_add_subregion(get_system_memory(), 0xf8000000,
|
|
|
|
sysbus_mmio_get_region(s, 0));
|
2007-03-30 11:38:04 +02:00
|
|
|
|
2018-11-27 14:06:22 +01:00
|
|
|
openpic_irqs = g_new0(IrqLines, smp_cpus);
|
2007-10-29 00:42:18 +01:00
|
|
|
for (i = 0; i < smp_cpus; i++) {
|
|
|
|
/* Mac99 IRQ connection between OpenPIC outputs pins
|
|
|
|
* and PowerPC input pins
|
|
|
|
*/
|
|
|
|
switch (PPC_INPUT(env)) {
|
|
|
|
case PPC_FLAGS_INPUT_6xx:
|
2018-11-27 14:06:22 +01:00
|
|
|
openpic_irqs[i].irq[OPENPIC_OUTPUT_INT] =
|
2007-10-29 00:42:18 +01:00
|
|
|
((qemu_irq *)env->irq_inputs)[PPC6xx_INPUT_INT];
|
2018-11-27 14:06:22 +01:00
|
|
|
openpic_irqs[i].irq[OPENPIC_OUTPUT_CINT] =
|
2007-10-29 00:42:18 +01:00
|
|
|
((qemu_irq *)env->irq_inputs)[PPC6xx_INPUT_INT];
|
2018-11-27 14:06:22 +01:00
|
|
|
openpic_irqs[i].irq[OPENPIC_OUTPUT_MCK] =
|
2007-10-29 00:42:18 +01:00
|
|
|
((qemu_irq *)env->irq_inputs)[PPC6xx_INPUT_MCP];
|
|
|
|
/* Not connected ? */
|
2018-11-27 14:06:22 +01:00
|
|
|
openpic_irqs[i].irq[OPENPIC_OUTPUT_DEBUG] = NULL;
|
2007-10-29 00:42:18 +01:00
|
|
|
/* Check this */
|
2018-11-27 14:06:22 +01:00
|
|
|
openpic_irqs[i].irq[OPENPIC_OUTPUT_RESET] =
|
2007-10-29 00:42:18 +01:00
|
|
|
((qemu_irq *)env->irq_inputs)[PPC6xx_INPUT_HRESET];
|
|
|
|
break;
|
2007-10-03 03:05:39 +02:00
|
|
|
#if defined(TARGET_PPC64)
|
2007-10-29 00:42:18 +01:00
|
|
|
case PPC_FLAGS_INPUT_970:
|
2018-11-27 14:06:22 +01:00
|
|
|
openpic_irqs[i].irq[OPENPIC_OUTPUT_INT] =
|
2007-10-29 00:42:18 +01:00
|
|
|
((qemu_irq *)env->irq_inputs)[PPC970_INPUT_INT];
|
2018-11-27 14:06:22 +01:00
|
|
|
openpic_irqs[i].irq[OPENPIC_OUTPUT_CINT] =
|
2007-10-29 00:42:18 +01:00
|
|
|
((qemu_irq *)env->irq_inputs)[PPC970_INPUT_INT];
|
2018-11-27 14:06:22 +01:00
|
|
|
openpic_irqs[i].irq[OPENPIC_OUTPUT_MCK] =
|
2007-10-29 00:42:18 +01:00
|
|
|
((qemu_irq *)env->irq_inputs)[PPC970_INPUT_MCP];
|
|
|
|
/* Not connected ? */
|
2018-11-27 14:06:22 +01:00
|
|
|
openpic_irqs[i].irq[OPENPIC_OUTPUT_DEBUG] = NULL;
|
2007-10-29 00:42:18 +01:00
|
|
|
/* Check this */
|
2018-11-27 14:06:22 +01:00
|
|
|
openpic_irqs[i].irq[OPENPIC_OUTPUT_RESET] =
|
2007-10-29 00:42:18 +01:00
|
|
|
((qemu_irq *)env->irq_inputs)[PPC970_INPUT_HRESET];
|
|
|
|
break;
|
2007-10-03 03:05:39 +02:00
|
|
|
#endif /* defined(TARGET_PPC64) */
|
2007-10-29 00:42:18 +01:00
|
|
|
default:
|
2015-12-17 17:35:09 +01:00
|
|
|
error_report("Bus model not supported on mac99 machine");
|
2007-10-29 00:42:18 +01:00
|
|
|
exit(1);
|
2005-06-05 17:11:17 +02:00
|
|
|
}
|
2007-10-29 00:42:18 +01:00
|
|
|
}
|
2012-12-08 05:17:14 +01: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
|
|
|
pic_dev = qdev_new(TYPE_OPENPIC);
|
2018-02-28 21:32:41 +01:00
|
|
|
qdev_prop_set_uint32(pic_dev, "model", OPENPIC_MODEL_KEYLARGO);
|
|
|
|
s = SYS_BUS_DEVICE(pic_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);
|
2012-12-08 05:17:14 +01:00
|
|
|
k = 0;
|
|
|
|
for (i = 0; i < smp_cpus; i++) {
|
|
|
|
for (j = 0; j < OPENPIC_OUTPUT_NB; j++) {
|
2018-11-27 14:06:22 +01:00
|
|
|
sysbus_connect_irq(s, k++, openpic_irqs[i].irq[j]);
|
2012-12-08 05:17:14 +01:00
|
|
|
}
|
|
|
|
}
|
2018-11-01 17:17:58 +01:00
|
|
|
g_free(openpic_irqs);
|
2012-12-08 05:17:14 +01:00
|
|
|
|
2010-02-09 17:37:02 +01:00
|
|
|
if (PPC_INPUT(env) == PPC_FLAGS_INPUT_970) {
|
|
|
|
/* 970 gets a U3 bus */
|
2018-03-06 21:30:57 +01:00
|
|
|
/* Uninorth AGP bus */
|
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_U3_AGP_HOST_BRIDGE);
|
sysbus: Convert to sysbus_realize() etc. with Coccinelle
Convert from qdev_realize(), qdev_realize_and_unref() with null @bus
argument to sysbus_realize(), sysbus_realize_and_unref().
Coccinelle script:
@@
expression dev, errp;
@@
- qdev_realize(DEVICE(dev), NULL, errp);
+ sysbus_realize(SYS_BUS_DEVICE(dev), errp);
@@
expression sysbus_dev, dev, errp;
@@
+ sysbus_dev = SYS_BUS_DEVICE(dev);
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
- sysbus_dev = SYS_BUS_DEVICE(dev);
@@
expression sysbus_dev, dev, errp;
expression expr;
@@
sysbus_dev = SYS_BUS_DEVICE(dev);
... when != dev = expr;
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(DEVICE(dev), NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
Whitespace changes minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-46-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:32:34 +02:00
|
|
|
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
|
2018-03-06 21:30:57 +01:00
|
|
|
uninorth_pci = U3_AGP_HOST_BRIDGE(dev);
|
|
|
|
s = SYS_BUS_DEVICE(dev);
|
|
|
|
/* PCI hole */
|
|
|
|
memory_region_add_subregion(get_system_memory(), 0x80000000ULL,
|
|
|
|
sysbus_mmio_get_region(s, 2));
|
2018-03-06 21:30:59 +01:00
|
|
|
/* Register 8 MB of ISA IO space */
|
|
|
|
memory_region_add_subregion(get_system_memory(), 0xf2000000,
|
|
|
|
sysbus_mmio_get_region(s, 3));
|
2018-03-06 21:30:57 +01:00
|
|
|
sysbus_mmio_map(s, 0, 0xf0800000);
|
|
|
|
sysbus_mmio_map(s, 1, 0xf0c00000);
|
|
|
|
|
2020-10-13 13:49:22 +02:00
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
|
qdev_connect_gpio_out(dev, i, qdev_get_gpio_in(pic_dev, 0x1b + i));
|
|
|
|
}
|
|
|
|
|
2010-02-09 17:37:02 +01:00
|
|
|
machine_arch = ARCH_MAC99_U3;
|
|
|
|
} else {
|
2018-03-06 21:30:56 +01:00
|
|
|
/* Use values found on a real PowerMac */
|
|
|
|
/* Uninorth AGP bus */
|
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_UNI_NORTH_AGP_HOST_BRIDGE);
|
2018-03-06 21:30:56 +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);
|
2018-03-06 21:30:56 +01:00
|
|
|
sysbus_mmio_map(s, 0, 0xf0800000);
|
|
|
|
sysbus_mmio_map(s, 1, 0xf0c00000);
|
|
|
|
|
2020-10-13 13:49:22 +02:00
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
|
qdev_connect_gpio_out(dev, i, qdev_get_gpio_in(pic_dev, 0x1b + i));
|
|
|
|
}
|
|
|
|
|
2018-03-06 21:30:56 +01:00
|
|
|
/* Uninorth internal bus */
|
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_UNI_NORTH_INTERNAL_PCI_HOST_BRIDGE);
|
2018-03-06 21:30:56 +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);
|
2018-03-06 21:30:56 +01:00
|
|
|
sysbus_mmio_map(s, 0, 0xf4800000);
|
|
|
|
sysbus_mmio_map(s, 1, 0xf4c00000);
|
|
|
|
|
2020-10-13 13:49:22 +02:00
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
|
qdev_connect_gpio_out(dev, i, qdev_get_gpio_in(pic_dev, 0x1b + i));
|
|
|
|
}
|
|
|
|
|
2018-03-06 21:30:56 +01:00
|
|
|
/* Uninorth main bus */
|
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_UNI_NORTH_PCI_HOST_BRIDGE);
|
2018-08-29 18:59:10 +02:00
|
|
|
qdev_prop_set_uint32(dev, "ofw-addr", 0xf2000000);
|
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);
|
2018-03-06 21:30:56 +01:00
|
|
|
uninorth_pci = UNI_NORTH_PCI_HOST_BRIDGE(dev);
|
|
|
|
s = SYS_BUS_DEVICE(dev);
|
|
|
|
/* PCI hole */
|
|
|
|
memory_region_add_subregion(get_system_memory(), 0x80000000ULL,
|
|
|
|
sysbus_mmio_get_region(s, 2));
|
2018-03-06 21:30:59 +01:00
|
|
|
/* Register 8 MB of ISA IO space */
|
|
|
|
memory_region_add_subregion(get_system_memory(), 0xf2000000,
|
|
|
|
sysbus_mmio_get_region(s, 3));
|
2018-03-06 21:30:56 +01:00
|
|
|
sysbus_mmio_map(s, 0, 0xf2800000);
|
|
|
|
sysbus_mmio_map(s, 1, 0xf2c00000);
|
|
|
|
|
2020-10-13 13:49:22 +02:00
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
|
qdev_connect_gpio_out(dev, i, qdev_get_gpio_in(pic_dev, 0x1b + i));
|
|
|
|
}
|
|
|
|
|
2010-02-09 17:37:02 +01:00
|
|
|
machine_arch = ARCH_MAC99;
|
|
|
|
}
|
2014-07-13 22:29:02 +02:00
|
|
|
|
2015-11-11 23:49:41 +01:00
|
|
|
machine->usb |= defaults_enabled() && !machine->usb_disabled;
|
2018-06-12 18:43:57 +02:00
|
|
|
has_pmu = (core99_machine->via_config != CORE99_VIA_CONFIG_CUDA);
|
|
|
|
has_adb = (core99_machine->via_config == CORE99_VIA_CONFIG_CUDA ||
|
|
|
|
core99_machine->via_config == CORE99_VIA_CONFIG_PMU_ADB);
|
2015-11-11 23:49:41 +01:00
|
|
|
|
2014-07-13 22:29:02 +02:00
|
|
|
/* Timebase Frequency */
|
|
|
|
if (kvm_enabled()) {
|
|
|
|
tbfreq = kvmppc_get_tbfreq();
|
|
|
|
} else {
|
|
|
|
tbfreq = TBFREQ;
|
|
|
|
}
|
|
|
|
|
2018-03-06 21:30:50 +01:00
|
|
|
/* init basic PC hardware */
|
|
|
|
pci_bus = PCI_HOST_BRIDGE(uninorth_pci)->bus;
|
|
|
|
|
2018-02-28 21:32:33 +01:00
|
|
|
/* MacIO */
|
pci: Convert uses of pci_create() etc. with Coccinelle
Replace
dev = pci_create(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = pci_new(type_name);
...
pci_realize_and_unref(dev, bus, &error_fatal);
and similarly for pci_create_multifunction().
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
Coccinelle script:
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
expression d;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
(
d = &dev->qdev;
|
d = DEVICE(dev);
)
... when != dev = expr
- qdev_init_nofail(d);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = DEVICE(pci_create(bus, args));
+ PCIDevice *pci_dev; // TODO move
+ pci_dev = pci_new(args);
+ dev = DEVICE(pci_dev);
... when != dev = expr
- qdev_init_nofail(dev);
+ pci_realize_and_unref(pci_dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create_multifunction(bus, args);
+ dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, expr;
expression list args;
identifier dev;
@@
- PCIDevice *dev = pci_create_multifunction(bus, args);
+ PCIDevice *dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create_multifunction(bus, args);
+ dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ pci_realize_and_unref(dev, bus, &error_fatal);
Missing #include "qapi/error.h" added manually, whitespace changes
minimized manually, @pci_dev declarations moved manually.
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-16-armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
2020-06-10 07:32:04 +02:00
|
|
|
macio = pci_new(-1, TYPE_NEWWORLD_MACIO);
|
2013-01-24 00:04:01 +01:00
|
|
|
dev = DEVICE(macio);
|
2014-07-13 22:31:53 +02:00
|
|
|
qdev_prop_set_uint64(dev, "frequency", tbfreq);
|
2018-06-12 18:43:57 +02:00
|
|
|
qdev_prop_set_bit(dev, "has-pmu", has_pmu);
|
|
|
|
qdev_prop_set_bit(dev, "has-adb", has_adb);
|
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(macio), "pic", OBJECT(pic_dev),
|
2018-02-28 21:32:41 +01:00
|
|
|
&error_abort);
|
2020-10-13 13:49:20 +02:00
|
|
|
|
|
|
|
escc = ESCC(object_resolve_path_component(OBJECT(macio), "escc"));
|
|
|
|
qdev_prop_set_chr(DEVICE(escc), "chrA", serial_hd(0));
|
|
|
|
qdev_prop_set_chr(DEVICE(escc), "chrB", serial_hd(1));
|
|
|
|
|
pci: Convert uses of pci_create() etc. with Coccinelle
Replace
dev = pci_create(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = pci_new(type_name);
...
pci_realize_and_unref(dev, bus, &error_fatal);
and similarly for pci_create_multifunction().
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
Coccinelle script:
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
expression d;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
(
d = &dev->qdev;
|
d = DEVICE(dev);
)
... when != dev = expr
- qdev_init_nofail(d);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = DEVICE(pci_create(bus, args));
+ PCIDevice *pci_dev; // TODO move
+ pci_dev = pci_new(args);
+ dev = DEVICE(pci_dev);
... when != dev = expr
- qdev_init_nofail(dev);
+ pci_realize_and_unref(pci_dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create_multifunction(bus, args);
+ dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, expr;
expression list args;
identifier dev;
@@
- PCIDevice *dev = pci_create_multifunction(bus, args);
+ PCIDevice *dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create_multifunction(bus, args);
+ dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ pci_realize_and_unref(dev, bus, &error_fatal);
Missing #include "qapi/error.h" added manually, whitespace changes
minimized manually, @pci_dev declarations moved manually.
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-16-armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
2020-06-10 07:32:04 +02:00
|
|
|
pci_realize_and_unref(macio, pci_bus, &error_fatal);
|
2013-01-24 00:04:01 +01:00
|
|
|
|
|
|
|
/* We only emulate 2 out of 3 IDE controllers for now */
|
2014-10-01 20:19:27 +02:00
|
|
|
ide_drive_get(hd, ARRAY_SIZE(hd));
|
2014-06-24 00:03:48 +02:00
|
|
|
|
2013-01-24 00:04:01 +01:00
|
|
|
macio_ide = MACIO_IDE(object_resolve_path_component(OBJECT(macio),
|
|
|
|
"ide[0]"));
|
|
|
|
macio_ide_init_drives(macio_ide, hd);
|
|
|
|
|
|
|
|
macio_ide = MACIO_IDE(object_resolve_path_component(OBJECT(macio),
|
|
|
|
"ide[1]"));
|
|
|
|
macio_ide_init_drives(macio_ide, &hd[MAX_IDE_DEVS]);
|
2006-05-21 18:30:15 +02:00
|
|
|
|
2018-06-12 18:43:57 +02:00
|
|
|
if (has_adb) {
|
2018-06-12 18:44:02 +02:00
|
|
|
if (has_pmu) {
|
|
|
|
dev = DEVICE(object_resolve_path_component(OBJECT(macio), "pmu"));
|
|
|
|
} else {
|
|
|
|
dev = DEVICE(object_resolve_path_component(OBJECT(macio), "cuda"));
|
|
|
|
}
|
|
|
|
|
2018-06-12 18:43:57 +02:00
|
|
|
adb_bus = qdev_get_child_bus(dev, "adb.0");
|
qdev: Convert uses of qdev_create() with Coccinelle
This is the transformation explained in the commit before previous.
Takes care of just one pattern that needs conversion. More to come in
this series.
Coccinelle script:
@ depends on !(file in "hw/arm/highbank.c")@
expression bus, type_name, dev, expr;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr;
identifier DOWN;
@@
- dev = DOWN(qdev_create(bus, type_name));
+ dev = DOWN(qdev_new(type_name));
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize_and_unref(DEVICE(dev), bus, &error_fatal);
@@
expression bus, type_name, expr;
identifier dev;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr, errp;
symbol true;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
@@
expression bus, type_name, expr, errp;
identifier dev;
symbol true;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
The first rule exempts hw/arm/highbank.c, because it matches along two
control flow paths there, with different @type_name. Covered by the
next commit's manual conversions.
Missing #include "qapi/error.h" added manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-10-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:31:58 +02:00
|
|
|
dev = qdev_new(TYPE_ADB_KEYBOARD);
|
|
|
|
qdev_realize_and_unref(dev, adb_bus, &error_fatal);
|
2018-06-12 18:44:02 +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_ADB_MOUSE);
|
|
|
|
qdev_realize_and_unref(dev, adb_bus, &error_fatal);
|
2018-06-12 18:43:57 +02:00
|
|
|
}
|
2013-01-24 00:04:02 +01:00
|
|
|
|
2015-01-06 14:29:17 +01:00
|
|
|
if (machine->usb) {
|
2012-03-07 15:06:32 +01:00
|
|
|
pci_create_simple(pci_bus, -1, "pci-ohci");
|
2015-02-04 13:28:14 +01:00
|
|
|
|
2012-09-02 21:25:28 +02:00
|
|
|
/* U3 needs to use USB for input because Linux doesn't support via-cuda
|
|
|
|
on PPC64 */
|
2018-06-12 18:43:57 +02:00
|
|
|
if (!has_adb || machine_arch == ARCH_MAC99_U3) {
|
2015-02-04 13:28:14 +01:00
|
|
|
USBBus *usb_bus = usb_bus_find(-1);
|
|
|
|
|
|
|
|
usb_create_simple(usb_bus, "usb-kbd");
|
|
|
|
usb_create_simple(usb_bus, "usb-mouse");
|
2012-09-02 21:25:28 +02:00
|
|
|
}
|
2010-02-09 17:37:08 +01:00
|
|
|
}
|
|
|
|
|
2014-06-24 00:03:48 +02:00
|
|
|
pci_vga_init(pci_bus);
|
|
|
|
|
|
|
|
if (graphic_depth != 15 && graphic_depth != 32 && graphic_depth != 8) {
|
2004-06-21 18:55:53 +02:00
|
|
|
graphic_depth = 15;
|
2014-06-24 00:03:48 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < nb_nics; i++) {
|
2019-02-08 18:22:01 +01:00
|
|
|
pci_nic_init_nofail(&nd_table[i], pci_bus, "sungem", NULL);
|
2014-06-24 00:03:48 +02:00
|
|
|
}
|
2009-02-08 17:01:01 +01:00
|
|
|
|
2007-10-29 00:42:18 +01:00
|
|
|
/* The NewWorld NVRAM is not located in the MacIO device */
|
2019-10-13 04:11:45 +02:00
|
|
|
if (kvm_enabled() && qemu_real_host_page_size > 4096) {
|
2014-07-11 03:24:39 +02:00
|
|
|
/* We can't combine read-write and read-only in a single page, so
|
|
|
|
move the NVRAM out of ROM again for KVM */
|
|
|
|
nvram_addr = 0xFFE00000;
|
|
|
|
}
|
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_NVRAM);
|
2013-01-24 00:04:00 +01:00
|
|
|
qdev_prop_set_uint32(dev, "size", 0x2000);
|
|
|
|
qdev_prop_set_uint32(dev, "it_shift", 1);
|
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);
|
2014-07-11 03:24:39 +02:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, nvram_addr);
|
2013-01-24 00:04:00 +01:00
|
|
|
nvr = MACIO_NVRAM(dev);
|
2007-10-29 00:42:18 +01:00
|
|
|
pmac_format_nvram_partition(nvr, 0x2000);
|
2004-06-21 18:55:53 +02:00
|
|
|
/* No PCI init: the BIOS will do it */
|
2005-06-05 17:11:17 +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 12:27:57 +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 12:27:57 +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 12:27:57 +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);
|
2019-05-18 22:54:22 +02:00
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, (uint16_t)machine->smp.max_cpus);
|
2009-02-08 16:59:36 +01:00
|
|
|
fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);
|
2010-02-09 17:37:02 +01:00
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_MACHINE_ID, machine_arch);
|
2009-03-08 10:51:29 +01:00
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, kernel_base);
|
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size);
|
|
|
|
if (kernel_cmdline) {
|
2011-06-15 23:27:19 +02:00
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_CMDLINE, cmdline_base);
|
|
|
|
pstrcpy_targphys("cmdline", cmdline_base, TARGET_PAGE_SIZE, kernel_cmdline);
|
2009-03-08 10:51:29 +01:00
|
|
|
} else {
|
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_CMDLINE, 0);
|
|
|
|
}
|
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_ADDR, initrd_base);
|
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_SIZE, initrd_size);
|
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_BOOT_DEVICE, ppc_boot_device);
|
2009-08-08 12:47:15 +02:00
|
|
|
|
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_PPC_WIDTH, graphic_width);
|
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_PPC_HEIGHT, graphic_height);
|
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_PPC_DEPTH, graphic_depth);
|
|
|
|
|
2018-06-12 18:43:57 +02:00
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_VIACONFIG, core99_machine->via_config);
|
|
|
|
|
2010-08-03 15:22:42 +02:00
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_IS_KVM, kvm_enabled());
|
2010-02-09 17:37:05 +01:00
|
|
|
if (kvm_enabled()) {
|
2010-08-03 15:22:42 +02:00
|
|
|
uint8_t *hypercall;
|
|
|
|
|
2011-08-21 05:09:37 +02:00
|
|
|
hypercall = g_malloc(16);
|
2010-08-03 15:22:42 +02:00
|
|
|
kvmppc_get_hypercall(env, hypercall, 16);
|
|
|
|
fw_cfg_add_bytes(fw_cfg, FW_CFG_PPC_KVM_HC, hypercall, 16);
|
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_KVM_PID, getpid());
|
2010-02-09 17:37:05 +01:00
|
|
|
}
|
2014-07-13 22:29:02 +02:00
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_TBFREQ, tbfreq);
|
2013-06-23 00:22:50 +02:00
|
|
|
/* Mac OS X requires a "known good" clock-frequency value; pass it one. */
|
2014-04-17 19:04:44 +02:00
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_CLOCKFREQ, CLOCKFREQ);
|
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_BUSFREQ, BUSFREQ);
|
2014-07-11 03:24:39 +02:00
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_NVRAM_ADDR, nvram_addr);
|
2010-02-09 17:37:05 +01:00
|
|
|
|
2017-05-01 15:43:33 +02:00
|
|
|
/* MacOS NDRV VGA driver */
|
|
|
|
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, NDRV_VGA_FILENAME);
|
|
|
|
if (filename) {
|
2018-12-14 14:30:50 +01:00
|
|
|
gchar *ndrv_file;
|
|
|
|
gsize ndrv_size;
|
2017-05-01 15:43:33 +02:00
|
|
|
|
2018-12-14 14:30:50 +01:00
|
|
|
if (g_file_get_contents(filename, &ndrv_file, &ndrv_size, NULL)) {
|
2017-05-01 15:43:33 +02:00
|
|
|
fw_cfg_add_file(fw_cfg, "ndrv/qemu_vga.ndrv", ndrv_file, ndrv_size);
|
|
|
|
}
|
|
|
|
g_free(filename);
|
|
|
|
}
|
|
|
|
|
2009-03-08 10:51:29 +01:00
|
|
|
qemu_register_boot_set(fw_cfg_boot_set, fw_cfg);
|
2007-11-24 03:56:36 +01:00
|
|
|
}
|
2005-06-05 17:11:17 +02:00
|
|
|
|
2018-08-29 18:59:11 +02:00
|
|
|
/*
|
|
|
|
* Implementation of an interface to adjust firmware path
|
|
|
|
* for the bootindex property handling.
|
|
|
|
*/
|
|
|
|
static char *core99_fw_dev_path(FWPathProvider *p, BusState *bus,
|
|
|
|
DeviceState *dev)
|
|
|
|
{
|
|
|
|
PCIDevice *pci;
|
|
|
|
IDEBus *ide_bus;
|
|
|
|
IDEState *ide_s;
|
|
|
|
MACIOIDEState *macio_ide;
|
|
|
|
|
|
|
|
if (!strcmp(object_get_typename(OBJECT(dev)), "macio-newworld")) {
|
|
|
|
pci = PCI_DEVICE(dev);
|
|
|
|
return g_strdup_printf("mac-io@%x", PCI_SLOT(pci->devfn));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(object_get_typename(OBJECT(dev)), "macio-ide")) {
|
|
|
|
macio_ide = MACIO_IDE(dev);
|
|
|
|
return g_strdup_printf("ata-3@%x", macio_ide->addr);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(object_get_typename(OBJECT(dev)), "ide-drive")) {
|
|
|
|
ide_bus = IDE_BUS(qdev_get_parent_bus(dev));
|
|
|
|
ide_s = idebus_active_if(ide_bus);
|
|
|
|
|
|
|
|
if (ide_s->drive_kind == IDE_CD) {
|
|
|
|
return g_strdup("cdrom");
|
|
|
|
}
|
|
|
|
|
2019-03-07 22:20:58 +01:00
|
|
|
return g_strdup("disk");
|
2018-08-29 18:59:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(object_get_typename(OBJECT(dev)), "ide-hd")) {
|
2019-03-07 22:20:58 +01:00
|
|
|
return g_strdup("disk");
|
2018-08-29 18:59:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(object_get_typename(OBJECT(dev)), "ide-cd")) {
|
|
|
|
return g_strdup("cdrom");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(object_get_typename(OBJECT(dev)), "virtio-blk-device")) {
|
|
|
|
return g_strdup("disk");
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
2019-03-04 11:13:33 +01:00
|
|
|
static int core99_kvm_type(MachineState *machine, const char *arg)
|
2014-07-24 10:46:47 +02:00
|
|
|
{
|
|
|
|
/* Always force PR KVM */
|
|
|
|
return 2;
|
|
|
|
}
|
|
|
|
|
2015-01-06 14:29:15 +01:00
|
|
|
static void core99_machine_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
2018-08-29 18:59:11 +02:00
|
|
|
FWPathProviderClass *fwc = FW_PATH_PROVIDER_CLASS(oc);
|
2015-01-06 14:29:15 +01:00
|
|
|
|
|
|
|
mc->desc = "Mac99 based PowerMAC";
|
|
|
|
mc->init = ppc_core99_init;
|
2017-02-15 11:05:40 +01:00
|
|
|
mc->block_default_type = IF_IDE;
|
2015-01-06 14:29:15 +01:00
|
|
|
mc->max_cpus = MAX_CPUS;
|
|
|
|
mc->default_boot_order = "cd";
|
2018-07-03 21:10:43 +02:00
|
|
|
mc->default_display = "std";
|
2015-01-06 14:29:15 +01:00
|
|
|
mc->kvm_type = core99_kvm_type;
|
2017-10-09 21:50:52 +02:00
|
|
|
#ifdef TARGET_PPC64
|
|
|
|
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("970fx_v3.1");
|
|
|
|
#else
|
|
|
|
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("7400_v2.9");
|
|
|
|
#endif
|
2020-02-19 17:09:34 +01:00
|
|
|
mc->default_ram_id = "ppc_core99.ram";
|
2018-08-29 18:59:11 +02:00
|
|
|
mc->ignore_boot_device_suffixes = true;
|
|
|
|
fwc->get_dev_path = core99_fw_dev_path;
|
2015-01-06 14:29:15 +01:00
|
|
|
}
|
|
|
|
|
2018-06-12 18:43:57 +02:00
|
|
|
static char *core99_get_via_config(Object *obj, Error **errp)
|
|
|
|
{
|
|
|
|
Core99MachineState *cms = CORE99_MACHINE(obj);
|
|
|
|
|
|
|
|
switch (cms->via_config) {
|
|
|
|
default:
|
|
|
|
case CORE99_VIA_CONFIG_CUDA:
|
|
|
|
return g_strdup("cuda");
|
|
|
|
|
|
|
|
case CORE99_VIA_CONFIG_PMU:
|
|
|
|
return g_strdup("pmu");
|
|
|
|
|
|
|
|
case CORE99_VIA_CONFIG_PMU_ADB:
|
|
|
|
return g_strdup("pmu-adb");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void core99_set_via_config(Object *obj, const char *value, Error **errp)
|
|
|
|
{
|
|
|
|
Core99MachineState *cms = CORE99_MACHINE(obj);
|
|
|
|
|
|
|
|
if (!strcmp(value, "cuda")) {
|
|
|
|
cms->via_config = CORE99_VIA_CONFIG_CUDA;
|
|
|
|
} else if (!strcmp(value, "pmu")) {
|
|
|
|
cms->via_config = CORE99_VIA_CONFIG_PMU;
|
|
|
|
} else if (!strcmp(value, "pmu-adb")) {
|
|
|
|
cms->via_config = CORE99_VIA_CONFIG_PMU_ADB;
|
|
|
|
} else {
|
|
|
|
error_setg(errp, "Invalid via value");
|
|
|
|
error_append_hint(errp, "Valid values are cuda, pmu, pmu-adb.\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-06-12 18:43:56 +02:00
|
|
|
static void core99_instance_init(Object *obj)
|
|
|
|
{
|
2018-06-12 18:43:57 +02:00
|
|
|
Core99MachineState *cms = CORE99_MACHINE(obj);
|
|
|
|
|
|
|
|
/* Default via_config is CORE99_VIA_CONFIG_CUDA */
|
|
|
|
cms->via_config = CORE99_VIA_CONFIG_CUDA;
|
|
|
|
object_property_add_str(obj, "via", core99_get_via_config,
|
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
|
|
|
core99_set_via_config);
|
2018-06-12 18:43:57 +02:00
|
|
|
object_property_set_description(obj, "via",
|
|
|
|
"Set VIA configuration. "
|
2020-05-05 17:29:15 +02:00
|
|
|
"Valid values are cuda, pmu and pmu-adb");
|
2018-06-12 18:43:57 +02:00
|
|
|
|
2018-06-12 18:43:56 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-01-06 14:29:15 +01:00
|
|
|
static const TypeInfo core99_machine_info = {
|
2015-08-20 23:54:34 +02:00
|
|
|
.name = MACHINE_TYPE_NAME("mac99"),
|
2015-01-06 14:29:15 +01:00
|
|
|
.parent = TYPE_MACHINE,
|
|
|
|
.class_init = core99_machine_class_init,
|
2018-06-12 18:43:56 +02:00
|
|
|
.instance_init = core99_instance_init,
|
2018-08-29 18:59:11 +02:00
|
|
|
.instance_size = sizeof(Core99MachineState),
|
|
|
|
.interfaces = (InterfaceInfo[]) {
|
|
|
|
{ TYPE_FW_PATH_PROVIDER },
|
|
|
|
{ }
|
|
|
|
},
|
2005-06-05 17:11:17 +02:00
|
|
|
};
|
2009-05-21 01:38:09 +02:00
|
|
|
|
2015-01-06 14:29:15 +01:00
|
|
|
static void mac_machine_register_types(void)
|
2009-05-21 01:38:09 +02:00
|
|
|
{
|
2015-01-06 14:29:15 +01:00
|
|
|
type_register_static(&core99_machine_info);
|
2009-05-21 01:38:09 +02:00
|
|
|
}
|
|
|
|
|
2015-01-06 14:29:15 +01:00
|
|
|
type_init(mac_machine_register_types)
|