summary refs log tree commit diff stats
path: root/hw/etraxfs_eth.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_eth.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_eth.c')
-rw-r--r--hw/etraxfs_eth.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/hw/etraxfs_eth.c b/hw/etraxfs_eth.c
index cce89178a5..13d19001f3 100644
--- a/hw/etraxfs_eth.c
+++ b/hw/etraxfs_eth.c
@@ -564,12 +564,8 @@ void *etraxfs_eth_init(NICInfo *nd, CPUState *env,
 	qemu_check_nic_model(nd, "fseth");
 
 	dma = qemu_mallocz(sizeof *dma * 2);
-	if (!dma)
-		return NULL;
 
 	eth = qemu_mallocz(sizeof *eth);
-	if (!eth)
-		goto err;
 
 	dma[0].client.push = eth_tx_push;
 	dma[0].client.opaque = eth;
@@ -595,8 +591,4 @@ void *etraxfs_eth_init(NICInfo *nd, CPUState *env,
 	eth->vc->link_status_changed = eth_set_link;
 
 	return dma;
-  err:
-	qemu_free(eth);
-	qemu_free(dma);
-	return NULL;
 }