Removed spurious print

[palacios.git] / palacios / src / devices / netdisk.c

diff --git a/palacios/src/devices/netdisk.c b/palacios/src/devices/netdisk.c
index 60f71ff..a4c4fc8 100644 (file)
--- a/palacios/src/devices/netdisk.c
+++ b/palacios/src/devices/netdisk.c
@@ -19,9 +19,9 @@
 
 #include <palacios/vmm.h>
 #include <palacios/vmm_dev_mgr.h>
-#include <palacios/vmm_socket.h>
+#include <interfaces/vmm_socket.h>
 
-#ifndef CONFIG_DEBUG_IDE
+#ifndef V3_CONFIG_DEBUG_IDE
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -210,12 +210,16 @@ static struct v3_dev_blk_ops blk_ops = {
 
 
 
-static int disk_free(struct vm_device * dev) {
+static int disk_free(struct disk_state * disk) {
+
+    v3_socket_close(disk->socket);
+
+    V3_Free(disk);
     return 0;
 }
 
 static struct v3_device_ops dev_ops = {
-    .free = disk_free,
+    .free = (int (*)(void *))disk_free,
 };
 
 
@@ -226,7 +230,7 @@ static int socket_init(struct disk_state * disk) {
 
     disk->socket = v3_create_tcp_socket(disk->vm);
 
-    PrintDebug("DISK socket: %d\n", disk->socket);
+    PrintDebug("DISK socket: %p\n", disk->socket);
     PrintDebug("Connecting to: %s:%d\n", v3_inet_ntoa(disk->ip_addr), disk->port);
 
     v3_connect_to_ip(disk->socket, v3_ntohl(disk->ip_addr), disk->port);