From: Peter Dinda <pdinda@northwestern.edu>
Date: Wed, 4 Mar 2009 18:43:14 +0000 (-0600)
Subject: Rolled back changes to vmm_socket.c which were causing a conflict during merge
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=bf5cbaffc0d7bae69f5f9ee02a6dc28efa52b573

Rolled back changes to vmm_socket.c which were causing a conflict during merge
with mainline - this was stuff from when Lei and I were testing his code
Merge branch 'devel' of ssh://palacios@localhost/home/palacios/palacios into devel

Conflicts:
	palacios/src/palacios/vmm_socket.c
---

bf5cbaffc0d7bae69f5f9ee02a6dc28efa52b573
diff --cc palacios/src/palacios/vmm_socket.c
index 21063b9,0e61f83..b5498b2
--- a/palacios/src/palacios/vmm_socket.c
+++ b/palacios/src/palacios/vmm_socket.c
@@@ -26,87 -26,13 +26,12 @@@
  
  struct v3_socket_hooks * sock_hooks = 0;
  
- 
- //int v3_socket_api_test(void);
- 
- 
  void V3_Init_Sockets(struct v3_socket_hooks * hooks) {
-   PrintInfo("Initializing Socket Interface\n");
-   sock_hooks = hooks;
- 
-   PrintDebug("V3 sockets inited\n");
- 
-   v3_socket_api_test();
-   
-   return;
- }
- 
- 
- 
- void v3_init_sock_set(struct v3_sock_set * sock_set) {
-   sock_set->num_socks = 0;
-   sock_set->socks = NULL;
- 
-   return;
- }
- 
- 
- 
- 
- 
- /* This should probably check if the socket is already added */
- // adds socket to the sockset
- void v3_set_sock(struct v3_sock_set * sock_set, V3_SOCK sock) {
-   struct v3_sock_entry * new_entry = V3_Malloc(sizeof(struct v3_sock_entry));
- 
-   new_entry->sock = sock;
-   new_entry->is_set = 0;
- 
-   if (sock_set->socks) {
-     new_entry->next = sock_set->socks;
-   }
- 
-   sock_set->socks = new_entry;
- 
-   sock_set->num_socks++;
- }
- 
- 
- // deletes socket from sockset
- void v3_clr_sock(struct v3_sock_set * sock_set, V3_SOCK sock) {
-   struct v3_sock_entry * iter, * back_ptr;
- 
-   iter = sock_set->socks;
-   back_ptr = NULL;
- 
-   v3_foreach_sock(sock_set, iter) {
-     if (iter->sock == sock) {
-       if (back_ptr == NULL) {
- 	sock_set->socks = iter->next;
-       } else {
- 	back_ptr->next = iter->next;
-       }
- 
-       V3_Free(iter);
- 
-       sock_set->num_socks--;
-       break;
-     }
- 
-     back_ptr = iter;
-   }
- }
- 
- // checks is_set vairable 
- int v3_isset_sock(struct v3_sock_set * sock_set, V3_SOCK sock) {
-   struct v3_sock_entry * iter;
+     PrintInfo("Initializing Socket Interface\n");
+     sock_hooks = hooks;
 -
+     PrintDebug("V3 sockets inited\n");
  
-   v3_foreach_sock(sock_set, iter) {
-     if (iter->sock == sock) {
-       return iter->is_set;
-     }
-   }
-   return -1;
+     return;
  }