diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-02-05 22:06:05 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-02-05 22:06:05 +0000 |
| commit | 487414f1cbd638beb0227c7da71fe7b8a821e155 (patch) | |
| tree | bb751c10d2d6953ea16cd8e192e0ee99a7d2ad7f /hw/etraxfs_dma.c | |
| parent | 090f1fa3237cbbc2338d29fe7ddb7d35396cddbb (diff) | |
| download | qemu-487414f1cbd638beb0227c7da71fe7b8a821e155.zip qemu-487414f1cbd638beb0227c7da71fe7b8a821e155.tar.gz qemu-487414f1cbd638beb0227c7da71fe7b8a821e155.tar.bz2 | |
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_dma.c')
| -rw-r--r-- | hw/etraxfs_dma.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/hw/etraxfs_dma.c b/hw/etraxfs_dma.c index 513b5b8..4723637 100644 --- a/hw/etraxfs_dma.c +++ b/hw/etraxfs_dma.c @@ -756,22 +756,14 @@ void *etraxfs_dmac_init(CPUState *env, struct fs_dma_ctrl *ctrl = NULL; ctrl = qemu_mallocz(sizeof *ctrl); - if (!ctrl) - return NULL; ctrl->bh = qemu_bh_new(DMA_run, ctrl); ctrl->env = env; ctrl->nr_channels = nr_channels; ctrl->channels = qemu_mallocz(sizeof ctrl->channels[0] * nr_channels); - if (!ctrl->channels) - goto err; ctrl->map = cpu_register_io_memory(0, dma_read, dma_write, ctrl); cpu_register_physical_memory(base, nr_channels * 0x2000, ctrl->map); return ctrl; - err: - qemu_free(ctrl->channels); - qemu_free(ctrl); - return NULL; } |