lazymio/unicorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

handle some errors properly so avoid exit() during initialization. this fixes issue #237

Browse Source
This commit is contained in:
Nguyen Anh Quynh
2015-11-12 01:43:41 +08:00
parent 116d96692d
commit 2f297bdd3a
38 changed files with 203 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qemu/hw/arm/tosa.c
View File

@@ -17,10 +17,12 @@
#include "exec/address-spaces.h"
static void tosa_init(struct uc_struct *uc, MachineState *machine)
static int tosa_init(struct uc_struct *uc, MachineState *machine)
{
//cpu_arm_init(uc, "pxa255");
cpu_arm_init(uc, "cortex-a15"); // FIXME
return 0;
}
void tosa_machine_init(struct uc_struct *uc)

6
qemu/hw/arm/virt.c
View File

@@ -36,7 +36,7 @@
#include "exec/address-spaces.h"
static void machvirt_init(struct uc_struct *uc, MachineState *machine)
static int machvirt_init(struct uc_struct *uc, MachineState *machine)
{
const char *cpu_model = machine->cpu_model;
int n;
@@ -51,12 +51,14 @@ static void machvirt_init(struct uc_struct *uc, MachineState *machine)
if (!oc) {
fprintf(stderr, "Unable to find CPU definition\n");
exit(1);
return -1;
}
cpuobj = object_new(uc, object_class_get_name(oc));
object_property_set_bool(uc, cpuobj, true, "realized", NULL);
}
return 0;
}
void machvirt_machine_init(struct uc_struct *uc)