X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_sym_iface.h;h=5de9720aa8048f842de01fede30e2895c633d70a;hp=94b47ec693f191febd50913027db18d9f1980f08;hb=123a1ba27ea09c8fa77a1b36ce625b43d7c48b14;hpb=ed8feff1d5dd6bf028cd5ba0960ec125505d7597

diff --git a/palacios/include/palacios/vmm_sym_iface.h b/palacios/include/palacios/vmm_sym_iface.h
index 94b47ec..5de9720 100644
--- a/palacios/include/palacios/vmm_sym_iface.h
+++ b/palacios/include/palacios/vmm_sym_iface.h
@@ -23,18 +23,15 @@
 
 #ifdef __V3VEE__
 
-#include <palacios/vm_guest.h>
-
 
 
 struct v3_sym_interface {
     uint64_t magic;
 
-
     union {
 	uint32_t feature_flags;
 	struct {
-	    uint_t pci_map_valid          : 1;
+	    uint_t pci_map_valid            : 1;
 	    uint32_t sym_call_enabled       : 1;
 	} __attribute__((packed));
     } __attribute__((packed));
@@ -51,17 +48,12 @@ struct v3_sym_interface {
     
     uint8_t pci_pt_map[(4 * 256) / 8]; // we're hardcoding this: (4 busses, 256 max devs)
 
-
-    uint64_t sym_call_rip;
-    uint64_t sym_call_cs;
-    uint64_t sym_call_rsp;
-    uint64_t sym_call_gs;
-    uint64_t sym_call_ret_fn;
-
 } __attribute__((packed));
 
 
 
+#include <palacios/vm_guest.h>
+
 
 struct v3_sym_context {
     struct v3_gprs vm_regs;
@@ -70,11 +62,11 @@ struct v3_sym_context {
     uint64_t gs_base;
     uint64_t fs_base;
     uint64_t rip;
+    uint64_t flags;
     uint8_t cpl;
 };
 
 
-
 struct v3_sym_state {
     
     struct v3_sym_interface * sym_page;
@@ -83,35 +75,46 @@ struct v3_sym_state {
     uint64_t guest_pg_addr;
 
     struct {
-	uint_t active              : 1;
-	uint_t call_pending        : 1;
-	uint_t call_active         : 1;
+	uint_t active                  : 1; // activated when symbiotic page MSR is written
+	uint_t sym_call_active         : 1;
+	uint_t sym_call_returned       : 1;
+	uint_t sym_call_error          : 1;
     } __attribute__((packed));
 
     struct v3_sym_context old_ctx;
-    uint64_t args[6];
-    int (*notifier)(struct guest_info * info, void * private_data);
 
-    void * private_data;
+    int sym_call_errno;    
 
+    uint64_t sym_call_rip;
+    uint64_t sym_call_cs;
+    uint64_t sym_call_rsp;
+    uint64_t sym_call_gs;
+    uint64_t sym_call_fs;
 };
 
+
+
+
+
+
+
 int v3_init_sym_iface(struct guest_info * info);
 
 
+typedef uint64_t sym_arg_t;
 
-#define v3_sym_call0(info, call_num, cb, priv)		\
-    v3_sym_call(info, call_num, 0, 0, 0, 0, 0, cb, priv)
-#define v3_sym_call1(info, call_num, arg1, cb, priv)		\
-    v3_sym_call(info, call_num, arg1, 0, 0, 0, 0, cb, priv)
-#define v3_sym_call2(info, call_num, arg1, arg2, cb, priv)	\
-    v3_sym_call(info, call_num, arg1, arg2, 0, 0, 0, cb, priv)
-#define v3_sym_call3(info, call_num, arg1, arg2, arg3, cb, priv)	\
-    v3_sym_call(info, call_num, arg1, arg2, arg3, 0, 0, cb, priv)
-#define v3_sym_call4(info, call_num, arg1, arg2, arg3, arg4, cb, priv)	\
-    v3_sym_call(info, call_num, arg1, arg2, arg3, arg4, 0, cb, priv)
-#define v3_sym_call5(info, call_num, arg1, arg2, arg3, arg4, arg5, cb, priv)	\
-    v3_sym_call(info, call_num, arg1, arg2, arg3, arg4, arg5, cb, priv)
+#define v3_sym_call0(info, call_num)		\
+    v3_sym_call(info, call_num, 0, 0, 0, 0, 0)
+#define v3_sym_call1(info, call_num, arg1)		\
+    v3_sym_call(info, call_num, arg1, 0, 0, 0, 0)
+#define v3_sym_call2(info, call_num, arg1, arg2)	\
+    v3_sym_call(info, call_num, arg1, arg2, 0, 0, 0)
+#define v3_sym_call3(info, call_num, arg1, arg2, arg3)	\
+    v3_sym_call(info, call_num, arg1, arg2, arg3, 0, 0)
+#define v3_sym_call4(info, call_num, arg1, arg2, arg3, arg4)	\
+    v3_sym_call(info, call_num, arg1, arg2, arg3, arg4, 0)
+#define v3_sym_call5(info, call_num, arg1, arg2, arg3, arg4, arg5)	\
+    v3_sym_call(info, call_num, arg1, arg2, arg3, arg4, arg5)
 
 
 
@@ -120,14 +123,16 @@ int v3_sym_map_pci_passthrough(struct guest_info * info, uint_t bus, uint_t dev,
 int v3_sym_unmap_pci_passthrough(struct guest_info * info, uint_t bus, uint_t dev, uint_t fn);
 
 
+/* Symcall numbers */
+#define SYMCALL_TEST 1
+#define SYMCALL_MEM_LOOKUP 10
+/* ** */
+
 int v3_sym_call(struct guest_info * info, 
-		uint64_t arg0, uint64_t arg1, 
-		uint64_t arg2, uint64_t arg3,
-		uint64_t arg4, uint64_t arg5, 
-		int (*notifier)(struct guest_info * info, void * private_data),
-		void * private_data);
+		uint64_t call_num, sym_arg_t * arg0, 
+		sym_arg_t * arg1, sym_arg_t * arg2,
+		sym_arg_t * arg3, sym_arg_t * arg4);
 
-int v3_activate_sym_call(struct guest_info * info);
 
 #endif