#define __VMM_H__
-//#include <palacios/vm_guest.h>
+/*#include <palacios/vm_guest.h>*/
#include <palacios/vmm_mem.h>
#include <palacios/vmm_types.h>
#include <palacios/vmm_string.h>
-//#include <palacios/vmm_paging.h>
+
/* utility definitions */
-#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; \
})
if ((os_hooks) && (os_hooks)->malloc) { \
var = (os_hooks)->malloc(size); \
} \
+ if (!var) PrintError("MALLOC FAILURE. Memory LEAK!!\n"); \
var; \
})
-#define V3_CREATE_THREAD(fn, arg, name) \
- do { \
- 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(irq, opaque) ({ \
+#define V3_Hook_Interrupt(vm, irq) ({ \
int ret = 0; \
extern struct v3_os_hooks * os_hooks; \
if ((os_hooks) && (os_hooks)->hook_interrupt) { \
- ret = (os_hooks)->hook_interrupt(irq, opaque); \
+ ret = (os_hooks)->hook_interrupt(vm, irq); \
} \
ret; \
}) \
+#define V3_Get_CPU() ({ \
+ int ret = 0; \
+ extern struct v3_os_hooks * os_hooks; \
+ if ((os_hooks) && (os_hooks)->get_cpu) { \
+ ret = (os_hooks)->get_cpu(); \
+ } \
+ ret; \
+ })
+
+
+#ifdef CONFIG_MULTITHREAD_OS
+
+#define V3_CREATE_THREAD(fn, arg, name) \
+ do { \
+ 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_Call_On_CPU(cpu, fn, arg) \
+ do { \
+ extern struct v3_os_hooks * os_hooks; \
+ if ((os_hooks) && (os_hooks)->call_on_cpu) { \
+ (os_hooks)->call_on_cpu(cpu, fn, arg); \
+ } \
+ } 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; \
+ })
+
+
+#endif
/* ** */
#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) \
void v3_yield(struct guest_info * info);
void v3_yield_cond(struct guest_info * info);
+void v3_print_cond(const char * fmt, ...);
-void v3_interrupt_cpu(struct guest_info * vm, int logical_cpu);
+void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector);
-unsigned int v3_get_cpu_id();
v3_cpu_arch_t v3_get_cpu_type(int cpu_id);
int v3_vm_enter(struct guest_info * info);
-#endif //!__V3VEE__
+#endif /*!__V3VEE__ */
-struct guest_info;
+struct v3_vm_info;
/* This will contain function pointers that provide OS services */
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);
void *(*paddr_to_vaddr)(void *addr);
void *(*vaddr_to_paddr)(void *addr);
- int (*hook_interrupt)(struct guest_info * vm, unsigned int irq);
-
+ int (*hook_interrupt)(struct v3_vm_info * vm, unsigned int irq);
int (*ack_irq)(int irq);
unsigned int (*get_cpu_khz)(void);
- void (*start_kernel_thread)(int (*fn)(void * arg), void * arg, char * thread_name);
void (*yield_cpu)(void);
void (*mutex_unlock)(void * mutex);
unsigned int (*get_cpu)(void);
- void (*interrupt_cpu)(struct guest_info * vm, int logical_cpu);
- 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_kernel_thread)(int (*fn)(void * arg), void * arg, char * thread_name);
+ 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 cpu_id, int (*fn)(void * arg), void * arg, char * thread_name);
+};
-//
-//
-// This is the interrupt state that the VMM's interrupt handlers need to see
-//
+/*
+ *
+ * This is the interrupt state that the VMM's interrupt handlers need to see
+ */
struct v3_interrupt {
unsigned int irq;
unsigned int error;
- unsigned int should_ack; // Should the vmm ack this interrupt, or will
- // the host OS do it?
+ unsigned int should_ack; /* Should the vmm ack this interrupt, or will
+ * the host OS do it? */
};
void Init_V3(struct v3_os_hooks * hooks, int num_cpus);
-int v3_start_vm(struct guest_info * info, unsigned int cpu_mask);
-struct guest_info * v3_create_vm(void * cfg);
+struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data, char * name);
+int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask);
+int v3_stop_vm(struct v3_vm_info * vm);
-int v3_deliver_irq(struct guest_info * vm, struct v3_interrupt * intr);
+int v3_deliver_irq(struct v3_vm_info * vm, struct v3_interrupt * intr);
