aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-02-05 22:06:11 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-02-05 22:06:11 +0000
commit0d0266a53b4c80ab08c093c36bb3a7bbb29cc3e5 (patch)
tree1ef47f454110978692b280d7a54c737c3eab4943
parent487414f1cbd638beb0227c7da71fe7b8a821e155 (diff)
targets: remove error handling from qemu_malloc() callers (Avi Kivity)
Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6530 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--target-alpha/translate.c2
-rw-r--r--target-arm/helper.c4
-rw-r--r--target-cris/translate.c2
-rw-r--r--target-i386/helper.c2
-rw-r--r--target-i386/kvm.c2
-rw-r--r--target-m68k/helper.c2
-rw-r--r--target-mips/translate.c2
-rw-r--r--target-ppc/helper.c2
-rw-r--r--target-ppc/kvm_ppc.c4
-rw-r--r--target-ppc/translate_init.c2
-rw-r--r--target-sh4/translate.c2
-rw-r--r--target-sparc/helper.c2
12 files changed, 0 insertions, 28 deletions
diff --git a/target-alpha/translate.c b/target-alpha/translate.c
index 3affb21983..e27376d75e 100644
--- a/target-alpha/translate.c
+++ b/target-alpha/translate.c
@@ -2466,8 +2466,6 @@ CPUAlphaState * cpu_alpha_init (const char *cpu_model)
uint64_t hwpcb;
env = qemu_mallocz(sizeof(CPUAlphaState));
- if (!env)
- return NULL;
cpu_exec_init(env);
alpha_translate_init();
tlb_flush(env, 1);
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 26fd6d017a..3250fb8c1f 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -248,8 +248,6 @@ CPUARMState *cpu_arm_init(const char *cpu_model)
if (id == 0)
return NULL;
env = qemu_mallocz(sizeof(CPUARMState));
- if (!env)
- return NULL;
cpu_exec_init(env);
if (!inited) {
inited = 1;
@@ -468,8 +466,6 @@ int cpu_arm_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
static void allocate_mmon_state(CPUState *env)
{
env->mmon_entry = malloc(sizeof (mmon_state));
- if (!env->mmon_entry)
- abort();
memset (env->mmon_entry, 0, sizeof (mmon_state));
env->mmon_entry->cpu_env = env;
mmon_head = env->mmon_entry;
diff --git a/target-cris/translate.c b/target-cris/translate.c
index 288262d7b5..f575e63c66 100644
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -3400,8 +3400,6 @@ CPUCRISState *cpu_cris_init (const char *cpu_model)
int i;
env = qemu_mallocz(sizeof(CPUCRISState));
- if (!env)
- return NULL;
cpu_exec_init(env);
cpu_reset(env);
diff --git a/target-i386/helper.c b/target-i386/helper.c
index e55de96627..5950c976cc 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -1645,8 +1645,6 @@ CPUX86State *cpu_x86_init(const char *cpu_model)
static int inited;
env = qemu_mallocz(sizeof(CPUX86State));
- if (!env)
- return NULL;
cpu_exec_init(env);
env->cpu_model_str = cpu_model;
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 49766e2579..0834e62853 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -97,8 +97,6 @@ static int kvm_has_msr_star(CPUState *env)
kvm_msr_list = qemu_mallocz(sizeof(msr_list) +
msr_list.nmsrs * sizeof(msr_list.indices[0]));
- if (kvm_msr_list == NULL)
- return 0;
kvm_msr_list->nmsrs = msr_list.nmsrs;
ret = kvm_ioctl(env->kvm_state, KVM_GET_MSR_INDEX_LIST, kvm_msr_list);
diff --git a/target-m68k/helper.c b/target-m68k/helper.c
index 076ea353c8..7eb21ddd3d 100644
--- a/target-m68k/helper.c
+++ b/target-m68k/helper.c
@@ -166,8 +166,6 @@ CPUM68KState *cpu_m68k_init(const char *cpu_model)
static int inited;
env = qemu_mallocz(sizeof(CPUM68KState));
- if (!env)
- return NULL;
cpu_exec_init(env);
if (!inited) {
inited = 1;
diff --git a/target-mips/translate.c b/target-mips/translate.c
index b447b983f6..d659afb61a 100644
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -8476,8 +8476,6 @@ CPUMIPSState *cpu_mips_init (const char *cpu_model)
if (!def)
return NULL;
env = qemu_mallocz(sizeof(CPUMIPSState));
- if (!env)
- return NULL;
env->cpu_model = def;
cpu_exec_init(env);
diff --git a/target-ppc/helper.c b/target-ppc/helper.c
index 3bd1d45c8a..fc62a635f0 100644
--- a/target-ppc/helper.c
+++ b/target-ppc/helper.c
@@ -2761,8 +2761,6 @@ CPUPPCState *cpu_ppc_init (const char *cpu_model)
return NULL;
env = qemu_mallocz(sizeof(CPUPPCState));
- if (!env)
- return NULL;
cpu_exec_init(env);
ppc_translate_init();
env->cpu_model_str = cpu_model;
diff --git a/target-ppc/kvm_ppc.c b/target-ppc/kvm_ppc.c
index 82c0f42098..10cfdb3cf1 100644
--- a/target-ppc/kvm_ppc.c
+++ b/target-ppc/kvm_ppc.c
@@ -33,10 +33,6 @@ int kvmppc_read_host_property(const char *node_path, const char *prop,
pathlen = snprintf(NULL, 0, "%s/%s/%s", PROC_DEVTREE_PATH, node_path, prop)
+ 1;
path = qemu_malloc(pathlen);
- if (path == NULL) {
- ret = -ENOMEM;
- goto out;
- }
snprintf(path, pathlen, "%s/%s/%s", PROC_DEVTREE_PATH, node_path, prop);
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index 957047929a..c808923980 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -9040,8 +9040,6 @@ static int create_new_table (opc_handler_t **table, unsigned char idx)
opc_handler_t **tmp;
tmp = malloc(0x20 * sizeof(opc_handler_t));
- if (tmp == NULL)
- return -1;
fill_new_table(tmp, 0x20);
table[idx] = (opc_handler_t *)((unsigned long)tmp | PPC_INDIRECT);
diff --git a/target-sh4/translate.c b/target-sh4/translate.c
index 6c9dff591a..80ea851116 100644
--- a/target-sh4/translate.c
+++ b/target-sh4/translate.c
@@ -277,8 +277,6 @@ CPUSH4State *cpu_sh4_init(const char *cpu_model)
if (!def)
return NULL;
env = qemu_mallocz(sizeof(CPUSH4State));
- if (!env)
- return NULL;
env->features = def->features;
cpu_exec_init(env);
sh4_translate_init();
diff --git a/target-sparc/helper.c b/target-sparc/helper.c
index a275880851..1a06525764 100644
--- a/target-sparc/helper.c
+++ b/target-sparc/helper.c
@@ -713,8 +713,6 @@ CPUSPARCState *cpu_sparc_init(const char *cpu_model)
CPUSPARCState *env;
env = qemu_mallocz(sizeof(CPUSPARCState));
- if (!env)
- return NULL;
cpu_exec_init(env);
gen_intermediate_code_init(env);