Restructure of direct host network bridge.

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

diff --git a/palacios/src/devices/netdisk.c b/palacios/src/devices/netdisk.c
index 552de56..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
@@ -38,22 +38,24 @@
 struct disk_state {
     uint64_t capacity; // in bytes
 
-    int socket;
+    v3_sock_t socket;
 
     uint32_t ip_addr;
     uint16_t port;
 
+    struct v3_vm_info * vm;
+
     char disk_name[32];
 
 };
 
 
-static int send_all(int socket, char * buf, int length) {
+static int send_all(v3_sock_t socket, char * buf, int length) {
     int bytes_sent = 0;
     
     PrintDebug("Sending %d bytes\n", length - bytes_sent);
     while (bytes_sent < length) {
-       int tmp_bytes = V3_Send(socket, buf + bytes_sent, length - bytes_sent);
+       int tmp_bytes = v3_socket_send(socket, buf + bytes_sent, length - bytes_sent);
        PrintDebug("Sent %d bytes\n", tmp_bytes);
        
        if (tmp_bytes == 0) {
@@ -68,12 +70,12 @@ static int send_all(int socket, char * buf, int length) {
 }
 
 
-static int recv_all(int socket, char * buf, int length) {
+static int recv_all(v3_sock_t socket, char * buf, int length) {
     int bytes_read = 0;
     
     PrintDebug("Reading %d bytes\n", length - bytes_read);
     while (bytes_read < length) {
-       int tmp_bytes = V3_Recv(socket, buf + bytes_read, length - bytes_read);
+       int tmp_bytes = v3_socket_recv(socket, buf + bytes_read, length - bytes_read);
        PrintDebug("Received %d bytes\n", tmp_bytes);
        
        if (tmp_bytes == 0) {
@@ -132,7 +134,7 @@ static int read(uint8_t * buf, uint64_t lba, uint64_t num_bytes, void * private_
     }
 
     if (ret_len != length) {
-       PrintError("Read length mismatch (req=%d) (result=%d)\n", length, ret_len);
+       PrintError("Read length mismatch (req=%llu) (result=%u)\n", length, ret_len);
        return -1;
     }
 
@@ -208,15 +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,
-    .reset = NULL,
-    .start = NULL,
-    .stop = NULL,
+    .free = (int (*)(void *))disk_free,
 };
 
 
@@ -225,12 +228,12 @@ static int socket_init(struct disk_state * disk) {
     
     PrintDebug("Intializing Net Disk\n");
 
-    disk->socket = V3_Create_TCP_Socket();
+    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);
+    v3_connect_to_ip(disk->socket, v3_ntohl(disk->ip_addr), disk->port);
 
     PrintDebug("Connected to NBD server\n");
 
@@ -261,7 +264,7 @@ static int socket_init(struct disk_state * disk) {
            return -1;
        }       
 
-       PrintDebug("Capacity: %p\n", (void *)(disk->capacity));
+       PrintDebug("Capacity: %p\n", (void *)(addr_t)disk->capacity);
     }
 
 
@@ -270,13 +273,13 @@ static int socket_init(struct disk_state * disk) {
 }
 
 
-static int disk_init(struct guest_info * vm, v3_cfg_tree_t * cfg) {
+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));
 
     char * ip_str = v3_cfg_val(cfg, "IP");
     char * port_str = v3_cfg_val(cfg, "port");
     char * disk_tag = v3_cfg_val(cfg, "tag");
-    char * name = v3_cfg_val(cfg, "name");
+    char * dev_id = v3_cfg_val(cfg, "ID");
 
     v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend");
 
@@ -285,16 +288,19 @@ static int disk_init(struct guest_info * vm, v3_cfg_tree_t * cfg) {
     strncpy(disk->disk_name, disk_tag, sizeof(disk->disk_name));
     disk->ip_addr = v3_inet_addr(ip_str);
     disk->port = atoi(port_str);
-       
-    struct vm_device * dev = v3_allocate_device(name, &dev_ops, disk);
+    disk->vm = vm;
+
+    struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, disk);
 
-    if (v3_attach_device(vm, dev) == -1) {
-       PrintError("Could not attach device %s\n", name);
+    if (dev == NULL) {
+       PrintError("Could not attach device %s\n", dev_id);
+       V3_Free(disk);
        return -1;
     }
 
     if (socket_init(disk) == -1) {
        PrintError("could not initialize network connection\n");
+       v3_remove_device(dev);
        return -1;
     }
 
@@ -302,7 +308,8 @@ static int disk_init(struct guest_info * vm, v3_cfg_tree_t * cfg) {
 
     if (v3_dev_connect_blk(vm, v3_cfg_val(frontend_cfg, "tag"), 
                           &blk_ops, frontend_cfg, disk) == -1) {
-       PrintError("Could not connect %s to frontend\n", name);
+       PrintError("Could not connect %s to frontend\n", dev_id);
+       v3_remove_device(dev);
        return -1;
     }