2278b93941
With all targets defining CPU_RESOLVING_TYPE, refactor cpu_parse_cpu_model(type, cpu_model) to parse_cpu_model(cpu_model) so that callers won't have to know internal resolving cpu type. Place it in exec.c so it could be called from both target independed vl.c and *-user/main.c. That allows us to stop abusing cpu type from MachineClass::default_cpu_type as resolver class in vl.c which were confusing part of cpu_parse_cpu_model(). Also with new parse_cpu_model(), the last users of cpu_init() in null-machine.c and bsd/linux-user targets could be switched to cpu_create() API and cpu_init() API will be removed by follow up patch. With no longer users left remove MachineState::cpu_model field, new code should use MachineState::cpu_type instead and leave cpu_model parsing to generic code in vl.c. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <1518000027-274608-5-git-send-email-imammedo@redhat.com> [ehabkost: Fix bsd-user build error] Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
60 lines
1.4 KiB
C
60 lines
1.4 KiB
C
/*
|
|
* Empty machine
|
|
*
|
|
* Copyright IBM, Corp. 2012
|
|
*
|
|
* Authors:
|
|
* Anthony Liguori <aliguori@us.ibm.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qemu-common.h"
|
|
#include "qemu/error-report.h"
|
|
#include "hw/hw.h"
|
|
#include "hw/boards.h"
|
|
#include "sysemu/sysemu.h"
|
|
#include "exec/address-spaces.h"
|
|
#include "cpu.h"
|
|
|
|
static void machine_none_init(MachineState *mch)
|
|
{
|
|
CPUState *cpu = NULL;
|
|
|
|
/* Initialize CPU (if user asked for it) */
|
|
if (mch->cpu_type) {
|
|
cpu = cpu_create(mch->cpu_type);
|
|
if (!cpu) {
|
|
error_report("Unable to initialize CPU");
|
|
exit(1);
|
|
}
|
|
}
|
|
|
|
/* RAM at address zero */
|
|
if (mch->ram_size) {
|
|
MemoryRegion *ram = g_new(MemoryRegion, 1);
|
|
|
|
memory_region_allocate_system_memory(ram, NULL, "ram", mch->ram_size);
|
|
memory_region_add_subregion(get_system_memory(), 0, ram);
|
|
}
|
|
|
|
if (mch->kernel_filename) {
|
|
error_report("The -kernel parameter is not supported "
|
|
"(use the generic 'loader' device instead).");
|
|
exit(1);
|
|
}
|
|
}
|
|
|
|
static void machine_none_machine_init(MachineClass *mc)
|
|
{
|
|
mc->desc = "empty machine";
|
|
mc->init = machine_none_init;
|
|
mc->max_cpus = 1;
|
|
mc->default_ram_size = 0;
|
|
}
|
|
|
|
DEFINE_MACHINE("none", machine_none_machine_init)
|