virtual console works with stream-serial implementation

[palacios.git] / palacios / include / palacios / vmm.h

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index b10795c..dad24f6 100644 (file)
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -67,14 +67,26 @@ struct guest_info;
 
 
 
-#define V3_AllocPages(num_pages)                               \
-    ({                                                         \
-       extern struct v3_os_hooks * os_hooks;                   \
-       void * ptr = 0;                                         \
-       if ((os_hooks) && (os_hooks)->allocate_pages) {         \
-           ptr = (os_hooks)->allocate_pages(num_pages);        \
-       }                                                       \
-       ptr;                                                    \
+/* 4KB-aligned */
+#define V3_AllocPages(num_pages)                                       \
+    ({                                                                 \
+       extern struct v3_os_hooks * os_hooks;                           \
+       void * ptr = 0;                                                 \
+       if ((os_hooks) && (os_hooks)->allocate_pages) {                 \
+           ptr = (os_hooks)->allocate_pages(num_pages,PAGE_SIZE_4KB);  \
+       }                                                               \
+       ptr;                                                            \
+    })
+
+
+#define V3_AllocAlignedPages(num_pages, align)                         \
+    ({                                                                 \
+       extern struct v3_os_hooks * os_hooks;                           \
+       void * ptr = 0;                                                 \
+       if ((os_hooks) && (os_hooks)->allocate_pages) {                 \
+           ptr = (os_hooks)->allocate_pages(num_pages,align);          \
+       }                                                               \
+       ptr;                                                            \
     })
 
 
@@ -141,13 +153,16 @@ struct guest_info;
 
 #define V3_CREATE_THREAD(fn, arg, name)                                \
     do {                                                       \
-       extern struct v3_os_hooks * os_hooks;                   \ 
+       extern struct v3_os_hooks * os_hooks;                   \
        if ((os_hooks) && (os_hooks)->start_kernel_thread) {    \
            (os_hooks)->start_kernel_thread(fn, arg, name);     \
        }                                                       \
     } while (0)
 
 
+
+
+
 #define V3_Hook_Interrupt(vm, irq) ({                                  \
            int ret = 0;                                                \
            extern struct v3_os_hooks * os_hooks;                       \
@@ -176,6 +191,17 @@ struct guest_info;
     } while (0)
 
 
+
+#define V3_CREATE_THREAD_ON_CPU(cpu, fn, arg, name) ({                 \
+           void * thread = NULL;                                       \
+           extern struct v3_os_hooks * os_hooks;                       \
+           if ((os_hooks) && (os_hooks)->start_thread_on_cpu) {        \
+               thread = (os_hooks)->start_thread_on_cpu(cpu, fn, arg, name); \
+           }                                                           \
+           thread;                                                     \
+       })
+
+
 #define V3_ACK_IRQ(irq)                                                \
     do {                                                       \
        extern struct v3_os_hooks * os_hooks;                   \
@@ -185,21 +211,30 @@ struct guest_info;
     } while (0)
 
 
-
-
+#define V3_Reparent_Threadd()                                  \
+    do {                                                       \
+       if((os_hooks) && (os_hooks)->reparent_threaded) {       \
+           (os_hooks)->reparent_threaded();                    \
+       }                                                       \
+    } while(0)
 
 /* ** */
 
 #define V3_ASSERT(x)                                                   \
     do {                                                               \
+       extern struct v3_os_hooks * os_hooks;                           \
        if (!(x)) {                                                     \
            PrintDebug("Failed assertion in %s: %s at %s, line %d, RA=%lx\n", \
                       __func__, #x, __FILE__, __LINE__,                \
                       (ulong_t) __builtin_return_address(0));          \
-           while(1);                                                   \
+           while(1){                                                   \
+               if ((os_hooks) && (os_hooks)->yield_cpu) {              \
+                       (os_hooks)->yield_cpu();                        \
+               }                                                       \
+           }                                                           \
        }                                                               \
     } while(0)                                                         \
-
+       
 
 
 
@@ -239,7 +274,7 @@ struct v3_os_hooks {
     void (*print)(const char * format, ...)
        __attribute__ ((format (printf, 1, 2)));
   
-    void *(*allocate_pages)(int numPages);
+    void *(*allocate_pages)(int numPages, unsigned int alignment);
     void (*free_page)(void * page);
 
     void *(*malloc)(unsigned int size);
@@ -249,7 +284,6 @@ struct v3_os_hooks {
     void *(*vaddr_to_paddr)(void *addr);
 
     int (*hook_interrupt)(struct v3_vm_info * vm, unsigned int irq);
-
     int (*ack_irq)(int irq);
 
     unsigned int (*get_cpu_khz)(void);
@@ -266,8 +300,8 @@ struct v3_os_hooks {
     unsigned int (*get_cpu)(void);
     void (*interrupt_cpu)(struct v3_vm_info * vm, int logical_cpu, int vector);
     void (*call_on_cpu)(int logical_cpu, void (*fn)(void * arg), void * arg);
-    void (*start_thread_on_cpu)(int logical_cpu, int (*fn)(void * arg), void * arg, char * thread_name);
-
+    void * (*start_thread_on_cpu)(int cpu_id, int (*fn)(void * arg), void * arg, char * thread_name);
+    void (*reparent_threadd)(void);
 };
 
 
@@ -289,8 +323,9 @@ struct v3_interrupt {
 void Init_V3(struct v3_os_hooks * hooks,  int num_cpus);
 
 
+struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data);
 int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask);
-struct v3_vm_info * v3_create_vm(void * cfg);
+
 
 int v3_deliver_irq(struct v3_vm_info * vm, struct v3_interrupt * intr);