2005-07-02 16:31:34 +02:00
|
|
|
/*
|
2008-07-22 09:07:34 +02:00
|
|
|
* QEMU Sun4u/Sun4v System Emulator
|
2007-09-16 23:08:06 +02:00
|
|
|
*
|
2005-07-02 16:31:34 +02:00
|
|
|
* Copyright (c) 2005 Fabrice Bellard
|
2007-09-16 23:08:06 +02:00
|
|
|
*
|
2005-07-02 16:31:34 +02:00
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
2019-08-12 07:23:45 +02:00
|
|
|
|
2016-01-26 19:16:59 +01:00
|
|
|
#include "qemu/osdep.h"
|
2018-06-25 14:42:10 +02:00
|
|
|
#include "qemu/units.h"
|
hw/sparc*: Replace fprintf(stderr, "*\n" with error_report()
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then
compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
Some lines where then manually tweaked to pass checkpatch.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Fabien Chouteau <chouteau@adacore.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Artyom Tarasenko <atar4qemu@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-12-armbru@redhat.com>
2018-02-03 09:43:12 +01:00
|
|
|
#include "qemu/error-report.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"
|
2016-01-19 21:51:44 +01:00
|
|
|
#include "qemu-common.h"
|
|
|
|
#include "cpu.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/pci/pci.h"
|
2017-12-21 08:32:57 +01:00
|
|
|
#include "hw/pci/pci_bridge.h"
|
2017-06-11 11:12:08 +02:00
|
|
|
#include "hw/pci/pci_bus.h"
|
2018-01-08 19:16:34 +01:00
|
|
|
#include "hw/pci/pci_host.h"
|
2019-08-12 07:23:51 +02:00
|
|
|
#include "hw/qdev-properties.h"
|
2018-01-21 09:59:45 +01:00
|
|
|
#include "hw/pci-host/sabre.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/char/serial.h"
|
2018-03-08 23:39:22 +01:00
|
|
|
#include "hw/char/parallel.h"
|
2019-10-04 01:03:54 +02:00
|
|
|
#include "hw/rtc/m48t59.h"
|
2019-08-12 07:23:45 +02:00
|
|
|
#include "migration/vmstate.h"
|
2018-03-08 23:39:24 +01:00
|
|
|
#include "hw/input/i8042.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/block/fdc.h"
|
2012-10-24 08:43:34 +02:00
|
|
|
#include "net/net.h"
|
2012-12-17 18:20:00 +01:00
|
|
|
#include "qemu/timer.h"
|
2019-08-12 07:23:59 +02:00
|
|
|
#include "sysemu/runstate.h"
|
2012-12-17 18:20:04 +01:00
|
|
|
#include "sysemu/sysemu.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/boards.h"
|
2016-10-18 22:46:44 +02:00
|
|
|
#include "hw/nvram/sun_nvram.h"
|
2016-10-18 22:46:41 +02:00
|
|
|
#include "hw/nvram/chrp_nvram.h"
|
2016-09-29 14:02:19 +02:00
|
|
|
#include "hw/sparc/sparc64.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/nvram/fw_cfg.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/sysbus.h"
|
2017-06-11 11:12:08 +02:00
|
|
|
#include "hw/ide/pci.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/loader.h"
|
2018-08-29 18:33:45 +02:00
|
|
|
#include "hw/fw-path-provider.h"
|
2009-09-20 16:58:02 +02:00
|
|
|
#include "elf.h"
|
2017-12-21 08:32:57 +01:00
|
|
|
#include "trace.h"
|
2020-09-03 22:43:22 +02:00
|
|
|
#include "qom/object.h"
|
2005-07-02 16:31:34 +02:00
|
|
|
|
2005-07-23 16:27:54 +02:00
|
|
|
#define KERNEL_LOAD_ADDR 0x00404000
|
|
|
|
#define CMDLINE_ADDR 0x003ff000
|
2018-06-25 14:42:10 +02:00
|
|
|
#define PROM_SIZE_MAX (4 * MiB)
|
2007-10-06 13:28:21 +02:00
|
|
|
#define PROM_VADDR 0x000ffd00000ULL
|
2018-01-21 09:59:45 +01:00
|
|
|
#define PBM_SPECIAL_BASE 0x1fe00000000ULL
|
|
|
|
#define PBM_MEM_BASE 0x1ff00000000ULL
|
|
|
|
#define PBM_PCI_IO_BASE (PBM_SPECIAL_BASE + 0x02000000ULL)
|
2007-10-06 13:28:21 +02:00
|
|
|
#define PROM_FILENAME "openbios-sparc64"
|
2005-07-23 16:27:54 +02:00
|
|
|
#define NVRAM_SIZE 0x2000
|
2007-12-02 05:51:10 +01:00
|
|
|
#define MAX_IDE_BUS 2
|
2008-09-18 20:27:29 +02:00
|
|
|
#define BIOS_CFG_IOPORT 0x510
|
2009-08-08 12:44:56 +02:00
|
|
|
#define FW_CFG_SPARC64_WIDTH (FW_CFG_ARCH_LOCAL + 0x00)
|
|
|
|
#define FW_CFG_SPARC64_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01)
|
|
|
|
#define FW_CFG_SPARC64_DEPTH (FW_CFG_ARCH_LOCAL + 0x02)
|
2005-07-02 16:31:34 +02:00
|
|
|
|
2013-04-27 07:55:11 +02:00
|
|
|
#define IVEC_MAX 0x40
|
2008-09-22 21:50:28 +02:00
|
|
|
|
2008-07-22 09:07:34 +02:00
|
|
|
struct hwdef {
|
2008-09-18 20:33:18 +02:00
|
|
|
uint16_t machine_id;
|
2008-09-26 21:48:58 +02:00
|
|
|
uint64_t prom_addr;
|
|
|
|
uint64_t console_serial_base;
|
2008-07-22 09:07:34 +02:00
|
|
|
};
|
|
|
|
|
2020-09-03 22:43:22 +02:00
|
|
|
struct EbusState {
|
2017-12-21 08:32:57 +01:00
|
|
|
/*< private >*/
|
|
|
|
PCIDevice parent_obj;
|
|
|
|
|
2017-12-21 08:32:57 +01:00
|
|
|
ISABus *isa_bus;
|
2017-12-21 08:32:57 +01:00
|
|
|
qemu_irq isa_bus_irqs[ISA_NUM_IRQS];
|
2017-12-21 08:32:57 +01:00
|
|
|
uint64_t console_serial_base;
|
2011-08-08 15:09:22 +02:00
|
|
|
MemoryRegion bar0;
|
|
|
|
MemoryRegion bar1;
|
2020-09-03 22:43:22 +02:00
|
|
|
};
|
2011-08-08 15:09:22 +02:00
|
|
|
|
2017-12-21 08:32:57 +01:00
|
|
|
#define TYPE_EBUS "ebus"
|
2020-09-16 20:25:19 +02:00
|
|
|
OBJECT_DECLARE_SIMPLE_TYPE(EbusState, EBUS)
|
2017-12-21 08:32:57 +01:00
|
|
|
|
2019-04-22 15:51:26 +02:00
|
|
|
const char *fw_cfg_arch_key_name(uint16_t key)
|
|
|
|
{
|
|
|
|
static const struct {
|
|
|
|
uint16_t key;
|
|
|
|
const char *name;
|
|
|
|
} fw_cfg_arch_wellknown_keys[] = {
|
|
|
|
{FW_CFG_SPARC64_WIDTH, "width"},
|
|
|
|
{FW_CFG_SPARC64_HEIGHT, "height"},
|
|
|
|
{FW_CFG_SPARC64_DEPTH, "depth"},
|
|
|
|
};
|
|
|
|
|
|
|
|
for (size_t i = 0; i < ARRAY_SIZE(fw_cfg_arch_wellknown_keys); i++) {
|
|
|
|
if (fw_cfg_arch_wellknown_keys[i].key == key) {
|
|
|
|
return fw_cfg_arch_wellknown_keys[i].name;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2014-12-03 20:04:02 +01:00
|
|
|
static void fw_cfg_boot_set(void *opaque, const char *boot_device,
|
|
|
|
Error **errp)
|
2008-06-20 18:25:56 +02:00
|
|
|
{
|
2015-06-08 20:10:45 +02:00
|
|
|
fw_cfg_modify_i16(opaque, FW_CFG_BOOT_DEVICE, boot_device[0]);
|
2008-06-20 18:25:56 +02:00
|
|
|
}
|
|
|
|
|
2015-03-02 23:23:27 +01:00
|
|
|
static int sun4u_NVRAM_set_params(Nvram *nvram, uint16_t NVRAM_size,
|
2010-02-07 09:05:03 +01:00
|
|
|
const char *arch, ram_addr_t RAM_size,
|
|
|
|
const char *boot_devices,
|
|
|
|
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,
|
|
|
|
const uint8_t *macaddr)
|
2005-07-23 16:27:54 +02:00
|
|
|
{
|
2007-05-01 16:16:52 +02:00
|
|
|
unsigned int i;
|
2016-10-18 22:46:41 +02:00
|
|
|
int sysp_end;
|
2007-11-14 20:35:16 +01:00
|
|
|
uint8_t image[0x1ff0];
|
2015-03-02 23:23:27 +01:00
|
|
|
NvramClass *k = NVRAM_GET_CLASS(nvram);
|
2007-11-14 20:35:16 +01:00
|
|
|
|
|
|
|
memset(image, '\0', sizeof(image));
|
|
|
|
|
2016-10-18 22:46:41 +02:00
|
|
|
/* OpenBIOS nvram variables partition */
|
nvram: Exit QEMU if NVRAM cannot contain all -prom-env data
Since commit 61f20b9dc5b7 ("spapr_nvram: Pre-initialize the NVRAM to
support the -prom-env parameter"), pseries machines can pre-initialize
the "system" partition in the NVRAM with the data passed to all -prom-env
parameters on the QEMU command line.
In this case it is assumed that all the data fits in 64 KiB, but the user
can easily pass more and crash QEMU:
$ qemu-system-ppc64 -M pseries $(for ((x=0;x<128;x++)); do \
echo -n " -prom-env " ; printf "%0.sx" {1..1024}; \
done) # this requires ~128 Kib
malloc(): corrupted top size
Aborted (core dumped)
This happens because we don't check if all the prom-env data fits in
the NVRAM and chrp_nvram_set_var() happily memcpy() it passed the
buffer.
This crash affects basically all ppc/ppc64 machine types that use -prom-env:
- pseries (all versions)
- g3beige
- mac99
and also sparc/sparc64 machine types:
- LX
- SPARCClassic
- SPARCbook
- SS-10
- SS-20
- SS-4
- SS-5
- SS-600MP
- Voyager
- sun4u
- sun4v
Add a max_len argument to chrp_nvram_create_system_partition() so that
it can check the available size before writing to memory.
Since NVRAM is populated at machine init, it seems reasonable to consider
this error as fatal. So, instead of reporting an error when we detect that
the NVRAM is too small and adapt all machine types to handle it, we simply
exit QEMU in all cases. This is still better than crashing. If someone
wants another behavior, I guess this can be reworked later.
Tested with:
$ yes q | \
(for arch in ppc ppc64 sparc sparc64; do \
echo == $arch ==; \
qemu=${arch}-softmmu/qemu-system-$arch; \
for mach in $($qemu -M help | awk '! /^Supported/ { print $1 }'); do \
echo $mach; \
$qemu -M $mach -monitor stdio -nodefaults -nographic \
$(for ((x=0;x<128;x++)); do \
echo -n " -prom-env " ; printf "%0.sx" {1..1024}; \
done) >/dev/null; \
done; echo; \
done)
Without the patch, affected machine types cause QEMU to report some
memory corruption and crash:
malloc(): corrupted top size
free(): invalid size
*** stack smashing detected ***: terminated
With the patch, QEMU prints the following message and exits:
NVRAM is too small. Try to pass less data to -prom-env
It seems that the conditions for the crash have always existed, but it
affects pseries, the machine type I care for, since commit 61f20b9dc5b7
only.
Fixes: 61f20b9dc5b7 ("spapr_nvram: Pre-initialize the NVRAM to support the -prom-env parameter")
RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1867739
Reported-by: John Snow <jsnow@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <159736033937.350502.12402444542194031035.stgit@bahia.lan>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2020-08-14 01:12:19 +02:00
|
|
|
sysp_end = chrp_nvram_create_system_partition(image, 0, 0x1fd0);
|
2005-07-23 16:27:54 +02:00
|
|
|
|
2016-10-18 22:46:41 +02:00
|
|
|
/* Free space partition */
|
|
|
|
chrp_nvram_create_free_partition(&image[sysp_end], 0x1fd0 - sysp_end);
|
2007-11-14 20:35:16 +01:00
|
|
|
|
2008-07-15 16:54:01 +02:00
|
|
|
Sun_init_header((struct Sun_nvram *)&image[0x1fd8], macaddr, 0x80);
|
|
|
|
|
2015-03-02 23:23:27 +01:00
|
|
|
for (i = 0; i < sizeof(image); i++) {
|
|
|
|
(k->write)(nvram, i, image[i]);
|
|
|
|
}
|
2007-05-01 16:16:52 +02:00
|
|
|
|
2005-07-23 16:27:54 +02:00
|
|
|
return 0;
|
2005-07-02 16:31:34 +02:00
|
|
|
}
|
2012-05-12 19:20:52 +02:00
|
|
|
|
|
|
|
static uint64_t sun4u_load_kernel(const char *kernel_filename,
|
|
|
|
const char *initrd_filename,
|
|
|
|
ram_addr_t RAM_size, uint64_t *initrd_size,
|
|
|
|
uint64_t *initrd_addr, uint64_t *kernel_addr,
|
|
|
|
uint64_t *kernel_entry)
|
2009-07-21 12:49:47 +02:00
|
|
|
{
|
|
|
|
int linux_boot;
|
|
|
|
unsigned int i;
|
|
|
|
long kernel_size;
|
2010-01-24 22:18:00 +01:00
|
|
|
uint8_t *ptr;
|
2018-08-10 12:40:37 +02:00
|
|
|
uint64_t kernel_top = 0;
|
2009-07-21 12:49:47 +02:00
|
|
|
|
|
|
|
linux_boot = (kernel_filename != NULL);
|
|
|
|
|
|
|
|
kernel_size = 0;
|
|
|
|
if (linux_boot) {
|
2009-09-20 16:58:02 +02:00
|
|
|
int bswap_needed;
|
|
|
|
|
|
|
|
#ifdef BSWAP_NEEDED
|
|
|
|
bswap_needed = 1;
|
|
|
|
#else
|
|
|
|
bswap_needed = 0;
|
|
|
|
#endif
|
2019-01-15 13:18:03 +01:00
|
|
|
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, kernel_entry,
|
2020-01-26 23:55:04 +01:00
|
|
|
kernel_addr, &kernel_top, NULL, 1, EM_SPARCV9, 0,
|
|
|
|
0);
|
2012-05-12 19:20:52 +02:00
|
|
|
if (kernel_size < 0) {
|
|
|
|
*kernel_addr = KERNEL_LOAD_ADDR;
|
|
|
|
*kernel_entry = KERNEL_LOAD_ADDR;
|
2009-07-21 12:49:47 +02:00
|
|
|
kernel_size = load_aout(kernel_filename, KERNEL_LOAD_ADDR,
|
2009-09-20 16:58:02 +02:00
|
|
|
RAM_size - KERNEL_LOAD_ADDR, bswap_needed,
|
|
|
|
TARGET_PAGE_SIZE);
|
2012-05-12 19:20:52 +02:00
|
|
|
}
|
|
|
|
if (kernel_size < 0) {
|
2009-07-21 12:49:47 +02:00
|
|
|
kernel_size = load_image_targphys(kernel_filename,
|
|
|
|
KERNEL_LOAD_ADDR,
|
|
|
|
RAM_size - KERNEL_LOAD_ADDR);
|
2012-05-12 19:20:52 +02:00
|
|
|
}
|
2009-07-21 12:49:47 +02:00
|
|
|
if (kernel_size < 0) {
|
hw/sparc*: Replace fprintf(stderr, "*\n" with error_report()
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then
compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
Some lines where then manually tweaked to pass checkpatch.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Fabien Chouteau <chouteau@adacore.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Artyom Tarasenko <atar4qemu@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-12-armbru@redhat.com>
2018-02-03 09:43:12 +01:00
|
|
|
error_report("could not load kernel '%s'", kernel_filename);
|
2009-07-21 12:49:47 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
2012-05-12 19:20:52 +02:00
|
|
|
/* load initrd above kernel */
|
2009-07-21 12:49:47 +02:00
|
|
|
*initrd_size = 0;
|
2018-08-10 12:40:37 +02:00
|
|
|
if (initrd_filename && kernel_top) {
|
2012-05-12 19:20:52 +02:00
|
|
|
*initrd_addr = TARGET_PAGE_ALIGN(kernel_top);
|
|
|
|
|
2009-07-21 12:49:47 +02:00
|
|
|
*initrd_size = load_image_targphys(initrd_filename,
|
2012-05-12 19:20:52 +02:00
|
|
|
*initrd_addr,
|
|
|
|
RAM_size - *initrd_addr);
|
|
|
|
if ((int)*initrd_size < 0) {
|
hw/sparc*: Replace fprintf(stderr, "*\n" with error_report()
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then
compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
Some lines where then manually tweaked to pass checkpatch.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Fabien Chouteau <chouteau@adacore.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Artyom Tarasenko <atar4qemu@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-12-armbru@redhat.com>
2018-02-03 09:43:12 +01:00
|
|
|
error_report("could not load initial ram disk '%s'",
|
|
|
|
initrd_filename);
|
2009-07-21 12:49:47 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (*initrd_size > 0) {
|
|
|
|
for (i = 0; i < 64 * TARGET_PAGE_SIZE; i += TARGET_PAGE_SIZE) {
|
2018-06-26 11:35:40 +02:00
|
|
|
ptr = rom_ptr(*kernel_addr + i, 32);
|
|
|
|
if (ptr && ldl_p(ptr + 8) == 0x48647253) { /* HdrS */
|
2012-05-12 19:20:52 +02:00
|
|
|
stl_p(ptr + 24, *initrd_addr + *kernel_addr);
|
2010-01-24 22:18:00 +01:00
|
|
|
stl_p(ptr + 28, *initrd_size);
|
2009-07-21 12:49:47 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return kernel_size;
|
|
|
|
}
|
2005-07-02 16:31:34 +02:00
|
|
|
|
2008-09-26 21:48:58 +02:00
|
|
|
typedef struct ResetData {
|
2012-05-03 03:41:16 +02:00
|
|
|
SPARCCPU *cpu;
|
2009-11-07 11:05:03 +01:00
|
|
|
uint64_t prom_addr;
|
2008-09-26 21:48:58 +02:00
|
|
|
} ResetData;
|
|
|
|
|
2018-01-24 20:19:58 +01:00
|
|
|
#define TYPE_SUN4U_POWER "power"
|
2020-09-16 20:25:19 +02:00
|
|
|
OBJECT_DECLARE_SIMPLE_TYPE(PowerDevice, SUN4U_POWER)
|
2018-01-24 20:19:58 +01:00
|
|
|
|
2020-09-03 22:43:22 +02:00
|
|
|
struct PowerDevice {
|
2018-01-24 20:19:58 +01:00
|
|
|
SysBusDevice parent_obj;
|
|
|
|
|
|
|
|
MemoryRegion power_mmio;
|
2020-09-03 22:43:22 +02:00
|
|
|
};
|
2018-01-24 20:19:58 +01:00
|
|
|
|
|
|
|
/* Power */
|
2019-01-04 10:49:10 +01:00
|
|
|
static uint64_t power_mem_read(void *opaque, hwaddr addr, unsigned size)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-01-24 20:19:58 +01:00
|
|
|
static void power_mem_write(void *opaque, hwaddr addr,
|
|
|
|
uint64_t val, unsigned size)
|
|
|
|
{
|
|
|
|
/* According to a real Ultra 5, bit 24 controls the power */
|
|
|
|
if (val & 0x1000000) {
|
|
|
|
qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static const MemoryRegionOps power_mem_ops = {
|
2019-01-04 10:49:10 +01:00
|
|
|
.read = power_mem_read,
|
2018-01-24 20:19:58 +01:00
|
|
|
.write = power_mem_write,
|
|
|
|
.endianness = DEVICE_NATIVE_ENDIAN,
|
|
|
|
.valid = {
|
|
|
|
.min_access_size = 4,
|
|
|
|
.max_access_size = 4,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
static void power_realize(DeviceState *dev, Error **errp)
|
|
|
|
{
|
|
|
|
PowerDevice *d = SUN4U_POWER(dev);
|
|
|
|
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
|
|
|
|
|
|
|
|
memory_region_init_io(&d->power_mmio, OBJECT(dev), &power_mem_ops, d,
|
|
|
|
"power", sizeof(uint32_t));
|
|
|
|
|
|
|
|
sysbus_init_mmio(sbd, &d->power_mmio);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void power_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
|
|
|
|
dc->realize = power_realize;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const TypeInfo power_info = {
|
|
|
|
.name = TYPE_SUN4U_POWER,
|
|
|
|
.parent = TYPE_SYS_BUS_DEVICE,
|
|
|
|
.instance_size = sizeof(PowerDevice),
|
|
|
|
.class_init = power_class_init,
|
|
|
|
};
|
|
|
|
|
2017-12-21 08:32:57 +01:00
|
|
|
static void ebus_isa_irq_handler(void *opaque, int n, int level)
|
2009-08-28 21:04:13 +02:00
|
|
|
{
|
2017-12-21 08:32:57 +01:00
|
|
|
EbusState *s = EBUS(opaque);
|
|
|
|
qemu_irq irq = s->isa_bus_irqs[n];
|
|
|
|
|
|
|
|
/* Pass ISA bus IRQs onto their gpio equivalent */
|
2017-12-21 08:32:57 +01:00
|
|
|
trace_ebus_isa_irq_handler(n, level);
|
2017-12-21 08:32:57 +01:00
|
|
|
if (irq) {
|
|
|
|
qemu_set_irq(irq, level);
|
2012-03-10 21:37:00 +01:00
|
|
|
}
|
2009-08-28 21:04:13 +02:00
|
|
|
}
|
|
|
|
|
2009-01-10 12:33:32 +01:00
|
|
|
/* EBUS (Eight bit bus) bridge */
|
2017-12-21 08:32:57 +01:00
|
|
|
static void ebus_realize(PCIDevice *pci_dev, Error **errp)
|
2009-07-12 10:54:49 +02:00
|
|
|
{
|
2017-12-21 08:32:57 +01:00
|
|
|
EbusState *s = EBUS(pci_dev);
|
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;
|
2018-01-24 20:19:58 +01:00
|
|
|
SysBusDevice *sbd;
|
2017-12-21 08:32:57 +01:00
|
|
|
DeviceState *dev;
|
2017-12-21 08:32:57 +01:00
|
|
|
qemu_irq *isa_irq;
|
2017-12-21 08:32:57 +01:00
|
|
|
DriveInfo *fd[MAX_FD];
|
|
|
|
int i;
|
2011-08-08 15:09:22 +02:00
|
|
|
|
2017-12-21 08:32:57 +01:00
|
|
|
s->isa_bus = isa_bus_new(DEVICE(pci_dev), get_system_memory(),
|
|
|
|
pci_address_space_io(pci_dev), errp);
|
|
|
|
if (!s->isa_bus) {
|
|
|
|
error_setg(errp, "unable to instantiate EBUS ISA bus");
|
isa: Clean up error handling around isa_bus_new()
We can have at most one ISA bus. If you try to create another one,
isa_bus_new() complains to stderr and returns null.
isa_bus_new() is called in two contexts, machine's init() and device's
realize() methods. Since complaining to stderr is not proper in the
latter context, convert isa_bus_new() to Error.
Machine's init():
* mips_jazz_init(), called from the init() methods of machines
"magnum" and "pica"
* mips_r4k_init(), the init() method of machine "mips"
* pc_init1() called from the init() methods of non-q35 PC machines
* typhoon_init(), called from clipper_init(), the init() method of
machine "clipper"
These callers always create the first ISA bus, hence isa_bus_new()
can't fail. Simply pass &error_abort.
Device's realize():
* i82378_realize(), of PCI device "i82378"
* ich9_lpc_realize(), of PCI device "ICH9-LPC"
* pci_ebus_realize(), of PCI device "ebus"
* piix3_realize(), of PCI device "pci-piix3", abstract parent of
"PIIX3" and "PIIX3-xen"
* piix4_realize(), of PCI device "PIIX4"
* vt82c686b_realize(), of PCI device "VT82C686B"
Propagate the error. Note that these devices are typically created
only by machine init() methods with qdev_init_nofail() or similar. If
we screwed up and created an ISA bus before that call, we now give up
right away. Before, we'd hobble on, and typically die in
isa_bus_irqs(). Similar if someone finds a way to hot-plug one of
these critters.
Cc: Richard Henderson <rth@twiddle.net>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: "Hervé Poussineau" <hpoussin@reactos.org>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <1450370121-5768-11-git-send-email-armbru@redhat.com>
2015-12-17 17:35:18 +01:00
|
|
|
return;
|
|
|
|
}
|
2011-08-08 15:09:22 +02:00
|
|
|
|
2017-12-21 08:32:57 +01:00
|
|
|
/* ISA bus */
|
|
|
|
isa_irq = qemu_allocate_irqs(ebus_isa_irq_handler, s, ISA_NUM_IRQS);
|
2017-12-21 08:32:57 +01:00
|
|
|
isa_bus_irqs(s->isa_bus, isa_irq);
|
2017-12-21 08:32:57 +01:00
|
|
|
qdev_init_gpio_out_named(DEVICE(s), s->isa_bus_irqs, "isa-irq",
|
|
|
|
ISA_NUM_IRQS);
|
2017-12-21 08:32:57 +01:00
|
|
|
|
2017-12-21 08:32:57 +01:00
|
|
|
/* Serial ports */
|
|
|
|
i = 0;
|
|
|
|
if (s->console_serial_base) {
|
|
|
|
serial_mm_init(pci_address_space(pci_dev), s->console_serial_base,
|
2018-04-20 16:52:43 +02:00
|
|
|
0, NULL, 115200, serial_hd(i), DEVICE_BIG_ENDIAN);
|
2017-12-21 08:32:57 +01:00
|
|
|
i++;
|
|
|
|
}
|
2018-04-20 16:52:46 +02:00
|
|
|
serial_hds_isa_init(s->isa_bus, i, MAX_ISA_SERIAL_PORTS);
|
2017-12-21 08:32:57 +01:00
|
|
|
|
|
|
|
/* Parallel ports */
|
|
|
|
parallel_hds_isa_init(s->isa_bus, MAX_PARALLEL_PORTS);
|
|
|
|
|
|
|
|
/* Keyboard */
|
|
|
|
isa_create_simple(s->isa_bus, "i8042");
|
|
|
|
|
|
|
|
/* Floppy */
|
|
|
|
for (i = 0; i < MAX_FD; i++) {
|
|
|
|
fd[i] = drive_get(IF_FLOPPY, 0, i);
|
|
|
|
}
|
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_ISA_FDC);
|
|
|
|
dev = DEVICE(isa_dev);
|
2017-12-21 08:32:57 +01:00
|
|
|
qdev_prop_set_uint32(dev, "dma", -1);
|
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, s->isa_bus, &error_fatal);
|
fdc: Reject clash between -drive if=floppy and -global isa-fdc
The floppy controller devices desugar their drive properties into
floppy devices (since commit a92bd191a4 "fdc: Move qdev properties to
FloppyDrive", v2.8.0). This involves some bad magic in
fdctrl_connect_drives(), and exists for backward compatibility.
The functions for boards to create floppy controller devices
fdctrl_init_isa(), fdctrl_init_sysbus(), and sun4m_fdctrl_init()
desugar -drive if=floppy to these floppy controller drive properties.
If you use both -drive if=floppy (or its -fda / -fdb sugar) and
-global isa-fdc for the same floppy device, -global silently loses the
conflict, and both backends involved end up with the floppy device
frontend attached, as demonstrated by iotest 172 (see commit before
previous). This is wrong.
Desugar -drive if=floppy straight to floppy devices instead, with
helper fdctrl_init_drives(). The conflict now gets rejected cleanly:
first, fdctrl_connect_drives() creates the floppy for the controller's
property, then fdctrl_init_drives() attempts to create the floppy for
-drive if=floppy, but fails because the unit is already in use.
Output of iotest 172 changes in three ways:
1. The clash gets rejected.
2. In one test case, "info qtree" has the floppy devices swapped, and
"info block" has their QOM paths swapped. This is because the
floppy device for -fda now gets created after the one for -global
isa-fdc.driveB.
3. The error message for -global floppy.drive=floppy0 changes. Before
the patch, we set isa-fdc.driveA to -fda's block backend, then
create the floppy device for it, then move the backend from
isa-fdc.driveA to floppy.drive. Floppy creation fails when
applying -global floppy.drive=floppy0, because floppy0 is still
attached to isa-fdc. After the patch, we create the floppy for
-fda, then set its drive property to floppy0. Now floppy creation
succeeds, but setting the drive property fails, because -global
already set it. Yes, this is exasperatingly complicated.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200622094227.1271650-5-armbru@redhat.com>
2020-06-22 11:42:15 +02:00
|
|
|
isa_fdc_init_drives(isa_dev, fd);
|
2017-12-21 08:32:57 +01:00
|
|
|
|
2018-01-24 20:19:58 +01:00
|
|
|
/* Power */
|
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_SUN4U_POWER);
|
2018-01-24 20:19:58 +01:00
|
|
|
sbd = 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(sbd, &error_fatal);
|
2018-01-24 20:19:58 +01:00
|
|
|
memory_region_add_subregion(pci_address_space_io(pci_dev), 0x7240,
|
|
|
|
sysbus_mmio_get_region(sbd, 0));
|
|
|
|
|
2017-12-21 08:32:57 +01:00
|
|
|
/* PCI */
|
2011-08-08 15:09:22 +02:00
|
|
|
pci_dev->config[0x04] = 0x06; // command = bus master, pci mem
|
|
|
|
pci_dev->config[0x05] = 0x00;
|
|
|
|
pci_dev->config[0x06] = 0xa0; // status = fast back-to-back, 66MHz, no error
|
|
|
|
pci_dev->config[0x07] = 0x03; // status = medium devsel
|
|
|
|
pci_dev->config[0x09] = 0x00; // programming i/f
|
|
|
|
pci_dev->config[0x0D] = 0x0a; // latency_timer
|
|
|
|
|
2013-07-22 15:54:23 +02:00
|
|
|
memory_region_init_alias(&s->bar0, OBJECT(s), "bar0", get_system_io(),
|
|
|
|
0, 0x1000000);
|
2011-08-08 15:09:31 +02:00
|
|
|
pci_register_bar(pci_dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->bar0);
|
2013-07-22 15:54:23 +02:00
|
|
|
memory_region_init_alias(&s->bar1, OBJECT(s), "bar1", get_system_io(),
|
2018-01-24 20:19:58 +01:00
|
|
|
0, 0x8000);
|
2014-08-04 19:13:11 +02:00
|
|
|
pci_register_bar(pci_dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &s->bar1);
|
2009-01-10 12:33:32 +01:00
|
|
|
}
|
|
|
|
|
2017-12-21 08:32:57 +01:00
|
|
|
static Property ebus_properties[] = {
|
|
|
|
DEFINE_PROP_UINT64("console-serial-base", EbusState,
|
|
|
|
console_serial_base, 0),
|
|
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
|
|
};
|
|
|
|
|
2011-12-04 19:22:06 +01:00
|
|
|
static void ebus_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
|
|
|
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
|
2017-12-21 08:32:57 +01:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
2011-12-04 19:22:06 +01:00
|
|
|
|
2017-12-21 08:32:57 +01:00
|
|
|
k->realize = ebus_realize;
|
2011-12-04 19:22:06 +01:00
|
|
|
k->vendor_id = PCI_VENDOR_ID_SUN;
|
|
|
|
k->device_id = PCI_DEVICE_ID_SUN_EBUS;
|
|
|
|
k->revision = 0x01;
|
|
|
|
k->class_id = PCI_CLASS_BRIDGE_OTHER;
|
2020-01-10 16:30:32 +01:00
|
|
|
device_class_set_props(dc, ebus_properties);
|
2011-12-04 19:22:06 +01:00
|
|
|
}
|
|
|
|
|
2013-01-10 16:19:07 +01:00
|
|
|
static const TypeInfo ebus_info = {
|
2017-12-21 08:32:57 +01:00
|
|
|
.name = TYPE_EBUS,
|
2011-12-08 04:34:16 +01:00
|
|
|
.parent = TYPE_PCI_DEVICE,
|
|
|
|
.class_init = ebus_class_init,
|
2017-12-21 08:32:57 +01:00
|
|
|
.instance_size = sizeof(EbusState),
|
2017-09-27 21:56:34 +02:00
|
|
|
.interfaces = (InterfaceInfo[]) {
|
|
|
|
{ INTERFACE_CONVENTIONAL_PCI_DEVICE },
|
|
|
|
{ },
|
|
|
|
},
|
2009-07-12 10:54:49 +02:00
|
|
|
};
|
|
|
|
|
2013-07-27 13:48:18 +02:00
|
|
|
#define TYPE_OPENPROM "openprom"
|
2020-09-03 22:43:22 +02:00
|
|
|
typedef struct PROMState PROMState;
|
2020-08-31 23:07:33 +02:00
|
|
|
DECLARE_INSTANCE_CHECKER(PROMState, OPENPROM,
|
|
|
|
TYPE_OPENPROM)
|
2013-07-27 13:48:18 +02:00
|
|
|
|
2020-09-03 22:43:22 +02:00
|
|
|
struct PROMState {
|
2013-07-27 13:48:18 +02:00
|
|
|
SysBusDevice parent_obj;
|
|
|
|
|
2011-10-03 14:31:12 +02:00
|
|
|
MemoryRegion prom;
|
2020-09-03 22:43:22 +02:00
|
|
|
};
|
2011-10-03 14:31:12 +02:00
|
|
|
|
2010-03-14 21:20:59 +01:00
|
|
|
static uint64_t translate_prom_address(void *opaque, uint64_t addr)
|
|
|
|
{
|
2012-10-23 12:30:10 +02:00
|
|
|
hwaddr *base_addr = (hwaddr *)opaque;
|
2010-03-14 21:20:59 +01:00
|
|
|
return addr + *base_addr - PROM_VADDR;
|
|
|
|
}
|
|
|
|
|
2009-07-21 11:58:02 +02:00
|
|
|
/* Boot PROM (OpenBIOS) */
|
2012-10-23 12:30:10 +02:00
|
|
|
static void prom_init(hwaddr addr, const char *bios_name)
|
2009-07-21 11:58:02 +02:00
|
|
|
{
|
|
|
|
DeviceState *dev;
|
|
|
|
SysBusDevice *s;
|
|
|
|
char *filename;
|
|
|
|
int ret;
|
|
|
|
|
qdev: Convert uses of qdev_create() with Coccinelle
This is the transformation explained in the commit before previous.
Takes care of just one pattern that needs conversion. More to come in
this series.
Coccinelle script:
@ depends on !(file in "hw/arm/highbank.c")@
expression bus, type_name, dev, expr;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr;
identifier DOWN;
@@
- dev = DOWN(qdev_create(bus, type_name));
+ dev = DOWN(qdev_new(type_name));
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize_and_unref(DEVICE(dev), bus, &error_fatal);
@@
expression bus, type_name, expr;
identifier dev;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr, errp;
symbol true;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
@@
expression bus, type_name, expr, errp;
identifier dev;
symbol true;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
The first rule exempts hw/arm/highbank.c, because it matches along two
control flow paths there, with different @type_name. Covered by the
next commit's manual conversions.
Missing #include "qapi/error.h" added manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-10-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:31:58 +02:00
|
|
|
dev = qdev_new(TYPE_OPENPROM);
|
2013-01-20 02:47:33 +01:00
|
|
|
s = SYS_BUS_DEVICE(dev);
|
sysbus: Convert to sysbus_realize() etc. with Coccinelle
Convert from qdev_realize(), qdev_realize_and_unref() with null @bus
argument to sysbus_realize(), sysbus_realize_and_unref().
Coccinelle script:
@@
expression dev, errp;
@@
- qdev_realize(DEVICE(dev), NULL, errp);
+ sysbus_realize(SYS_BUS_DEVICE(dev), errp);
@@
expression sysbus_dev, dev, errp;
@@
+ sysbus_dev = SYS_BUS_DEVICE(dev);
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
- sysbus_dev = SYS_BUS_DEVICE(dev);
@@
expression sysbus_dev, dev, errp;
expression expr;
@@
sysbus_dev = SYS_BUS_DEVICE(dev);
... when != dev = expr;
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(DEVICE(dev), NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
Whitespace changes minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-46-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:32:34 +02:00
|
|
|
sysbus_realize_and_unref(s, &error_fatal);
|
2009-07-21 11:58:02 +02:00
|
|
|
|
|
|
|
sysbus_mmio_map(s, 0, addr);
|
|
|
|
|
|
|
|
/* load boot prom */
|
|
|
|
if (bios_name == NULL) {
|
|
|
|
bios_name = PROM_FILENAME;
|
|
|
|
}
|
|
|
|
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
|
|
|
|
if (filename) {
|
2019-01-15 13:18:03 +01:00
|
|
|
ret = load_elf(filename, NULL, translate_prom_address, &addr,
|
2020-01-26 23:55:04 +01:00
|
|
|
NULL, NULL, NULL, NULL, 1, EM_SPARCV9, 0, 0);
|
2009-07-21 11:58:02 +02:00
|
|
|
if (ret < 0 || ret > PROM_SIZE_MAX) {
|
|
|
|
ret = load_image_targphys(filename, addr, PROM_SIZE_MAX);
|
|
|
|
}
|
2011-08-21 05:09:37 +02:00
|
|
|
g_free(filename);
|
2009-07-21 11:58:02 +02:00
|
|
|
} else {
|
|
|
|
ret = -1;
|
|
|
|
}
|
|
|
|
if (ret < 0 || ret > PROM_SIZE_MAX) {
|
hw/sparc*: Replace fprintf(stderr, "*\n" with error_report()
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then
compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
Some lines where then manually tweaked to pass checkpatch.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Fabien Chouteau <chouteau@adacore.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Artyom Tarasenko <atar4qemu@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-12-armbru@redhat.com>
2018-02-03 09:43:12 +01:00
|
|
|
error_report("could not load prom '%s'", bios_name);
|
2009-07-21 11:58:02 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-04-05 11:32:30 +02:00
|
|
|
static void prom_realize(DeviceState *ds, Error **errp)
|
2009-07-21 11:58:02 +02:00
|
|
|
{
|
2018-04-05 11:32:30 +02:00
|
|
|
PROMState *s = OPENPROM(ds);
|
|
|
|
SysBusDevice *dev = SYS_BUS_DEVICE(ds);
|
|
|
|
Error *local_err = NULL;
|
|
|
|
|
|
|
|
memory_region_init_ram_nomigrate(&s->prom, OBJECT(ds), "sun4u.prom",
|
|
|
|
PROM_SIZE_MAX, &local_err);
|
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
return;
|
|
|
|
}
|
2009-07-21 11:58:02 +02:00
|
|
|
|
2011-12-20 14:59:12 +01:00
|
|
|
vmstate_register_ram_global(&s->prom);
|
2011-10-03 14:31:12 +02:00
|
|
|
memory_region_set_readonly(&s->prom, true);
|
2011-11-27 10:38:10 +01:00
|
|
|
sysbus_init_mmio(dev, &s->prom);
|
2009-07-21 11:58:02 +02:00
|
|
|
}
|
|
|
|
|
2012-01-24 20:12:29 +01:00
|
|
|
static Property prom_properties[] = {
|
|
|
|
{/* end of property list */},
|
|
|
|
};
|
|
|
|
|
|
|
|
static void prom_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
2011-12-08 04:34:16 +01:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
2012-01-24 20:12:29 +01:00
|
|
|
|
2020-01-10 16:30:32 +01:00
|
|
|
device_class_set_props(dc, prom_properties);
|
2018-04-05 11:32:30 +02:00
|
|
|
dc->realize = prom_realize;
|
2012-01-24 20:12:29 +01:00
|
|
|
}
|
|
|
|
|
2013-01-10 16:19:07 +01:00
|
|
|
static const TypeInfo prom_info = {
|
2013-07-27 13:48:18 +02:00
|
|
|
.name = TYPE_OPENPROM,
|
2011-12-08 04:34:16 +01:00
|
|
|
.parent = TYPE_SYS_BUS_DEVICE,
|
|
|
|
.instance_size = sizeof(PROMState),
|
|
|
|
.class_init = prom_class_init,
|
2009-07-21 11:58:02 +02:00
|
|
|
};
|
|
|
|
|
2009-07-21 12:04:47 +02:00
|
|
|
|
2013-07-27 13:50:51 +02:00
|
|
|
#define TYPE_SUN4U_MEMORY "memory"
|
2020-09-03 22:43:22 +02:00
|
|
|
typedef struct RamDevice RamDevice;
|
2020-08-31 23:07:33 +02:00
|
|
|
DECLARE_INSTANCE_CHECKER(RamDevice, SUN4U_RAM,
|
|
|
|
TYPE_SUN4U_MEMORY)
|
2013-07-27 13:50:51 +02:00
|
|
|
|
2020-09-03 22:43:22 +02:00
|
|
|
struct RamDevice {
|
2013-07-27 13:50:51 +02:00
|
|
|
SysBusDevice parent_obj;
|
|
|
|
|
2011-10-03 14:31:12 +02:00
|
|
|
MemoryRegion ram;
|
2009-07-21 13:20:11 +02:00
|
|
|
uint64_t size;
|
2020-09-03 22:43:22 +02:00
|
|
|
};
|
2009-07-21 12:04:47 +02:00
|
|
|
|
|
|
|
/* System RAM */
|
2017-05-25 15:34:51 +02:00
|
|
|
static void ram_realize(DeviceState *dev, Error **errp)
|
2009-07-21 12:04:47 +02:00
|
|
|
{
|
2013-07-27 13:50:51 +02:00
|
|
|
RamDevice *d = SUN4U_RAM(dev);
|
2017-05-25 15:34:51 +02:00
|
|
|
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
|
2009-07-21 12:04:47 +02:00
|
|
|
|
2017-07-07 16:42:49 +02:00
|
|
|
memory_region_init_ram_nomigrate(&d->ram, OBJECT(d), "sun4u.ram", d->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);
|
2011-12-20 14:59:12 +01:00
|
|
|
vmstate_register_ram_global(&d->ram);
|
2017-05-25 15:34:51 +02:00
|
|
|
sysbus_init_mmio(sbd, &d->ram);
|
2009-07-21 12:04:47 +02:00
|
|
|
}
|
|
|
|
|
2012-10-23 12:30:10 +02:00
|
|
|
static void ram_init(hwaddr addr, ram_addr_t RAM_size)
|
2009-07-21 12:04:47 +02:00
|
|
|
{
|
|
|
|
DeviceState *dev;
|
|
|
|
SysBusDevice *s;
|
|
|
|
RamDevice *d;
|
|
|
|
|
|
|
|
/* allocate RAM */
|
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_SUN4U_MEMORY);
|
2013-01-20 02:47:33 +01:00
|
|
|
s = SYS_BUS_DEVICE(dev);
|
2009-07-21 12:04:47 +02:00
|
|
|
|
2013-07-27 13:50:51 +02:00
|
|
|
d = SUN4U_RAM(dev);
|
2009-07-21 12:04:47 +02:00
|
|
|
d->size = RAM_size;
|
sysbus: Convert to sysbus_realize() etc. with Coccinelle
Convert from qdev_realize(), qdev_realize_and_unref() with null @bus
argument to sysbus_realize(), sysbus_realize_and_unref().
Coccinelle script:
@@
expression dev, errp;
@@
- qdev_realize(DEVICE(dev), NULL, errp);
+ sysbus_realize(SYS_BUS_DEVICE(dev), errp);
@@
expression sysbus_dev, dev, errp;
@@
+ sysbus_dev = SYS_BUS_DEVICE(dev);
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
- sysbus_dev = SYS_BUS_DEVICE(dev);
@@
expression sysbus_dev, dev, errp;
expression expr;
@@
sysbus_dev = SYS_BUS_DEVICE(dev);
... when != dev = expr;
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(DEVICE(dev), NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
Whitespace changes minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-46-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:32:34 +02:00
|
|
|
sysbus_realize_and_unref(s, &error_fatal);
|
2009-07-21 12:04:47 +02:00
|
|
|
|
|
|
|
sysbus_mmio_map(s, 0, addr);
|
|
|
|
}
|
|
|
|
|
2012-01-24 20:12:29 +01:00
|
|
|
static Property ram_properties[] = {
|
|
|
|
DEFINE_PROP_UINT64("size", RamDevice, size, 0),
|
|
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
|
|
};
|
|
|
|
|
|
|
|
static void ram_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
2011-12-08 04:34:16 +01:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
2012-01-24 20:12:29 +01:00
|
|
|
|
2017-05-25 15:34:51 +02:00
|
|
|
dc->realize = ram_realize;
|
2020-01-10 16:30:32 +01:00
|
|
|
device_class_set_props(dc, ram_properties);
|
2012-01-24 20:12:29 +01:00
|
|
|
}
|
|
|
|
|
2013-01-10 16:19:07 +01:00
|
|
|
static const TypeInfo ram_info = {
|
2013-07-27 13:50:51 +02:00
|
|
|
.name = TYPE_SUN4U_MEMORY,
|
2011-12-08 04:34:16 +01:00
|
|
|
.parent = TYPE_SYS_BUS_DEVICE,
|
|
|
|
.instance_size = sizeof(RamDevice),
|
|
|
|
.class_init = ram_class_init,
|
2009-07-21 12:04:47 +02:00
|
|
|
};
|
|
|
|
|
2011-08-12 01:07:21 +02:00
|
|
|
static void sun4uv_init(MemoryRegion *address_space_mem,
|
2014-05-07 16:42:57 +02:00
|
|
|
MachineState *machine,
|
2009-07-21 12:46:23 +02:00
|
|
|
const struct hwdef *hwdef)
|
|
|
|
{
|
2012-05-03 03:33:52 +02:00
|
|
|
SPARCCPU *cpu;
|
2015-03-02 23:23:27 +01:00
|
|
|
Nvram *nvram;
|
2009-07-21 12:46:23 +02:00
|
|
|
unsigned int i;
|
2012-05-12 19:20:52 +02:00
|
|
|
uint64_t initrd_addr, initrd_size, kernel_addr, kernel_size, kernel_entry;
|
2018-01-21 09:59:45 +01:00
|
|
|
SabreState *sabre;
|
2017-09-04 19:41:01 +02:00
|
|
|
PCIBus *pci_bus, *pci_busA, *pci_busB;
|
2017-09-08 15:31:21 +02:00
|
|
|
PCIDevice *ebus, *pci_dev;
|
2015-03-02 23:23:27 +01:00
|
|
|
SysBusDevice *s;
|
2018-01-08 19:16:34 +01:00
|
|
|
DeviceState *iommu, *dev;
|
2013-04-16 02:24:08 +02:00
|
|
|
FWCfgState *fw_cfg;
|
2017-09-08 15:31:21 +02:00
|
|
|
NICInfo *nd;
|
2017-06-11 11:12:08 +02:00
|
|
|
MACAddr macaddr;
|
|
|
|
bool onboard_nic;
|
2009-07-21 12:46:23 +02:00
|
|
|
|
|
|
|
/* init CPUs */
|
2017-10-05 15:51:06 +02:00
|
|
|
cpu = sparc64_cpu_devinit(machine->cpu_type, hwdef->prom_addr);
|
2009-07-21 12:46:23 +02:00
|
|
|
|
2018-01-08 19:16:34 +01:00
|
|
|
/* IOMMU */
|
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
|
|
|
iommu = qdev_new(TYPE_SUN4U_IOMMU);
|
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(iommu), &error_fatal);
|
2018-01-08 19:16:34 +01:00
|
|
|
|
2009-07-21 12:04:47 +02:00
|
|
|
/* set up devices */
|
2014-05-07 16:42:57 +02:00
|
|
|
ram_init(0, machine->ram_size);
|
2005-07-02 16:31:34 +02:00
|
|
|
|
2009-07-21 11:58:02 +02:00
|
|
|
prom_init(hwdef->prom_addr, bios_name);
|
2005-07-02 16:31:34 +02:00
|
|
|
|
2018-01-21 09:59:45 +01:00
|
|
|
/* Init sabre (PCI host bridge) */
|
2020-09-03 00:42:56 +02:00
|
|
|
sabre = SABRE(qdev_new(TYPE_SABRE));
|
2018-01-21 09:59:45 +01:00
|
|
|
qdev_prop_set_uint64(DEVICE(sabre), "special-base", PBM_SPECIAL_BASE);
|
|
|
|
qdev_prop_set_uint64(DEVICE(sabre), "mem-base", PBM_MEM_BASE);
|
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(sabre), "iommu", OBJECT(iommu),
|
2018-01-21 09:59:45 +01:00
|
|
|
&error_abort);
|
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(sabre), &error_fatal);
|
2017-12-21 08:32:57 +01:00
|
|
|
|
|
|
|
/* Wire up PCI interrupts to CPU */
|
|
|
|
for (i = 0; i < IVEC_MAX; i++) {
|
2018-01-21 09:59:45 +01:00
|
|
|
qdev_connect_gpio_out_named(DEVICE(sabre), "ivec-irq", i,
|
2017-12-21 08:32:57 +01:00
|
|
|
qdev_get_gpio_in_named(DEVICE(cpu), "ivec-irq", i));
|
|
|
|
}
|
|
|
|
|
2018-01-21 09:59:45 +01:00
|
|
|
pci_bus = PCI_HOST_BRIDGE(sabre)->bus;
|
|
|
|
pci_busA = pci_bridge_get_sec_bus(sabre->bridgeA);
|
|
|
|
pci_busB = pci_bridge_get_sec_bus(sabre->bridgeB);
|
2005-07-23 16:27:54 +02:00
|
|
|
|
2018-01-21 09:59:45 +01:00
|
|
|
/* Only in-built Simba APBs can exist on the root bus, slot 0 on busA is
|
2017-06-11 11:12:08 +02:00
|
|
|
reserved (leaving no slots free after on-board devices) however slots
|
|
|
|
0-3 are free on busB */
|
|
|
|
pci_bus->slot_reserved_mask = 0xfffffffc;
|
|
|
|
pci_busA->slot_reserved_mask = 0xfffffff1;
|
|
|
|
pci_busB->slot_reserved_mask = 0xfffffff0;
|
|
|
|
|
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
|
|
|
ebus = pci_new_multifunction(PCI_DEVFN(1, 0), true, TYPE_EBUS);
|
2017-12-21 08:32:57 +01:00
|
|
|
qdev_prop_set_uint64(DEVICE(ebus), "console-serial-base",
|
|
|
|
hwdef->console_serial_base);
|
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(ebus, pci_busA, &error_fatal);
|
2017-06-11 11:12:08 +02:00
|
|
|
|
2018-01-21 09:59:45 +01:00
|
|
|
/* Wire up "well-known" ISA IRQs to PBM legacy obio IRQs */
|
2017-12-21 08:32:57 +01:00
|
|
|
qdev_connect_gpio_out_named(DEVICE(ebus), "isa-irq", 7,
|
2018-01-21 09:59:45 +01:00
|
|
|
qdev_get_gpio_in_named(DEVICE(sabre), "pbm-irq", OBIO_LPT_IRQ));
|
2017-12-21 08:32:57 +01:00
|
|
|
qdev_connect_gpio_out_named(DEVICE(ebus), "isa-irq", 6,
|
2018-01-21 09:59:45 +01:00
|
|
|
qdev_get_gpio_in_named(DEVICE(sabre), "pbm-irq", OBIO_FDD_IRQ));
|
2017-12-21 08:32:57 +01:00
|
|
|
qdev_connect_gpio_out_named(DEVICE(ebus), "isa-irq", 1,
|
2018-01-21 09:59:45 +01:00
|
|
|
qdev_get_gpio_in_named(DEVICE(sabre), "pbm-irq", OBIO_KBD_IRQ));
|
2017-12-21 08:32:57 +01:00
|
|
|
qdev_connect_gpio_out_named(DEVICE(ebus), "isa-irq", 12,
|
2018-01-21 09:59:45 +01:00
|
|
|
qdev_get_gpio_in_named(DEVICE(sabre), "pbm-irq", OBIO_MSE_IRQ));
|
2017-12-21 08:32:57 +01:00
|
|
|
qdev_connect_gpio_out_named(DEVICE(ebus), "isa-irq", 4,
|
2018-01-21 09:59:45 +01:00
|
|
|
qdev_get_gpio_in_named(DEVICE(sabre), "pbm-irq", OBIO_SER_IRQ));
|
2017-12-21 08:32:57 +01:00
|
|
|
|
2018-12-16 22:52:10 +01:00
|
|
|
switch (vga_interface_type) {
|
|
|
|
case VGA_STD:
|
|
|
|
pci_create_simple(pci_busA, PCI_DEVFN(2, 0), "VGA");
|
|
|
|
break;
|
|
|
|
case VGA_NONE:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
abort(); /* Should not happen - types are checked in vl.c already */
|
|
|
|
}
|
2017-06-11 11:12:08 +02:00
|
|
|
|
|
|
|
memset(&macaddr, 0, sizeof(MACAddr));
|
|
|
|
onboard_nic = false;
|
2017-09-08 15:31:21 +02:00
|
|
|
for (i = 0; i < nb_nics; i++) {
|
2020-06-10 07:32:05 +02:00
|
|
|
PCIBus *bus;
|
2017-09-08 15:31:21 +02:00
|
|
|
nd = &nd_table[i];
|
|
|
|
|
2017-06-11 11:12:08 +02:00
|
|
|
if (!nd->model || strcmp(nd->model, "sunhme") == 0) {
|
|
|
|
if (!onboard_nic) {
|
2020-06-10 07:32:05 +02:00
|
|
|
pci_dev = pci_new_multifunction(PCI_DEVFN(1, 1),
|
2017-06-11 11:12:08 +02:00
|
|
|
true, "sunhme");
|
2020-06-10 07:32:05 +02:00
|
|
|
bus = pci_busA;
|
2017-06-11 11:12:08 +02:00
|
|
|
memcpy(&macaddr, &nd->macaddr.a, sizeof(MACAddr));
|
|
|
|
onboard_nic = true;
|
|
|
|
} else {
|
2020-06-10 07:32:05 +02:00
|
|
|
pci_dev = pci_new(-1, "sunhme");
|
|
|
|
bus = pci_busB;
|
2017-06-11 11:12:08 +02:00
|
|
|
}
|
2017-09-08 15:31:21 +02:00
|
|
|
} else {
|
2020-06-10 07:32:05 +02:00
|
|
|
pci_dev = pci_new(-1, nd->model);
|
|
|
|
bus = pci_busB;
|
2017-09-08 15:31:21 +02:00
|
|
|
}
|
2017-06-11 11:12:08 +02:00
|
|
|
|
|
|
|
dev = &pci_dev->qdev;
|
|
|
|
qdev_set_nic_properties(dev, nd);
|
2020-06-10 07:32:05 +02:00
|
|
|
pci_realize_and_unref(pci_dev, bus, &error_fatal);
|
2017-06-11 11:12:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* If we don't have an onboard NIC, grab a default MAC address so that
|
|
|
|
* we have a valid machine id */
|
|
|
|
if (!onboard_nic) {
|
|
|
|
qemu_macaddr_default_if_unset(&macaddr);
|
2017-09-08 15:31:21 +02:00
|
|
|
}
|
2005-07-23 16:27:54 +02:00
|
|
|
|
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_dev = pci_new(PCI_DEVFN(3, 0), "cmd646-ide");
|
2017-06-11 11:12:08 +02:00
|
|
|
qdev_prop_set_uint32(&pci_dev->qdev, "secondary", 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(pci_dev, pci_busA, &error_fatal);
|
2020-03-17 16:05:37 +01:00
|
|
|
pci_ide_create_devs(pci_dev);
|
2009-01-17 19:41:53 +01:00
|
|
|
|
2015-03-02 23:23:27 +01:00
|
|
|
/* Map NVRAM into I/O (ebus) space */
|
2020-10-16 20:27:37 +02:00
|
|
|
dev = qdev_new("sysbus-m48t59");
|
|
|
|
qdev_prop_set_int32(dev, "base-year", 1968);
|
|
|
|
s = SYS_BUS_DEVICE(dev);
|
|
|
|
sysbus_realize_and_unref(s, &error_fatal);
|
2017-09-04 19:41:01 +02:00
|
|
|
memory_region_add_subregion(pci_address_space_io(ebus), 0x2000,
|
2015-03-02 23:23:27 +01:00
|
|
|
sysbus_mmio_get_region(s, 0));
|
2020-10-16 20:27:37 +02:00
|
|
|
nvram = NVRAM(dev);
|
2015-03-02 23:23:27 +01:00
|
|
|
|
2009-07-21 12:49:47 +02:00
|
|
|
initrd_size = 0;
|
2012-05-12 19:20:52 +02:00
|
|
|
initrd_addr = 0;
|
2014-05-07 16:42:57 +02:00
|
|
|
kernel_size = sun4u_load_kernel(machine->kernel_filename,
|
|
|
|
machine->initrd_filename,
|
2012-05-12 19:20:52 +02:00
|
|
|
ram_size, &initrd_size, &initrd_addr,
|
|
|
|
&kernel_addr, &kernel_entry);
|
2009-07-21 12:49:47 +02:00
|
|
|
|
2014-05-07 16:42:57 +02:00
|
|
|
sun4u_NVRAM_set_params(nvram, NVRAM_SIZE, "Sun4u", machine->ram_size,
|
|
|
|
machine->boot_order,
|
2012-05-12 19:20:52 +02:00
|
|
|
kernel_addr, kernel_size,
|
2014-05-07 16:42:57 +02:00
|
|
|
machine->kernel_cmdline,
|
2012-05-12 19:20:52 +02:00
|
|
|
initrd_addr, initrd_size,
|
2008-07-15 16:54:01 +02:00
|
|
|
/* XXX: need an option to load a NVRAM image */
|
|
|
|
0,
|
|
|
|
graphic_width, graphic_height, graphic_depth,
|
2017-06-11 11:12:08 +02:00
|
|
|
(uint8_t *)&macaddr);
|
2005-07-23 16:27:54 +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_IO);
|
2017-09-04 19:41:01 +02:00
|
|
|
qdev_prop_set_bit(dev, "dma_enabled", false);
|
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(OBJECT(ebus), TYPE_FW_CFG, 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(SYS_BUS_DEVICE(dev), &error_fatal);
|
2017-09-04 19:41:01 +02:00
|
|
|
memory_region_add_subregion(pci_address_space_io(ebus), BIOS_CFG_IOPORT,
|
2017-09-04 19:41:01 +02:00
|
|
|
&FW_CFG_IO(dev)->comb_iomem);
|
|
|
|
|
|
|
|
fw_cfg = FW_CFG(dev);
|
2019-05-18 22:54:27 +02:00
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, (uint16_t)machine->smp.cpus);
|
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, (uint16_t)machine->smp.max_cpus);
|
2008-09-18 20:33:18 +02:00
|
|
|
fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);
|
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_MACHINE_ID, hwdef->machine_id);
|
2012-05-12 19:20:52 +02:00
|
|
|
fw_cfg_add_i64(fw_cfg, FW_CFG_KERNEL_ADDR, kernel_entry);
|
|
|
|
fw_cfg_add_i64(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size);
|
2014-05-07 16:42:57 +02:00
|
|
|
if (machine->kernel_cmdline) {
|
2010-01-09 22:27:04 +01:00
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE,
|
2014-05-07 16:42:57 +02:00
|
|
|
strlen(machine->kernel_cmdline) + 1);
|
|
|
|
fw_cfg_add_string(fw_cfg, FW_CFG_CMDLINE_DATA, machine->kernel_cmdline);
|
2009-03-08 10:51:29 +01:00
|
|
|
} else {
|
2010-01-09 22:27:04 +01:00
|
|
|
fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE, 0);
|
2009-03-08 10:51:29 +01:00
|
|
|
}
|
2012-05-12 19:20:52 +02:00
|
|
|
fw_cfg_add_i64(fw_cfg, FW_CFG_INITRD_ADDR, initrd_addr);
|
|
|
|
fw_cfg_add_i64(fw_cfg, FW_CFG_INITRD_SIZE, initrd_size);
|
2014-05-07 16:42:57 +02:00
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_BOOT_DEVICE, machine->boot_order[0]);
|
2009-08-08 12:44:56 +02:00
|
|
|
|
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_SPARC64_WIDTH, graphic_width);
|
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_SPARC64_HEIGHT, graphic_height);
|
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_SPARC64_DEPTH, graphic_depth);
|
|
|
|
|
2009-03-08 10:51:29 +01:00
|
|
|
qemu_register_boot_set(fw_cfg_boot_set, fw_cfg);
|
2005-07-02 16:31:34 +02:00
|
|
|
}
|
|
|
|
|
2008-09-18 20:33:18 +02:00
|
|
|
enum {
|
|
|
|
sun4u_id = 0,
|
|
|
|
sun4v_id = 64,
|
|
|
|
};
|
|
|
|
|
2018-08-29 18:33:45 +02:00
|
|
|
/*
|
|
|
|
* Implementation of an interface to adjust firmware path
|
|
|
|
* for the bootindex property handling.
|
|
|
|
*/
|
|
|
|
static char *sun4u_fw_dev_path(FWPathProvider *p, BusState *bus,
|
|
|
|
DeviceState *dev)
|
|
|
|
{
|
|
|
|
PCIDevice *pci;
|
|
|
|
IDEBus *ide_bus;
|
|
|
|
IDEState *ide_s;
|
|
|
|
int bus_id;
|
|
|
|
|
|
|
|
if (!strcmp(object_get_typename(OBJECT(dev)), "pbm-bridge")) {
|
|
|
|
pci = PCI_DEVICE(dev);
|
|
|
|
|
|
|
|
if (PCI_FUNC(pci->devfn)) {
|
|
|
|
return g_strdup_printf("pci@%x,%x", PCI_SLOT(pci->devfn),
|
|
|
|
PCI_FUNC(pci->devfn));
|
|
|
|
} else {
|
|
|
|
return g_strdup_printf("pci@%x", PCI_SLOT(pci->devfn));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
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);
|
|
|
|
bus_id = ide_bus->bus_id;
|
|
|
|
|
|
|
|
if (ide_s->drive_kind == IDE_CD) {
|
|
|
|
return g_strdup_printf("ide@%x/cdrom", bus_id);
|
|
|
|
}
|
|
|
|
|
|
|
|
return g_strdup_printf("ide@%x/disk", bus_id);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(object_get_typename(OBJECT(dev)), "ide-hd")) {
|
|
|
|
return g_strdup("disk");
|
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2008-07-22 09:07:34 +02:00
|
|
|
static const struct hwdef hwdefs[] = {
|
|
|
|
/* Sun4u generic PC-like machine */
|
|
|
|
{
|
2008-09-18 20:33:18 +02:00
|
|
|
.machine_id = sun4u_id,
|
2008-09-26 21:48:58 +02:00
|
|
|
.prom_addr = 0x1fff0000000ULL,
|
|
|
|
.console_serial_base = 0,
|
2008-07-22 09:07:34 +02:00
|
|
|
},
|
|
|
|
/* Sun4v generic PC-like machine */
|
|
|
|
{
|
2008-09-18 20:33:18 +02:00
|
|
|
.machine_id = sun4v_id,
|
2008-09-26 21:48:58 +02:00
|
|
|
.prom_addr = 0x1fff0000000ULL,
|
|
|
|
.console_serial_base = 0,
|
|
|
|
},
|
2008-07-22 09:07:34 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
/* Sun4u hardware initialisation */
|
2014-05-07 16:42:57 +02:00
|
|
|
static void sun4u_init(MachineState *machine)
|
2012-10-15 22:22:02 +02:00
|
|
|
{
|
2014-05-07 16:42:57 +02:00
|
|
|
sun4uv_init(get_system_memory(), machine, &hwdefs[0]);
|
2008-07-22 09:07:34 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Sun4v hardware initialisation */
|
2014-05-07 16:42:57 +02:00
|
|
|
static void sun4v_init(MachineState *machine)
|
2012-10-15 22:22:02 +02:00
|
|
|
{
|
2014-05-07 16:42:57 +02:00
|
|
|
sun4uv_init(get_system_memory(), machine, &hwdefs[1]);
|
2008-07-22 09:07:34 +02:00
|
|
|
}
|
|
|
|
|
2015-09-19 10:49:44 +02:00
|
|
|
static void sun4u_class_init(ObjectClass *oc, void *data)
|
2015-09-04 20:37:08 +02:00
|
|
|
{
|
2015-09-19 10:49:44 +02:00
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
2018-08-29 18:33:45 +02:00
|
|
|
FWPathProviderClass *fwc = FW_PATH_PROVIDER_CLASS(oc);
|
2015-09-19 10:49:44 +02:00
|
|
|
|
2015-09-04 20:37:08 +02:00
|
|
|
mc->desc = "Sun4u platform";
|
|
|
|
mc->init = sun4u_init;
|
2017-02-15 11:05:40 +01:00
|
|
|
mc->block_default_type = IF_IDE;
|
2015-09-04 20:37:08 +02:00
|
|
|
mc->max_cpus = 1; /* XXX for now */
|
2020-02-07 17:19:47 +01:00
|
|
|
mc->is_default = true;
|
2015-09-04 20:37:08 +02:00
|
|
|
mc->default_boot_order = "c";
|
2017-10-05 15:51:06 +02:00
|
|
|
mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-UltraSparc-IIi");
|
2018-08-29 18:33:45 +02:00
|
|
|
mc->ignore_boot_device_suffixes = true;
|
2019-02-13 08:07:19 +01:00
|
|
|
mc->default_display = "std";
|
2018-08-29 18:33:45 +02:00
|
|
|
fwc->get_dev_path = sun4u_fw_dev_path;
|
2015-09-04 20:37:08 +02:00
|
|
|
}
|
2008-07-22 09:07:34 +02:00
|
|
|
|
2015-09-19 10:49:44 +02:00
|
|
|
static const TypeInfo sun4u_type = {
|
|
|
|
.name = MACHINE_TYPE_NAME("sun4u"),
|
|
|
|
.parent = TYPE_MACHINE,
|
|
|
|
.class_init = sun4u_class_init,
|
2018-08-29 18:33:45 +02:00
|
|
|
.interfaces = (InterfaceInfo[]) {
|
|
|
|
{ TYPE_FW_PATH_PROVIDER },
|
|
|
|
{ }
|
|
|
|
},
|
2015-09-19 10:49:44 +02:00
|
|
|
};
|
2008-09-26 21:48:58 +02:00
|
|
|
|
2015-09-19 10:49:44 +02:00
|
|
|
static void sun4v_class_init(ObjectClass *oc, void *data)
|
2015-09-04 20:37:08 +02:00
|
|
|
{
|
2015-09-19 10:49:44 +02:00
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
|
2015-09-04 20:37:08 +02:00
|
|
|
mc->desc = "Sun4v platform";
|
|
|
|
mc->init = sun4v_init;
|
2017-02-15 11:05:40 +01:00
|
|
|
mc->block_default_type = IF_IDE;
|
2015-09-04 20:37:08 +02:00
|
|
|
mc->max_cpus = 1; /* XXX for now */
|
|
|
|
mc->default_boot_order = "c";
|
2017-10-05 15:51:06 +02:00
|
|
|
mc->default_cpu_type = SPARC_CPU_TYPE_NAME("Sun-UltraSparc-T1");
|
2019-02-13 08:07:19 +01:00
|
|
|
mc->default_display = "std";
|
2015-09-04 20:37:08 +02:00
|
|
|
}
|
|
|
|
|
2015-09-19 10:49:44 +02:00
|
|
|
static const TypeInfo sun4v_type = {
|
|
|
|
.name = MACHINE_TYPE_NAME("sun4v"),
|
|
|
|
.parent = TYPE_MACHINE,
|
|
|
|
.class_init = sun4v_class_init,
|
|
|
|
};
|
2015-09-04 20:37:08 +02:00
|
|
|
|
2012-02-09 15:20:55 +01:00
|
|
|
static void sun4u_register_types(void)
|
|
|
|
{
|
2018-01-24 20:19:58 +01:00
|
|
|
type_register_static(&power_info);
|
2012-02-09 15:20:55 +01:00
|
|
|
type_register_static(&ebus_info);
|
|
|
|
type_register_static(&prom_info);
|
|
|
|
type_register_static(&ram_info);
|
|
|
|
|
2015-09-19 10:49:44 +02:00
|
|
|
type_register_static(&sun4u_type);
|
|
|
|
type_register_static(&sun4v_type);
|
|
|
|
}
|
|
|
|
|
2012-02-09 15:20:55 +01:00
|
|
|
type_init(sun4u_register_types)
|