X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=010fc76276301b38e8118ed4eb371bd9d7e09a8c;hb=0899a5c74318e582f3d6ebec52cc744cdb727734;hp=c15ffb1176a624b497c33d553dfcb5a80410fd65;hpb=7cdedeb7a01b51c5242cce94924f2ea246008e7d;p=palacios-OLD.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index c15ffb1..010fc76 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -17,14 +17,13 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-#ifndef __VM_GUEST_H
-#define __VM_GUEST_H
+#ifndef __VM_GUEST_H__
+#define __VM_GUEST_H__
 
 #ifdef __V3VEE__
 
-
-#include <palacios/vmm_mem.h>
 #include <palacios/vmm_types.h>
+#include <palacios/vmm_mem.h>
 #include <palacios/vmm_io.h>
 #include <palacios/vmm_shadow_paging.h>
 #include <palacios/vmm_intr.h>
@@ -33,7 +32,7 @@
 #include <palacios/vmm_emulator.h>
 #include <palacios/vmm_host_events.h>
 
-typedef ullong_t v3_reg_t;
+
 
 
 
@@ -104,12 +103,6 @@ struct vmm_io_map;
 struct emulation_state;
 struct v3_intr_state;
 
-struct vm_ctrl_ops {
-  int (*raise_irq)(struct guest_info * info, int irq);
-  int (*lower_irq)(struct guest_info * info, int irq);
-};
-
-
 
 
 typedef enum {SHADOW_PAGING, NESTED_PAGING} v3_paging_mode_t;
@@ -155,8 +148,6 @@ struct guest_info {
   struct v3_dbg_regs dbg_regs;
   struct v3_segments segments;
 
-  struct vm_ctrl_ops vm_ops;
-
   struct emulation_state emulator;
 
   v3_vm_operating_mode_t run_state;