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>
118 lines
4 KiB
C
118 lines
4 KiB
C
/*
|
|
* Copyright (c) 2011, Max Filippov, Open Source and Linux Lab.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* * Neither the name of the Open Source and Linux Lab nor the
|
|
* names of its contributors may be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
|
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "sysemu/sysemu.h"
|
|
#include "hw/boards.h"
|
|
#include "hw/loader.h"
|
|
#include "elf.h"
|
|
#include "exec/memory.h"
|
|
#include "exec/address-spaces.h"
|
|
#include "qemu/error-report.h"
|
|
|
|
static uint64_t translate_phys_addr(void *opaque, uint64_t addr)
|
|
{
|
|
XtensaCPU *cpu = opaque;
|
|
|
|
return cpu_get_phys_page_debug(CPU(cpu), addr);
|
|
}
|
|
|
|
static void sim_reset(void *opaque)
|
|
{
|
|
XtensaCPU *cpu = opaque;
|
|
|
|
cpu_reset(CPU(cpu));
|
|
}
|
|
|
|
static void xtensa_sim_init(MachineState *machine)
|
|
{
|
|
XtensaCPU *cpu = NULL;
|
|
CPUXtensaState *env = NULL;
|
|
MemoryRegion *ram, *rom;
|
|
ram_addr_t ram_size = machine->ram_size;
|
|
const char *cpu_model = machine->cpu_model;
|
|
const char *kernel_filename = machine->kernel_filename;
|
|
int n;
|
|
|
|
if (!cpu_model) {
|
|
cpu_model = XTENSA_DEFAULT_CPU_MODEL;
|
|
}
|
|
|
|
for (n = 0; n < smp_cpus; n++) {
|
|
cpu = cpu_xtensa_init(cpu_model);
|
|
if (cpu == NULL) {
|
|
error_report("unable to find CPU definition '%s'",
|
|
cpu_model);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
env = &cpu->env;
|
|
|
|
env->sregs[PRID] = n;
|
|
qemu_register_reset(sim_reset, cpu);
|
|
/* Need MMU initialized prior to ELF loading,
|
|
* so that ELF gets loaded into virtual addresses
|
|
*/
|
|
sim_reset(cpu);
|
|
}
|
|
|
|
ram = g_malloc(sizeof(*ram));
|
|
memory_region_init_ram(ram, NULL, "xtensa.sram", ram_size, &error_fatal);
|
|
vmstate_register_ram_global(ram);
|
|
memory_region_add_subregion(get_system_memory(), 0, ram);
|
|
|
|
rom = g_malloc(sizeof(*rom));
|
|
memory_region_init_ram(rom, NULL, "xtensa.rom", 0x1000, &error_fatal);
|
|
vmstate_register_ram_global(rom);
|
|
memory_region_add_subregion(get_system_memory(), 0xfe000000, rom);
|
|
|
|
if (kernel_filename) {
|
|
uint64_t elf_entry;
|
|
uint64_t elf_lowaddr;
|
|
#ifdef TARGET_WORDS_BIGENDIAN
|
|
int success = load_elf(kernel_filename, translate_phys_addr, cpu,
|
|
&elf_entry, &elf_lowaddr, NULL, 1, EM_XTENSA, 0, 0);
|
|
#else
|
|
int success = load_elf(kernel_filename, translate_phys_addr, cpu,
|
|
&elf_entry, &elf_lowaddr, NULL, 0, EM_XTENSA, 0, 0);
|
|
#endif
|
|
if (success > 0) {
|
|
env->pc = elf_entry;
|
|
}
|
|
}
|
|
}
|
|
|
|
static void xtensa_sim_machine_init(MachineClass *mc)
|
|
{
|
|
mc->desc = "sim machine (" XTENSA_DEFAULT_CPU_MODEL ")";
|
|
mc->is_default = true;
|
|
mc->init = xtensa_sim_init;
|
|
mc->max_cpus = 4;
|
|
}
|
|
|
|
DEFINE_MACHINE("sim", xtensa_sim_machine_init)
|