lwip/uip should not be dependent on any part of the VMM,

bug fix in string.c

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 12ae684..734062b 100644 (file)
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -439,7 +439,7 @@ devices/%.o : devices/%.asm
        $(NASM) $(NASM_VMM_OPTS) $< -o devices/$*.o
 
 net/%.o : net/%.c
-       $(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_VMM_OPTS)  $(CC_USER_OPTS) $< -o net/$*.o
+       $(TARGET_CC) -c $(CC_GENERAL_OPTS)  $(CC_USER_OPTS) $< -o net/$*.o
 
 # ----------------------------------------------------------------------
 # Targets -

diff --git a/palacios/src/common/string.c b/palacios/src/common/string.c
index 5c82ec4..41f4b8a 100644 (file)
--- a/palacios/src/common/string.c
+++ b/palacios/src/common/string.c
@@ -307,7 +307,7 @@ int fflush(FILE *stream)
     //PrintDebug("In fflush!!\n");
 
     return 0;
-}*/
+}
 
 void abort(void)
 {

diff --git a/palacios/src/lwip/arch/sys_arch.c b/palacios/src/lwip/arch/sys_arch.c
index f11d0ff..289ed70 100644 (file)
--- a/palacios/src/lwip/arch/sys_arch.c
+++ b/palacios/src/lwip/arch/sys_arch.c
@@ -55,8 +55,8 @@
 
 #include <geekos/synch.h>
 #include <geekos/kthread.h>
-#include <palacios/vmm.h>
 #include <geekos/debug.h>
+#include <geekos/malloc.h>
 
 #include "lwip/sys.h"
 #include "lwip/opt.h"
@@ -125,7 +125,7 @@ introduce_thread(struct Kernel_Thread *id /*pthread_t id*/)
 {
   struct sys_thread *thread;
   
-  thread = (struct sys_thread *)V3_Malloc(sizeof(struct sys_thread)); 
+  thread = (struct sys_thread *)Malloc(sizeof(struct sys_thread)); 
     
   if (thread != NULL) {
     //pthread_mutex_lock(&threads_mutex);
@@ -198,7 +198,7 @@ sys_thread_new(char *name, void (* function)(void *arg), void *arg, int stacksiz
   struct Kernel_Thread *tmp;
   struct sys_thread *st = NULL;
   
-  //tmp = (struct Kernel_Thread *)V3_Malloc(sizeof(struct Kernel_Thread));
+  //tmp = (struct Kernel_Thread *)Malloc(sizeof(struct Kernel_Thread));
   
   /* code = pthread_create(&tmp,
                         NULL, 
@@ -227,7 +227,7 @@ sys_mbox_new(int size)
 {
   struct sys_mbox *mbox;
   
-  mbox = (struct sys_mbox *)V3_Malloc(sizeof(struct sys_mbox));
+  mbox = (struct sys_mbox *)Malloc(sizeof(struct sys_mbox));
   if (mbox != NULL) {
     mbox->first = mbox->last = 0;
     mbox->mail = sys_sem_new_(0);
@@ -258,7 +258,7 @@ sys_mbox_free(struct sys_mbox *mbox)
     mbox->mail = mbox->mutex = NULL;
     /*  LWIP_DEBUGF("sys_mbox_free: mbox 0x%lx\n", mbox); */
 
-    V3_Free(mbox); 
+    Free(mbox); 
   }
 }
 /*-----------------------------------------------------------------------------------*/
@@ -421,7 +421,7 @@ sys_sem_new_(u8_t count)
 {
   struct sys_sem *sem;
   
-  sem = (struct sys_sem *)V3_Malloc(sizeof(struct sys_sem));
+  sem = (struct sys_sem *)Malloc(sizeof(struct sys_sem));
   if (sem != NULL) {
     sem->c = count;
 
@@ -567,7 +567,7 @@ sys_sem_free_(struct sys_sem *sem)
   //pthread_mutex_destroy(&(sem->mutex));
   Mutex_Destroy(&(sem->mutex));
   
-  V3_Free(sem);
+  Free(sem);
 }
 
 #if 0