Merge branch 'devel' of ssh://palacios@newskysaw/home/palacios/palacios into devel

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

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index b9c77b5..620761a 100644 (file)
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -193,10 +193,6 @@ struct guest_info;
     } while (0)
 
 
-
-
-
-
 #define V3_Call_On_CPU(cpu, fn, arg)                   \
     do {                                               \
         extern struct v3_os_hooks * os_hooks;           \
@@ -216,12 +212,15 @@ struct guest_info;
            thread;                                                     \
        })
 
-
 #endif
 
+<<<<<<< HEAD:palacios/include/palacios/vmm.h
 
+=======
+>>>>>>> 0956466aad020813d1e470df366d552fdabab2a9:palacios/include/palacios/vmm.h
 /* ** */
 
+
 #define V3_ASSERT(x)                                                   \
     do {                                                               \
        extern struct v3_os_hooks * os_hooks;                           \
@@ -334,5 +333,4 @@ int v3_stop_vm(struct v3_vm_info * vm);
 int v3_deliver_irq(struct v3_vm_info * vm, struct v3_interrupt * intr);
 
 
-
 #endif