Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


Rolled back changes to vmm_socket.c which were causing a conflict during merge
Peter Dinda [Wed, 4 Mar 2009 18:43:14 +0000 (12:43 -0600)]
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

1  2 
manual/manual.tex
palacios/src/palacios/vmm_socket.c

Simple merge
  
  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;
  }