Almost every user of cpu_generic_init() checks for returned NULL and then reports failure in a custom way and aborts process. Some users assume that call can't fail and don't check for failure, though they should have checked for it. In either cases cpu_generic_init() failure is fatal, so instead of checking for failure and reporting it various ways, make cpu_generic_init() report errors in consistent way and terminate QEMU on failure. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <1505318697-77161-3-git-send-email-imammedo@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
95 lines
3.2 KiB
C
95 lines
3.2 KiB
C
/*
|
|
* SHIX 2.0 board description
|
|
*
|
|
* Copyright (c) 2005 Samuel Tardieu
|
|
*
|
|
* 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.
|
|
*/
|
|
/*
|
|
Shix 2.0 board by Alexis Polti, described at
|
|
https://web.archive.org/web/20070917001736/perso.enst.fr/~polti/realisations/shix20
|
|
|
|
More information in target/sh4/README.sh4
|
|
*/
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu-common.h"
|
|
#include "cpu.h"
|
|
#include "hw/hw.h"
|
|
#include "hw/sh4/sh.h"
|
|
#include "sysemu/sysemu.h"
|
|
#include "sysemu/qtest.h"
|
|
#include "hw/boards.h"
|
|
#include "hw/loader.h"
|
|
#include "exec/address-spaces.h"
|
|
#include "qemu/error-report.h"
|
|
|
|
#define BIOS_FILENAME "shix_bios.bin"
|
|
#define BIOS_ADDRESS 0xA0000000
|
|
|
|
static void shix_init(MachineState *machine)
|
|
{
|
|
const char *cpu_model = machine->cpu_model;
|
|
int ret;
|
|
SuperHCPU *cpu;
|
|
struct SH7750State *s;
|
|
MemoryRegion *sysmem = get_system_memory();
|
|
MemoryRegion *rom = g_new(MemoryRegion, 1);
|
|
MemoryRegion *sdram = g_new(MemoryRegion, 2);
|
|
|
|
if (!cpu_model)
|
|
cpu_model = "any";
|
|
|
|
cpu = SUPERH_CPU(cpu_generic_init(TYPE_SUPERH_CPU, cpu_model));
|
|
|
|
/* Allocate memory space */
|
|
memory_region_init_ram(rom, NULL, "shix.rom", 0x4000, &error_fatal);
|
|
memory_region_set_readonly(rom, true);
|
|
memory_region_add_subregion(sysmem, 0x00000000, rom);
|
|
memory_region_init_ram(&sdram[0], NULL, "shix.sdram1", 0x01000000,
|
|
&error_fatal);
|
|
memory_region_add_subregion(sysmem, 0x08000000, &sdram[0]);
|
|
memory_region_init_ram(&sdram[1], NULL, "shix.sdram2", 0x01000000,
|
|
&error_fatal);
|
|
memory_region_add_subregion(sysmem, 0x0c000000, &sdram[1]);
|
|
|
|
/* Load BIOS in 0 (and access it through P2, 0xA0000000) */
|
|
if (bios_name == NULL)
|
|
bios_name = BIOS_FILENAME;
|
|
ret = load_image_targphys(bios_name, 0, 0x4000);
|
|
if (ret < 0 && !qtest_enabled()) {
|
|
error_report("Could not load SHIX bios '%s'", bios_name);
|
|
exit(1);
|
|
}
|
|
|
|
/* Register peripherals */
|
|
s = sh7750_init(cpu, sysmem);
|
|
/* XXXXX Check success */
|
|
tc58128_init(s, "shix_linux_nand.bin", NULL);
|
|
}
|
|
|
|
static void shix_machine_init(MachineClass *mc)
|
|
{
|
|
mc->desc = "shix card";
|
|
mc->init = shix_init;
|
|
mc->is_default = 1;
|
|
}
|
|
|
|
DEFINE_MACHINE("shix", shix_machine_init)
|