summary refs log tree commit diff stats
path: root/hw/etraxfs_pic.c
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-02-05 22:06:05 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-02-05 22:06:05 +0000
commit487414f1cbd638beb0227c7da71fe7b8a821e155 (patch)
treebb751c10d2d6953ea16cd8e192e0ee99a7d2ad7f /hw/etraxfs_pic.c
parent090f1fa3237cbbc2338d29fe7ddb7d35396cddbb (diff)
downloadfocaccia-qemu-487414f1cbd638beb0227c7da71fe7b8a821e155.tar.gz
focaccia-qemu-487414f1cbd638beb0227c7da71fe7b8a821e155.zip
hw: 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@6529 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/etraxfs_pic.c')
-rw-r--r--hw/etraxfs_pic.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/hw/etraxfs_pic.c b/hw/etraxfs_pic.c
index 6d4e55ab0e..7aa0568700 100644
--- a/hw/etraxfs_pic.c
+++ b/hw/etraxfs_pic.c
@@ -192,8 +192,6 @@ struct etraxfs_pic *etraxfs_pic_init(CPUState *env, target_phys_addr_t base)
 
 	pic = qemu_mallocz(sizeof *pic);
 	pic->internal = fs = qemu_mallocz(sizeof *fs);
-	if (!fs || !pic)
-		goto err;
 
 	fs->env = env;
 	pic->irq = qemu_allocate_irqs(irq_handler, fs, 30);
@@ -204,8 +202,4 @@ struct etraxfs_pic *etraxfs_pic_init(CPUState *env, target_phys_addr_t base)
 	cpu_register_physical_memory(base, 0x14, intr_vect_regs);
 
 	return pic;
-  err:
-	free(pic);
-	free(fs);
-	return NULL;
 }