It's pretty safe to not even bother checking for NULL when
using malloc and friends, but if we do check, then fail
hard.

Signed-off-by: Andrew Jones <drjo...@redhat.com>
---
 lib/virtio-mmio.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/virtio-mmio.c b/lib/virtio-mmio.c
index 043832299174e..1b6f0cc378b79 100644
--- a/lib/virtio-mmio.c
+++ b/lib/virtio-mmio.c
@@ -54,8 +54,7 @@ static struct virtqueue *vm_setup_vq(struct virtio_device 
*vdev,
 
        vq = calloc(1, sizeof(*vq));
        queue = memalign(PAGE_SIZE, VIRTIO_MMIO_QUEUE_SIZE_MIN);
-       if (!vq || !queue)
-               return NULL;
+       assert(vq && queue);
 
        writel(index, vm_dev->base + VIRTIO_MMIO_QUEUE_SEL);
 
@@ -161,9 +160,7 @@ static struct virtio_device *virtio_mmio_dt_bind(u32 devid)
        if (node == -FDT_ERR_NOTFOUND)
                return NULL;
 
-       vm_dev = calloc(1, sizeof(*vm_dev));
-       if (!vm_dev)
-               return NULL;
+       assert((vm_dev = calloc(1, sizeof(*vm_dev))) != NULL);
 
        vm_dev->base = info.base;
        vm_device_init(vm_dev);
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to