2004-01-04 23:58:38 +01:00
|
|
|
/*
|
2004-04-12 22:39:29 +02:00
|
|
|
* QEMU PPC PREP hardware System Emulator
|
2007-09-16 23:08:06 +02:00
|
|
|
*
|
2007-03-30 11:38:04 +02:00
|
|
|
* Copyright (c) 2003-2007 Jocelyn Mayer
|
2017-01-07 16:23:43 +01:00
|
|
|
* Copyright (c) 2017 Hervé Poussineau
|
2007-09-16 23:08:06 +02:00
|
|
|
*
|
2004-04-12 22:39:29 +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.
|
2004-01-04 23:58:38 +01:00
|
|
|
*/
|
2019-08-12 07:23:38 +02:00
|
|
|
|
2016-01-26 19:16:58 +01:00
|
|
|
#include "qemu/osdep.h"
|
2019-10-04 01:03:54 +02:00
|
|
|
#include "hw/rtc/m48t59.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/char/serial.h"
|
|
|
|
#include "hw/block/fdc.h"
|
2012-10-24 08:43:34 +02:00
|
|
|
#include "net/net.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/isa/isa.h"
|
2013-01-26 20:41:58 +01:00
|
|
|
#include "hw/pci/pci.h"
|
|
|
|
#include "hw/pci/pci_host.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/ppc/ppc.h"
|
2013-01-26 20:41:58 +01:00
|
|
|
#include "hw/boards.h"
|
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
|
|
|
#include "qapi/error.h"
|
2015-12-17 17:35:09 +01:00
|
|
|
#include "qemu/error-report.h"
|
2012-12-17 18:20:00 +01:00
|
|
|
#include "qemu/log.h"
|
2013-01-26 20:41:58 +01:00
|
|
|
#include "hw/loader.h"
|
2019-10-04 01:03:53 +02:00
|
|
|
#include "hw/rtc/mc146818rtc.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/isa/pc87312.h"
|
2020-01-14 12:46:17 +01:00
|
|
|
#include "hw/qdev-properties.h"
|
2012-12-17 18:20:04 +01:00
|
|
|
#include "sysemu/arch_init.h"
|
2017-01-07 16:23:43 +01:00
|
|
|
#include "sysemu/kvm.h"
|
2019-08-12 07:23:38 +02:00
|
|
|
#include "sysemu/reset.h"
|
2015-10-16 15:16:11 +02:00
|
|
|
#include "trace.h"
|
2013-04-27 21:23:23 +02:00
|
|
|
#include "elf.h"
|
2018-06-25 14:42:24 +02:00
|
|
|
#include "qemu/units.h"
|
2017-01-07 16:23:43 +01:00
|
|
|
#include "kvm_ppc.h"
|
2004-05-21 14:59:32 +02:00
|
|
|
|
2007-10-03 03:06:57 +02:00
|
|
|
/* SMP is not enabled, for now */
|
|
|
|
#define MAX_CPUS 1
|
|
|
|
|
2007-12-02 05:51:10 +01:00
|
|
|
#define MAX_IDE_BUS 2
|
|
|
|
|
2017-01-07 16:23:43 +01:00
|
|
|
#define CFG_ADDR 0xf0000510
|
|
|
|
|
2004-06-21 18:55:53 +02:00
|
|
|
#define KERNEL_LOAD_ADDR 0x01000000
|
|
|
|
#define INITRD_LOAD_ADDR 0x01800000
|
2004-05-27 00:55:16 +02:00
|
|
|
|
|
|
|
#define NVRAM_SIZE 0x2000
|
2004-04-12 22:39:29 +02:00
|
|
|
|
2017-01-07 16:23:43 +01:00
|
|
|
static void fw_cfg_boot_set(void *opaque, const char *boot_device,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
fw_cfg_modify_i16(opaque, FW_CFG_BOOT_DEVICE, boot_device[0]);
|
|
|
|
}
|
|
|
|
|
2012-02-08 03:03:33 +01:00
|
|
|
static void ppc_prep_reset(void *opaque)
|
|
|
|
{
|
2012-05-04 17:46:13 +02:00
|
|
|
PowerPCCPU *cpu = opaque;
|
2012-02-08 03:03:33 +01:00
|
|
|
|
2012-05-04 17:46:13 +02:00
|
|
|
cpu_reset(CPU(cpu));
|
2012-02-08 03:03:33 +01:00
|
|
|
}
|
|
|
|
|
2014-04-29 15:38:39 +02:00
|
|
|
|
2015-03-02 23:23:27 +01:00
|
|
|
/*****************************************************************************/
|
|
|
|
/* NVRAM helpers */
|
|
|
|
static inline uint32_t nvram_read(Nvram *nvram, uint32_t addr)
|
|
|
|
{
|
2016-12-29 23:12:13 +01:00
|
|
|
NvramClass *k = NVRAM_GET_CLASS(nvram);
|
2015-03-02 23:23:27 +01:00
|
|
|
return (k->read)(nvram, addr);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void nvram_write(Nvram *nvram, uint32_t addr, uint32_t val)
|
|
|
|
{
|
2016-12-29 23:12:13 +01:00
|
|
|
NvramClass *k = NVRAM_GET_CLASS(nvram);
|
2015-03-02 23:23:27 +01:00
|
|
|
(k->write)(nvram, addr, val);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void NVRAM_set_byte(Nvram *nvram, uint32_t addr, uint8_t value)
|
|
|
|
{
|
|
|
|
nvram_write(nvram, addr, value);
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint8_t NVRAM_get_byte(Nvram *nvram, uint32_t addr)
|
|
|
|
{
|
|
|
|
return nvram_read(nvram, addr);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void NVRAM_set_word(Nvram *nvram, uint32_t addr, uint16_t value)
|
|
|
|
{
|
|
|
|
nvram_write(nvram, addr, value >> 8);
|
|
|
|
nvram_write(nvram, addr + 1, value & 0xFF);
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint16_t NVRAM_get_word(Nvram *nvram, uint32_t addr)
|
|
|
|
{
|
|
|
|
uint16_t tmp;
|
|
|
|
|
|
|
|
tmp = nvram_read(nvram, addr) << 8;
|
|
|
|
tmp |= nvram_read(nvram, addr + 1);
|
|
|
|
|
|
|
|
return tmp;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void NVRAM_set_lword(Nvram *nvram, uint32_t addr, uint32_t value)
|
|
|
|
{
|
|
|
|
nvram_write(nvram, addr, value >> 24);
|
|
|
|
nvram_write(nvram, addr + 1, (value >> 16) & 0xFF);
|
|
|
|
nvram_write(nvram, addr + 2, (value >> 8) & 0xFF);
|
|
|
|
nvram_write(nvram, addr + 3, value & 0xFF);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void NVRAM_set_string(Nvram *nvram, uint32_t addr, const char *str,
|
|
|
|
uint32_t max)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < max && str[i] != '\0'; i++) {
|
|
|
|
nvram_write(nvram, addr + i, str[i]);
|
|
|
|
}
|
|
|
|
nvram_write(nvram, addr + i, str[i]);
|
|
|
|
nvram_write(nvram, addr + max - 1, '\0');
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint16_t NVRAM_crc_update (uint16_t prev, uint16_t value)
|
|
|
|
{
|
|
|
|
uint16_t tmp;
|
|
|
|
uint16_t pd, pd1, pd2;
|
|
|
|
|
|
|
|
tmp = prev >> 8;
|
|
|
|
pd = prev ^ value;
|
|
|
|
pd1 = pd & 0x000F;
|
|
|
|
pd2 = ((pd >> 4) & 0x000F) ^ pd1;
|
|
|
|
tmp ^= (pd1 << 3) | (pd1 << 8);
|
|
|
|
tmp ^= pd2 | (pd2 << 7) | (pd2 << 12);
|
|
|
|
|
|
|
|
return tmp;
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint16_t NVRAM_compute_crc (Nvram *nvram, uint32_t start, uint32_t count)
|
|
|
|
{
|
|
|
|
uint32_t i;
|
|
|
|
uint16_t crc = 0xFFFF;
|
|
|
|
int odd;
|
|
|
|
|
|
|
|
odd = count & 1;
|
|
|
|
count &= ~1;
|
|
|
|
for (i = 0; i != count; i++) {
|
|
|
|
crc = NVRAM_crc_update(crc, NVRAM_get_word(nvram, start + i));
|
|
|
|
}
|
|
|
|
if (odd) {
|
|
|
|
crc = NVRAM_crc_update(crc, NVRAM_get_byte(nvram, start + i) << 8);
|
|
|
|
}
|
|
|
|
|
|
|
|
return crc;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define CMDLINE_ADDR 0x017ff000
|
|
|
|
|
|
|
|
static int PPC_NVRAM_set_params (Nvram *nvram, uint16_t NVRAM_size,
|
|
|
|
const char *arch,
|
|
|
|
uint32_t RAM_size, int boot_device,
|
|
|
|
uint32_t kernel_image, uint32_t kernel_size,
|
|
|
|
const char *cmdline,
|
|
|
|
uint32_t initrd_image, uint32_t initrd_size,
|
|
|
|
uint32_t NVRAM_image,
|
|
|
|
int width, int height, int depth)
|
|
|
|
{
|
|
|
|
uint16_t crc;
|
|
|
|
|
|
|
|
/* Set parameters for Open Hack'Ware BIOS */
|
|
|
|
NVRAM_set_string(nvram, 0x00, "QEMU_BIOS", 16);
|
|
|
|
NVRAM_set_lword(nvram, 0x10, 0x00000002); /* structure v2 */
|
|
|
|
NVRAM_set_word(nvram, 0x14, NVRAM_size);
|
|
|
|
NVRAM_set_string(nvram, 0x20, arch, 16);
|
|
|
|
NVRAM_set_lword(nvram, 0x30, RAM_size);
|
|
|
|
NVRAM_set_byte(nvram, 0x34, boot_device);
|
|
|
|
NVRAM_set_lword(nvram, 0x38, kernel_image);
|
|
|
|
NVRAM_set_lword(nvram, 0x3C, kernel_size);
|
|
|
|
if (cmdline) {
|
|
|
|
/* XXX: put the cmdline in NVRAM too ? */
|
|
|
|
pstrcpy_targphys("cmdline", CMDLINE_ADDR, RAM_size - CMDLINE_ADDR,
|
|
|
|
cmdline);
|
|
|
|
NVRAM_set_lword(nvram, 0x40, CMDLINE_ADDR);
|
|
|
|
NVRAM_set_lword(nvram, 0x44, strlen(cmdline));
|
|
|
|
} else {
|
|
|
|
NVRAM_set_lword(nvram, 0x40, 0);
|
|
|
|
NVRAM_set_lword(nvram, 0x44, 0);
|
|
|
|
}
|
|
|
|
NVRAM_set_lword(nvram, 0x48, initrd_image);
|
|
|
|
NVRAM_set_lword(nvram, 0x4C, initrd_size);
|
|
|
|
NVRAM_set_lword(nvram, 0x50, NVRAM_image);
|
|
|
|
|
|
|
|
NVRAM_set_word(nvram, 0x54, width);
|
|
|
|
NVRAM_set_word(nvram, 0x56, height);
|
|
|
|
NVRAM_set_word(nvram, 0x58, depth);
|
|
|
|
crc = NVRAM_compute_crc(nvram, 0x00, 0xF8);
|
|
|
|
NVRAM_set_word(nvram, 0xFC, crc);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-01-07 16:23:43 +01:00
|
|
|
static int prep_set_cmos_checksum(DeviceState *dev, void *opaque)
|
|
|
|
{
|
|
|
|
uint16_t checksum = *(uint16_t *)opaque;
|
|
|
|
ISADevice *rtc;
|
|
|
|
|
2019-05-05 17:28:37 +02:00
|
|
|
if (object_dynamic_cast(OBJECT(dev), TYPE_MC146818_RTC)) {
|
2017-01-07 16:23:43 +01:00
|
|
|
rtc = ISA_DEVICE(dev);
|
|
|
|
rtc_set_memory(rtc, 0x2e, checksum & 0xff);
|
|
|
|
rtc_set_memory(rtc, 0x3e, checksum & 0xff);
|
|
|
|
rtc_set_memory(rtc, 0x2f, checksum >> 8);
|
|
|
|
rtc_set_memory(rtc, 0x3f, checksum >> 8);
|
hw/timer/mc146818rtc: Fix introspection problem
There is currently a funny problem with the "mc146818rtc" device:
1) Start QEMU like this:
qemu-system-ppc64 -M pseries -S
2) At the HMP monitor, enter "info qom-tree". Note that there is an
entry for "/rtc (spapr-rtc)".
3) Introspect the mc146818rtc device like this:
device_add mc146818rtc,help
4) Run "info qom-tree" again. The "/rtc" entry is gone now!
The rtc_finalize() function of the mc146818rtc device has two bugs: First,
it tries to remove a "rtc" property, while the rtc_realizefn() added a
"rtc-time" property instead. And second, it should have been done in an
unrealize function, not in a finalize function, to avoid that this causes
problems during introspection.
But since adding aliases to the global machine state should not be done
from a device's realize function anyway, let's rather fix this issue
by moving the creation of the alias to the code that creates the device
(and thus is run from the machine init functions instead), i.e. the
mc146818_rtc_init() function for most machines. The prep machines are
special, since the mc146818rtc device is created here in the realize
function of the i82378 device. Since we certainly don't want to add the
alias there, we add it to some code that is called from the ibm_40p_init()
machine init function instead.
Since the alias is now only created during the machine init, we can remove
the object_property_del() completely.
Fixes: 654a36d857ff949e0d1989904b76f53fded9dc83
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <1534419358-10932-5-git-send-email-thuth@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2018-08-16 13:35:54 +02:00
|
|
|
|
|
|
|
object_property_add_alias(qdev_get_machine(), "rtc-time", OBJECT(rtc),
|
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
|
|
|
"date");
|
2017-01-07 16:23:43 +01:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ibm_40p_init(MachineState *machine)
|
|
|
|
{
|
2020-10-26 15:30:23 +01:00
|
|
|
const char *bios_name = machine->firmware ?: "openbios-ppc";
|
2017-01-07 16:23:43 +01:00
|
|
|
CPUPPCState *env = NULL;
|
|
|
|
uint16_t cmos_checksum;
|
|
|
|
PowerPCCPU *cpu;
|
2018-09-19 19:21:01 +02:00
|
|
|
DeviceState *dev, *i82378_dev;
|
2018-08-10 14:04:18 +02:00
|
|
|
SysBusDevice *pcihost, *s;
|
2017-01-07 16:23:43 +01:00
|
|
|
Nvram *m48t59 = NULL;
|
|
|
|
PCIBus *pci_bus;
|
isa: Convert uses of isa_create() with Coccinelle
Replace
dev = isa_create(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = isa_new(type_name);
...
isa_realize_and_unref(dev, bus, &error_fatal);
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
Coccinelle script:
@@
expression dev, bus, expr;
expression list args;
expression d;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
(
d = &dev->qdev;
|
d = DEVICE(dev);
)
... when != dev = expr
- qdev_init_nofail(d);
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = DEVICE(isa_create(bus, args));
+ ISADevice *isa_dev; // TODO move
+ isa_dev = isa_new(args);
+ dev = DEVICE(isa_dev);
... when != dev = expr
- qdev_init_nofail(dev);
+ isa_realize_and_unref(isa_dev, bus, &error_fatal);
Missing #include "qapi/error.h" added manually, whitespace changes
minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-20-armbru@redhat.com>
2020-06-10 07:32:08 +02:00
|
|
|
ISADevice *isa_dev;
|
2017-01-07 16:23:43 +01:00
|
|
|
ISABus *isa_bus;
|
|
|
|
void *fw_cfg;
|
|
|
|
int i;
|
|
|
|
uint32_t kernel_base = 0, initrd_base = 0;
|
|
|
|
long kernel_size = 0, initrd_size = 0;
|
|
|
|
char boot_device;
|
|
|
|
|
|
|
|
/* init CPU */
|
2017-10-09 21:50:57 +02:00
|
|
|
cpu = POWERPC_CPU(cpu_create(machine->cpu_type));
|
2017-01-07 16:23:43 +01:00
|
|
|
env = &cpu->env;
|
|
|
|
if (PPC_INPUT(env) != PPC_FLAGS_INPUT_6xx) {
|
|
|
|
error_report("only 6xx bus is supported on this machine");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (env->flags & POWERPC_FLAG_RTC_CLK) {
|
|
|
|
/* POWER / PowerPC 601 RTC clock frequency is 7.8125 MHz */
|
|
|
|
cpu_ppc_tb_init(env, 7812500UL);
|
|
|
|
} else {
|
|
|
|
/* Set time-base frequency to 100 Mhz */
|
|
|
|
cpu_ppc_tb_init(env, 100UL * 1000UL * 1000UL);
|
|
|
|
}
|
|
|
|
qemu_register_reset(ppc_prep_reset, cpu);
|
|
|
|
|
|
|
|
/* PCI host */
|
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("raven-pcihost");
|
2017-01-07 16:23:43 +01:00
|
|
|
qdev_prop_set_string(dev, "bios-name", bios_name);
|
|
|
|
qdev_prop_set_uint32(dev, "elf-machine", PPC_ELF_MACHINE);
|
|
|
|
pcihost = SYS_BUS_DEVICE(dev);
|
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_property_add_child(qdev_get_machine(), "raven", OBJECT(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(pcihost, &error_fatal);
|
2017-01-07 16:23:43 +01:00
|
|
|
pci_bus = PCI_BUS(qdev_get_child_bus(dev, "pci.0"));
|
|
|
|
if (!pci_bus) {
|
|
|
|
error_report("could not create PCI host controller");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* PCI -> ISA bridge */
|
2018-09-19 19:21:01 +02:00
|
|
|
i82378_dev = DEVICE(pci_create_simple(pci_bus, PCI_DEVFN(11, 0), "i82378"));
|
|
|
|
qdev_connect_gpio_out(i82378_dev, 0,
|
2017-01-07 16:23:43 +01:00
|
|
|
cpu->env.irq_inputs[PPC6xx_INPUT_INT]);
|
2018-09-19 19:21:01 +02:00
|
|
|
sysbus_connect_irq(pcihost, 0, qdev_get_gpio_in(i82378_dev, 15));
|
|
|
|
isa_bus = ISA_BUS(qdev_get_child_bus(i82378_dev, "isa.0"));
|
2017-01-07 16:23:43 +01:00
|
|
|
|
|
|
|
/* Memory controller */
|
isa: Convert uses of isa_create() with Coccinelle
Replace
dev = isa_create(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = isa_new(type_name);
...
isa_realize_and_unref(dev, bus, &error_fatal);
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
Coccinelle script:
@@
expression dev, bus, expr;
expression list args;
expression d;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
(
d = &dev->qdev;
|
d = DEVICE(dev);
)
... when != dev = expr
- qdev_init_nofail(d);
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = DEVICE(isa_create(bus, args));
+ ISADevice *isa_dev; // TODO move
+ isa_dev = isa_new(args);
+ dev = DEVICE(isa_dev);
... when != dev = expr
- qdev_init_nofail(dev);
+ isa_realize_and_unref(isa_dev, bus, &error_fatal);
Missing #include "qapi/error.h" added manually, whitespace changes
minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-20-armbru@redhat.com>
2020-06-10 07:32:08 +02:00
|
|
|
isa_dev = isa_new("rs6000-mc");
|
|
|
|
dev = DEVICE(isa_dev);
|
2017-01-07 16:23:43 +01:00
|
|
|
qdev_prop_set_uint32(dev, "ram-size", machine->ram_size);
|
isa: Convert uses of isa_create() with Coccinelle
Replace
dev = isa_create(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = isa_new(type_name);
...
isa_realize_and_unref(dev, bus, &error_fatal);
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
Coccinelle script:
@@
expression dev, bus, expr;
expression list args;
expression d;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
(
d = &dev->qdev;
|
d = DEVICE(dev);
)
... when != dev = expr
- qdev_init_nofail(d);
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = DEVICE(isa_create(bus, args));
+ ISADevice *isa_dev; // TODO move
+ isa_dev = isa_new(args);
+ dev = DEVICE(isa_dev);
... when != dev = expr
- qdev_init_nofail(dev);
+ isa_realize_and_unref(isa_dev, bus, &error_fatal);
Missing #include "qapi/error.h" added manually, whitespace changes
minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-20-armbru@redhat.com>
2020-06-10 07:32:08 +02:00
|
|
|
isa_realize_and_unref(isa_dev, isa_bus, &error_fatal);
|
2017-01-07 16:23:43 +01:00
|
|
|
|
2019-05-05 17:28:38 +02:00
|
|
|
/* RTC */
|
isa: Convert uses of isa_create() with Coccinelle
Replace
dev = isa_create(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = isa_new(type_name);
...
isa_realize_and_unref(dev, bus, &error_fatal);
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
Coccinelle script:
@@
expression dev, bus, expr;
expression list args;
expression d;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
(
d = &dev->qdev;
|
d = DEVICE(dev);
)
... when != dev = expr
- qdev_init_nofail(d);
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = DEVICE(isa_create(bus, args));
+ ISADevice *isa_dev; // TODO move
+ isa_dev = isa_new(args);
+ dev = DEVICE(isa_dev);
... when != dev = expr
- qdev_init_nofail(dev);
+ isa_realize_and_unref(isa_dev, bus, &error_fatal);
Missing #include "qapi/error.h" added manually, whitespace changes
minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-20-armbru@redhat.com>
2020-06-10 07:32:08 +02:00
|
|
|
isa_dev = isa_new(TYPE_MC146818_RTC);
|
|
|
|
dev = DEVICE(isa_dev);
|
2019-05-05 17:28:39 +02:00
|
|
|
qdev_prop_set_int32(dev, "base_year", 1900);
|
isa: Convert uses of isa_create() with Coccinelle
Replace
dev = isa_create(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = isa_new(type_name);
...
isa_realize_and_unref(dev, bus, &error_fatal);
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
Coccinelle script:
@@
expression dev, bus, expr;
expression list args;
expression d;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
(
d = &dev->qdev;
|
d = DEVICE(dev);
)
... when != dev = expr
- qdev_init_nofail(d);
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = DEVICE(isa_create(bus, args));
+ ISADevice *isa_dev; // TODO move
+ isa_dev = isa_new(args);
+ dev = DEVICE(isa_dev);
... when != dev = expr
- qdev_init_nofail(dev);
+ isa_realize_and_unref(isa_dev, bus, &error_fatal);
Missing #include "qapi/error.h" added manually, whitespace changes
minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-20-armbru@redhat.com>
2020-06-10 07:32:08 +02:00
|
|
|
isa_realize_and_unref(isa_dev, isa_bus, &error_fatal);
|
2019-05-05 17:28:38 +02:00
|
|
|
|
2017-01-07 16:23:43 +01:00
|
|
|
/* initialize CMOS checksums */
|
|
|
|
cmos_checksum = 0x6aa9;
|
|
|
|
qbus_walk_children(BUS(isa_bus), prep_set_cmos_checksum, NULL, NULL, NULL,
|
|
|
|
&cmos_checksum);
|
|
|
|
|
|
|
|
/* add some more devices */
|
|
|
|
if (defaults_enabled()) {
|
|
|
|
m48t59 = NVRAM(isa_create_simple(isa_bus, "isa-m48t59"));
|
|
|
|
|
isa: Convert uses of isa_create() with Coccinelle
Replace
dev = isa_create(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = isa_new(type_name);
...
isa_realize_and_unref(dev, bus, &error_fatal);
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
Coccinelle script:
@@
expression dev, bus, expr;
expression list args;
expression d;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
(
d = &dev->qdev;
|
d = DEVICE(dev);
)
... when != dev = expr
- qdev_init_nofail(d);
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = DEVICE(isa_create(bus, args));
+ ISADevice *isa_dev; // TODO move
+ isa_dev = isa_new(args);
+ dev = DEVICE(isa_dev);
... when != dev = expr
- qdev_init_nofail(dev);
+ isa_realize_and_unref(isa_dev, bus, &error_fatal);
Missing #include "qapi/error.h" added manually, whitespace changes
minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-20-armbru@redhat.com>
2020-06-10 07:32:08 +02:00
|
|
|
isa_dev = isa_new("cs4231a");
|
|
|
|
dev = DEVICE(isa_dev);
|
2017-01-07 16:23:43 +01:00
|
|
|
qdev_prop_set_uint32(dev, "iobase", 0x830);
|
|
|
|
qdev_prop_set_uint32(dev, "irq", 10);
|
isa: Convert uses of isa_create() with Coccinelle
Replace
dev = isa_create(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = isa_new(type_name);
...
isa_realize_and_unref(dev, bus, &error_fatal);
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
Coccinelle script:
@@
expression dev, bus, expr;
expression list args;
expression d;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
(
d = &dev->qdev;
|
d = DEVICE(dev);
)
... when != dev = expr
- qdev_init_nofail(d);
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = DEVICE(isa_create(bus, args));
+ ISADevice *isa_dev; // TODO move
+ isa_dev = isa_new(args);
+ dev = DEVICE(isa_dev);
... when != dev = expr
- qdev_init_nofail(dev);
+ isa_realize_and_unref(isa_dev, bus, &error_fatal);
Missing #include "qapi/error.h" added manually, whitespace changes
minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-20-armbru@redhat.com>
2020-06-10 07:32:08 +02:00
|
|
|
isa_realize_and_unref(isa_dev, isa_bus, &error_fatal);
|
2017-01-07 16:23:43 +01:00
|
|
|
|
isa: Convert uses of isa_create() with Coccinelle
Replace
dev = isa_create(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = isa_new(type_name);
...
isa_realize_and_unref(dev, bus, &error_fatal);
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
Coccinelle script:
@@
expression dev, bus, expr;
expression list args;
expression d;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
(
d = &dev->qdev;
|
d = DEVICE(dev);
)
... when != dev = expr
- qdev_init_nofail(d);
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = DEVICE(isa_create(bus, args));
+ ISADevice *isa_dev; // TODO move
+ isa_dev = isa_new(args);
+ dev = DEVICE(isa_dev);
... when != dev = expr
- qdev_init_nofail(dev);
+ isa_realize_and_unref(isa_dev, bus, &error_fatal);
Missing #include "qapi/error.h" added manually, whitespace changes
minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-20-armbru@redhat.com>
2020-06-10 07:32:08 +02:00
|
|
|
isa_dev = isa_new("pc87312");
|
|
|
|
dev = DEVICE(isa_dev);
|
2017-01-07 16:23:43 +01:00
|
|
|
qdev_prop_set_uint32(dev, "config", 12);
|
isa: Convert uses of isa_create() with Coccinelle
Replace
dev = isa_create(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = isa_new(type_name);
...
isa_realize_and_unref(dev, bus, &error_fatal);
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
Coccinelle script:
@@
expression dev, bus, expr;
expression list args;
expression d;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
(
d = &dev->qdev;
|
d = DEVICE(dev);
)
... when != dev = expr
- qdev_init_nofail(d);
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = DEVICE(isa_create(bus, args));
+ ISADevice *isa_dev; // TODO move
+ isa_dev = isa_new(args);
+ dev = DEVICE(isa_dev);
... when != dev = expr
- qdev_init_nofail(dev);
+ isa_realize_and_unref(isa_dev, bus, &error_fatal);
Missing #include "qapi/error.h" added manually, whitespace changes
minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-20-armbru@redhat.com>
2020-06-10 07:32:08 +02:00
|
|
|
isa_realize_and_unref(isa_dev, isa_bus, &error_fatal);
|
2017-01-07 16:23:43 +01:00
|
|
|
|
isa: Convert uses of isa_create() with Coccinelle
Replace
dev = isa_create(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = isa_new(type_name);
...
isa_realize_and_unref(dev, bus, &error_fatal);
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
Coccinelle script:
@@
expression dev, bus, expr;
expression list args;
expression d;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
(
d = &dev->qdev;
|
d = DEVICE(dev);
)
... when != dev = expr
- qdev_init_nofail(d);
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = DEVICE(isa_create(bus, args));
+ ISADevice *isa_dev; // TODO move
+ isa_dev = isa_new(args);
+ dev = DEVICE(isa_dev);
... when != dev = expr
- qdev_init_nofail(dev);
+ isa_realize_and_unref(isa_dev, bus, &error_fatal);
Missing #include "qapi/error.h" added manually, whitespace changes
minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-20-armbru@redhat.com>
2020-06-10 07:32:08 +02:00
|
|
|
isa_dev = isa_new("prep-systemio");
|
|
|
|
dev = DEVICE(isa_dev);
|
2017-01-07 16:23:43 +01:00
|
|
|
qdev_prop_set_uint32(dev, "ibm-planar-id", 0xfc);
|
|
|
|
qdev_prop_set_uint32(dev, "equipment", 0xc0);
|
isa: Convert uses of isa_create() with Coccinelle
Replace
dev = isa_create(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = isa_new(type_name);
...
isa_realize_and_unref(dev, bus, &error_fatal);
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
Coccinelle script:
@@
expression dev, bus, expr;
expression list args;
expression d;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
(
d = &dev->qdev;
|
d = DEVICE(dev);
)
... when != dev = expr
- qdev_init_nofail(d);
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = DEVICE(isa_create(bus, args));
+ ISADevice *isa_dev; // TODO move
+ isa_dev = isa_new(args);
+ dev = DEVICE(isa_dev);
... when != dev = expr
- qdev_init_nofail(dev);
+ isa_realize_and_unref(isa_dev, bus, &error_fatal);
Missing #include "qapi/error.h" added manually, whitespace changes
minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-20-armbru@redhat.com>
2020-06-10 07:32:08 +02:00
|
|
|
isa_realize_and_unref(isa_dev, isa_bus, &error_fatal);
|
2017-01-07 16:23:43 +01:00
|
|
|
|
2018-09-19 19:20:58 +02:00
|
|
|
dev = DEVICE(pci_create_simple(pci_bus, PCI_DEVFN(1, 0),
|
|
|
|
"lsi53c810"));
|
|
|
|
lsi53c8xx_handle_legacy_cmdline(dev);
|
2018-09-19 19:21:01 +02:00
|
|
|
qdev_connect_gpio_out(dev, 0, qdev_get_gpio_in(i82378_dev, 13));
|
2017-01-07 16:23:43 +01:00
|
|
|
|
|
|
|
/* XXX: s3-trio at PCI_DEVFN(2, 0) */
|
|
|
|
pci_vga_init(pci_bus);
|
|
|
|
|
|
|
|
for (i = 0; i < nb_nics; i++) {
|
|
|
|
pci_nic_init_nofail(&nd_table[i], pci_bus, "pcnet",
|
|
|
|
i == 0 ? "3" : NULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Prepare firmware configuration for OpenBIOS */
|
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 14:04:18 +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 14:04:18 +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 14:04:18 +02:00
|
|
|
sysbus_mmio_map(s, 0, CFG_ADDR);
|
|
|
|
sysbus_mmio_map(s, 1, CFG_ADDR + 2);
|
2017-01-07 16:23:43 +01:00
|
|
|
|
|
|
|
if (machine->kernel_filename) {
|
|
|
|
/* load kernel */
|
|
|
|
kernel_base = KERNEL_LOAD_ADDR;
|
|
|
|
kernel_size = load_image_targphys(machine->kernel_filename,
|
|
|
|
kernel_base,
|
|
|
|
machine->ram_size - kernel_base);
|
|
|
|
if (kernel_size < 0) {
|
|
|
|
error_report("could not load kernel '%s'",
|
|
|
|
machine->kernel_filename);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, kernel_base);
|
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size);
|
|
|
|
/* load initrd */
|
|
|
|
if (machine->initrd_filename) {
|
|
|
|
initrd_base = INITRD_LOAD_ADDR;
|
|
|
|
initrd_size = load_image_targphys(machine->initrd_filename,
|
|
|
|
initrd_base,
|
|
|
|
machine->ram_size - initrd_base);
|
|
|
|
if (initrd_size < 0) {
|
|
|
|
error_report("could not load initial ram disk '%s'",
|
|
|
|
machine->initrd_filename);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_ADDR, initrd_base);
|
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_SIZE, initrd_size);
|
|
|
|
}
|
|
|
|
if (machine->kernel_cmdline && *machine->kernel_cmdline) {
|
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_CMDLINE, CMDLINE_ADDR);
|
|
|
|
pstrcpy_targphys("cmdline", CMDLINE_ADDR, TARGET_PAGE_SIZE,
|
|
|
|
machine->kernel_cmdline);
|
|
|
|
fw_cfg_add_string(fw_cfg, FW_CFG_CMDLINE_DATA,
|
|
|
|
machine->kernel_cmdline);
|
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE,
|
|
|
|
strlen(machine->kernel_cmdline) + 1);
|
|
|
|
}
|
|
|
|
boot_device = 'm';
|
|
|
|
} else {
|
|
|
|
boot_device = machine->boot_order[0];
|
|
|
|
}
|
|
|
|
|
2019-05-18 22:54:22 +02:00
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, (uint16_t)machine->smp.max_cpus);
|
2017-01-07 16:23:43 +01:00
|
|
|
fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)machine->ram_size);
|
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_MACHINE_ID, ARCH_PREP);
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_IS_KVM, kvm_enabled());
|
|
|
|
if (kvm_enabled()) {
|
|
|
|
uint8_t *hypercall;
|
|
|
|
|
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_TBFREQ, kvmppc_get_tbfreq());
|
|
|
|
hypercall = g_malloc(16);
|
|
|
|
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());
|
|
|
|
} else {
|
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_TBFREQ, NANOSECONDS_PER_SECOND);
|
|
|
|
}
|
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_BOOT_DEVICE, boot_device);
|
|
|
|
qemu_register_boot_set(fw_cfg_boot_set, fw_cfg);
|
|
|
|
|
|
|
|
/* Prepare firmware configuration for Open Hack'Ware */
|
|
|
|
if (m48t59) {
|
2020-10-28 11:17:31 +01:00
|
|
|
PPC_NVRAM_set_params(m48t59, NVRAM_SIZE, "PREP", machine->ram_size,
|
2017-01-07 16:23:43 +01:00
|
|
|
boot_device,
|
|
|
|
kernel_base, kernel_size,
|
|
|
|
machine->kernel_cmdline,
|
|
|
|
initrd_base, initrd_size,
|
|
|
|
/* XXX: need an option to load a NVRAM image */
|
|
|
|
0,
|
|
|
|
graphic_width, graphic_height, graphic_depth);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ibm_40p_machine_init(MachineClass *mc)
|
|
|
|
{
|
|
|
|
mc->desc = "IBM RS/6000 7020 (40p)",
|
|
|
|
mc->init = ibm_40p_init;
|
|
|
|
mc->max_cpus = 1;
|
2018-06-25 14:41:57 +02:00
|
|
|
mc->default_ram_size = 128 * MiB;
|
2017-01-07 16:23:43 +01:00
|
|
|
mc->block_default_type = IF_SCSI;
|
|
|
|
mc->default_boot_order = "c";
|
2017-10-09 21:50:57 +02:00
|
|
|
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("604");
|
2018-07-06 09:51:55 +02:00
|
|
|
mc->default_display = "std";
|
2017-01-07 16:23:43 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
DEFINE_MACHINE("40p", ibm_40p_machine_init)
|