X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8237_dma.c;h=f13113864260a1d8cc4c8e98588c9e7adb6e216b;hb=2282a040e60b24d3fb7c48bb197c5bff6636df67;hp=40787a7d2b58618e3bcc689e508e794336c1895a;hpb=4bc3ee757b44d3e466fd89e348106c47fa5511ee;p=palacios.git

diff --git a/palacios/src/devices/8237_dma.c b/palacios/src/devices/8237_dma.c
index 40787a7..f131138 100644
--- a/palacios/src/devices/8237_dma.c
+++ b/palacios/src/devices/8237_dma.c
@@ -33,9 +33,8 @@ static int dma_init(struct vm_device * dev) {
 
 
 
-static struct vm_device_ops dev_ops = {
-    .init = dma_init,
-    .deinit = NULL,
+static struct v3_device_ops dev_ops = {
+    .free = NULL,
     .reset = NULL,
     .start = NULL,
     .stop = NULL,
@@ -45,9 +44,13 @@ struct vm_device * v3_create_dma() {
     struct dma_state * dma = NULL;
 
     dma = (struct dma_state *)V3_Malloc(sizeof(struct dma_state));
-    V3_ASSERT(dma != NULL);
+
+    if (!dma) {
+	PrintError(info->vm_info, info, "Cannot allocate\n");
+	return NULL;
+    }
 
     struct vm_device * dev = v3_create_device("DMA", &dev_ops, dma);
 
-    return dma;
+    return dev;
 }