X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fnet_cd.c;h=f980bab6abcc3fbb6fcf5ebe55d0c93828fc93bf;hp=0e2b49ca7a119f47282586dba317b3518f78d2d4;hb=0e097100a26bc43eb8964734fa43130fc4c71429;hpb=e070c6feb9e35665efa6e50ed7549d20c26ff426

diff --git a/palacios/src/devices/net_cd.c b/palacios/src/devices/net_cd.c
index 0e2b49c..f980bab 100644
--- a/palacios/src/devices/net_cd.c
+++ b/palacios/src/devices/net_cd.c
@@ -22,19 +22,16 @@
 #include <devices/ide.h>
 #include <palacios/vmm_socket.h>
 
-/* #ifndef DEBUG_IDE */
-/* #undef PrintDebug */
-/* #define PrintDebug(fmt, args...) */
-/* #endif */
-
+#ifndef CONFIG_DEBUG_IDE
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif 
 
 
 #define NBD_READ_CMD 0x1
 #define NBD_WRITE_CMD 0x2
 #define NBD_CAPACITY_CMD 0x3
 
-
-
 #define NBD_STATUS_OK 0x00
 #define NBD_STATUS_ERR 0xff
 
@@ -58,12 +55,13 @@ struct cd_state {
 static int send_all(int socket, char * buf, int length) {
     int bytes_sent = 0;
     
+    PrintDebug("Sending %d bytes\n", length - bytes_sent);
     while (bytes_sent < length) {
-	PrintDebug("Sending %d bytes\n", length - bytes_sent);
 	int tmp_bytes = V3_Send(socket, buf + bytes_sent, length - bytes_sent);
 	PrintDebug("Sent %d bytes\n", tmp_bytes);
 	
 	if (tmp_bytes == 0) {
+	    PrintError("Connection Closed unexpectedly\n");
 	    return -1;
 	}
 	
@@ -77,12 +75,13 @@ static int send_all(int socket, char * buf, int length) {
 static int recv_all(int socket, char * buf, int length) {
     int bytes_read = 0;
     
+    PrintDebug("Reading %d bytes\n", length - bytes_read);
     while (bytes_read < length) {
-	PrintDebug("Reading %d bytes\n", length - bytes_read);
 	int tmp_bytes = V3_Recv(socket, buf + bytes_read, length - bytes_read);
 	PrintDebug("Received %d bytes\n", tmp_bytes);
 	
 	if (tmp_bytes == 0) {
+	    PrintError("Connection Closed unexpectedly\n");
 	    return -1;
 	}
 	
@@ -141,7 +140,7 @@ static int cd_read(uint8_t * buf, int block_count, uint64_t lba,  void * private
 	return -1;
     }
 
-    PrintDebug("Reading Data\n");
+    PrintDebug("Reading Data (%d bytes)\n", ret_len);
 
     if (recv_all(cd->socket, (char *)buf, ret_len) == -1) {
 	PrintError("Read Data Error\n");
@@ -159,14 +158,28 @@ static uint32_t cd_get_capacity(void * private_data) {
     return cd->capacity / ATAPI_BLOCK_SIZE;
 }
 
-static struct v3_ide_cd_ops cd_ops = {
+static struct v3_cd_ops cd_ops = {
     .read = cd_read, 
     .get_capacity = cd_get_capacity,
 };
 
 
-static int cd_init(struct vm_device * dev) {
-    struct cd_state * cd = (struct cd_state *)(dev->private_data);
+
+
+static int cd_free(struct vm_device * dev) {
+    return 0;
+}
+
+static struct v3_device_ops dev_ops = {
+    .free = cd_free,
+    .reset = NULL,
+    .start = NULL,
+    .stop = NULL,
+};
+
+
+
+static int socket_init(struct cd_state * cd) {
     char header[64];
     
     PrintDebug("Intializing Net CD\n");
@@ -211,6 +224,41 @@ static int cd_init(struct vm_device * dev) {
 	PrintDebug("Capacity: %p\n", (void *)(cd->capacity));
     }
 
+    return 0;
+}
+
+static int cd_init(struct guest_info * vm, void * cfg_data) {
+    struct net_cd_cfg * cfg = (struct net_cd_cfg *)cfg_data;
+    struct cd_state * cd = (struct cd_state *)V3_Malloc(sizeof(struct cd_state));
+
+    PrintDebug("Registering Net CD at %s:%d disk=%s\n", cfg->ip_str, cfg->port, cfg->disk_tag);
+
+    strncpy(cd->disk_name, cfg->disk_tag, sizeof(cd->disk_name));
+    cd->ip_addr = v3_inet_addr(cfg->ip_str);
+    cd->port = cfg->port;
+
+    cd->ide = (struct vm_device * )v3_find_dev(vm, cfg->ide);
+
+    if (cd->ide == 0) {
+	PrintError("Could not find backend %s\n", cfg->ide);
+	return -1;
+    }
+
+    cd->bus = cfg->bus;
+    cd->drive = cfg->drive;
+	
+    struct vm_device * dev = v3_allocate_device("NET-CD", &dev_ops, cd);
+
+
+    if (v3_attach_device(vm, dev) == -1) {
+	PrintError("Could not attach device %s\n", "NET-CD");
+	return -1;
+    }
+
+    if (socket_init(cd) == -1) {
+	PrintError("Could not initialize socket connection\n");
+	return -1;
+    }
 
     PrintDebug("Registering CD\n");
 
@@ -219,40 +267,11 @@ static int cd_init(struct vm_device * dev) {
     }
 
     PrintDebug("intialization done\n");
-    
-    return 0;
-}
-
 
-static int cd_deinit(struct vm_device * dev) {
     return 0;
 }
 
-static struct vm_device_ops dev_ops = {
-    .init = cd_init, 
-    .deinit = cd_deinit,
-    .reset = NULL,
-    .start = NULL,
-    .stop = NULL,
-};
 
-struct vm_device * v3_create_net_cd(struct vm_device * ide, 
-				    uint_t bus, uint_t drive, 
-				    const char * ip_str, uint16_t port, 
-				    const char * disk_tag) {
-    struct cd_state * cd = (struct cd_state *)V3_Malloc(sizeof(struct cd_state));
-
-    PrintDebug("Registering Net CD at %s:%d disk=%s\n", ip_str, port, disk_tag);
 
-    strncpy(cd->disk_name, disk_tag, sizeof(cd->disk_name));
-    cd->ip_addr = v3_inet_addr(ip_str);
-    cd->port = port;
 
-    cd->ide = ide;
-    cd->bus = bus;
-    cd->drive = drive;
-	
-    struct vm_device * cd_dev = v3_create_device("NET-CD", &dev_ops, cd);
-
-    return cd_dev;
-}
+device_register("NET-CD", cd_init)