david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jliu/or32' into staging

Browse Source 
# By Jia Liu
# Via Jia Liu
* jliu/or32:
  target-openrisc: Free typename in openrisc_cpu_class_by_name
  hw/openrisc: Use stderr output instead of qemu_log
  hw/openrisc: Indent typo

Message-id: 1374576458-22808-1-git-send-email-proljc@gmail.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2013-07-26 13:04:07 -05:00
commit b142d79328
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/openrisc/openrisc_sim.c
View File

@ -82,7 +82,7 @@ static void cpu_openrisc_load_kernel(ram_addr_t ram_size,
} }
if (kernel_size < 0) { if (kernel_size < 0) {
qemu_log("QEMU: couldn't load the kernel '%s'\n", fprintf(stderr, "QEMU: couldn't load the kernel '%s'\n",
kernel_filename); kernel_filename);
exit(1); exit(1);
} }
@ -96,7 +96,7 @@ static void openrisc_sim_init(QEMUMachineInitArgs *args)
ram_addr_t ram_size = args->ram_size; ram_addr_t ram_size = args->ram_size;
const char *cpu_model = args->cpu_model; const char *cpu_model = args->cpu_model;
const char *kernel_filename = args->kernel_filename; const char *kernel_filename = args->kernel_filename;
OpenRISCCPU *cpu = NULL; OpenRISCCPU *cpu = NULL;
MemoryRegion *ram; MemoryRegion *ram;
int n; int n;
@ -107,7 +107,7 @@ static void openrisc_sim_init(QEMUMachineInitArgs *args)
for (n = 0; n < smp_cpus; n++) { for (n = 0; n < smp_cpus; n++) {
cpu = cpu_openrisc_init(cpu_model); cpu = cpu_openrisc_init(cpu_model);
if (cpu == NULL) { if (cpu == NULL) {
qemu_log("Unable to find CPU definition!\n"); fprintf(stderr, "Unable to find CPU definition!\n");
exit(1); exit(1);
} }
qemu_register_reset(main_cpu_reset, cpu); qemu_register_reset(main_cpu_reset, cpu);

1
target-openrisc/cpu.c
View File

@ -106,6 +106,7 @@ static ObjectClass *openrisc_cpu_class_by_name(const char *cpu_model)
typename = g_strdup_printf("%s-" TYPE_OPENRISC_CPU, cpu_model); typename = g_strdup_printf("%s-" TYPE_OPENRISC_CPU, cpu_model);
oc = object_class_by_name(typename); oc = object_class_by_name(typename);
g_free(typename);
if (oc != NULL && (!object_class_dynamic_cast(oc, TYPE_OPENRISC_CPU) || if (oc != NULL && (!object_class_dynamic_cast(oc, TYPE_OPENRISC_CPU) ||
object_class_is_abstract(oc))) { object_class_is_abstract(oc))) {
return NULL; return NULL;