X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fnetdisk.c;h=2c89937bee997babd2cb6cbeea12e1980b64ee8f;hb=d0652a946b5d7dcee13c9d445b103f37284059aa;hp=9a1509a3d7da6af4a04b759211fc8e503894b53f;hpb=ba178554a5f6714e5ceb7b77df462ac72de90b0c;p=palacios.git

diff --git a/palacios/src/devices/netdisk.c b/palacios/src/devices/netdisk.c
index 9a1509a..2c89937 100644
--- a/palacios/src/devices/netdisk.c
+++ b/palacios/src/devices/netdisk.c
@@ -21,7 +21,7 @@
 #include <palacios/vmm_dev_mgr.h>
 #include <interfaces/vmm_socket.h>
 
-#ifndef CONFIG_DEBUG_IDE
+#ifndef V3_CONFIG_DEBUG_IDE
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -276,6 +276,11 @@ static int socket_init(struct disk_state * disk) {
 static int disk_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct disk_state * disk = (struct disk_state *)V3_Malloc(sizeof(struct disk_state));
 
+    if (!disk) {
+	PrintError("Cannot allocate in init\n");
+	return -1;
+    }
+
     char * ip_str = v3_cfg_val(cfg, "IP");
     char * port_str = v3_cfg_val(cfg, "port");
     char * disk_tag = v3_cfg_val(cfg, "tag");