From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Tue, 15 Dec 2009 21:59:31 +0000 (-0600)
Subject: moved network backend/frontend registration to correct location
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=5f0b4f8c5f9f53cea37dde072b37d09ba316487d;p=palacios.git

moved network backend/frontend registration to correct location
---

diff --git a/palacios/src/devices/lnx_virtio_nic.c b/palacios/src/devices/lnx_virtio_nic.c
index cd7de18..173c58d 100644
--- a/palacios/src/devices/lnx_virtio_nic.c
+++ b/palacios/src/devices/lnx_virtio_nic.c
@@ -757,68 +757,6 @@ static int connect_fn(struct guest_info * info,
 }
 
 
-struct net_frontend {
-    int (*connect)(struct guest_info * info, 
-		    void * frontend_data, 
-		    struct v3_dev_net_ops * ops, 
-		    v3_cfg_tree_t * cfg, 
-		    void * priv_data);
-	
-
-    struct list_head net_node;
-
-    void * priv_data;
-};
-
-
-int v3_dev_add_net_frontend(struct guest_info * info, 
-			    char * name, 
-			    int (*connect)(struct guest_info * info, 
-					    void * frontend_data, 
-					    struct v3_dev_net_ops * ops, 
-					    v3_cfg_tree_t * cfg, 
-					    void * private_data), 
-			    void * priv_data)
-{
-    struct net_frontend * frontend = NULL;
-
-    frontend = (struct net_frontend *)V3_Malloc(sizeof(struct net_frontend));
-    memset(frontend, 0, sizeof(struct net_frontend));
-    
-    frontend->connect = connect;
-    frontend->priv_data = priv_data;
-	
-    list_add(&(frontend->net_node), &(info->dev_mgr.net_list));
-    v3_htable_insert(info->dev_mgr.net_table, (addr_t)(name), (addr_t)frontend);
-
-    return 0;
-}
-
-
-int v3_dev_connect_net(struct guest_info * info, 
-		       char * frontend_name, 
-		       struct v3_dev_net_ops * ops, 
-		       v3_cfg_tree_t * cfg, 
-		       void * private_data)
-{
-    struct net_frontend * frontend = NULL;
-
-    frontend = (struct net_frontend *)v3_htable_search(info->dev_mgr.net_table,
-						       (addr_t)frontend_name);
-    
-    if (frontend == NULL) {
-	PrintError("Could not find frontend net device %s\n", frontend_name);
-	return 0;
-    }
-
-    if (frontend->connect(info, frontend->priv_data, ops, cfg, private_data) == -1) {
-	PrintError("Error connecting to net frontend %s\n", frontend_name);
-	return -1;
-    }
-
-    return 0;
-}
-
 static int virtio_init(struct guest_info * vm, v3_cfg_tree_t * cfg) {
     struct vm_device * pci_bus = v3_find_dev(vm, v3_cfg_val(cfg, "bus"));
     struct virtio_dev_state * virtio_state = NULL;
diff --git a/palacios/src/palacios/vmm_dev_mgr.c b/palacios/src/palacios/vmm_dev_mgr.c
index c7a8f95..65d01f4 100644
--- a/palacios/src/palacios/vmm_dev_mgr.c
+++ b/palacios/src/palacios/vmm_dev_mgr.c
@@ -303,3 +303,68 @@ int v3_dev_connect_blk(struct guest_info * info,
 
     return 0;
 }
+
+
+
+struct net_frontend {
+    int (*connect)(struct guest_info * info, 
+		    void * frontend_data, 
+		    struct v3_dev_net_ops * ops, 
+		    v3_cfg_tree_t * cfg, 
+		    void * priv_data);
+	
+
+    struct list_head net_node;
+
+    void * priv_data;
+};
+
+
+int v3_dev_add_net_frontend(struct guest_info * info, 
+			    char * name, 
+			    int (*connect)(struct guest_info * info, 
+					    void * frontend_data, 
+					    struct v3_dev_net_ops * ops, 
+					    v3_cfg_tree_t * cfg, 
+					    void * private_data), 
+			    void * priv_data)
+{
+    struct net_frontend * frontend = NULL;
+
+    frontend = (struct net_frontend *)V3_Malloc(sizeof(struct net_frontend));
+    memset(frontend, 0, sizeof(struct net_frontend));
+    
+    frontend->connect = connect;
+    frontend->priv_data = priv_data;
+	
+    list_add(&(frontend->net_node), &(info->dev_mgr.net_list));
+    v3_htable_insert(info->dev_mgr.net_table, (addr_t)(name), (addr_t)frontend);
+
+    return 0;
+}
+
+
+int v3_dev_connect_net(struct guest_info * info, 
+		       char * frontend_name, 
+		       struct v3_dev_net_ops * ops, 
+		       v3_cfg_tree_t * cfg, 
+		       void * private_data)
+{
+    struct net_frontend * frontend = NULL;
+
+    frontend = (struct net_frontend *)v3_htable_search(info->dev_mgr.net_table,
+						       (addr_t)frontend_name);
+    
+    if (frontend == NULL) {
+	PrintError("Could not find frontend net device %s\n", frontend_name);
+	return 0;
+    }
+
+    if (frontend->connect(info, frontend->priv_data, ops, cfg, private_data) == -1) {
+	PrintError("Error connecting to net frontend %s\n", frontend_name);
+	return -1;
+    }
+
+    return 0;
+}
+