Merge branch 'linus' into x86/xen

[safe/jmp/linux-2.6] / drivers / lguest / lg.h

diff --git a/drivers/lguest/lg.h b/drivers/lguest/lg.h
index 95b473c..5faefea 100644 (file)
--- a/drivers/lguest/lg.h
+++ b/drivers/lguest/lg.h
@@ -8,8 +8,8 @@
 #include <linux/lguest.h>
 #include <linux/lguest_launcher.h>
 #include <linux/wait.h>
+#include <linux/hrtimer.h>
 #include <linux/err.h>
-#include <asm/semaphore.h>
 
 #include <asm/lguest.h>
 
@@ -51,12 +51,19 @@ struct lg_cpu {
        u32 esp1;
        u8 ss1;
 
+       /* Bitmap of what has changed: see CHANGED_* above. */
+       int changed;
+
        unsigned long pending_notify; /* pfn from LHCALL_NOTIFY */
 
        /* At end of a page shared mapped over lguest_pages in guest.  */
        unsigned long regs_page;
        struct lguest_regs *regs;
 
+       struct lguest_pages *last_pages;
+
+       int cpu_pgd; /* which pgd this cpu is currently using */
+
        /* If a hypercall was asked for, this points to the arguments. */
        struct hcall_args *hcall;
        u32 next_hcall;
@@ -88,12 +95,6 @@ struct lguest
        void __user *mem_base;
        unsigned long kernel_address;
 
-       /* Bitmap of what has changed: see CHANGED_* above. */
-       int changed;
-       struct lguest_pages *last_pages;
-
-       /* We keep a small number of these. */
-       u32 pgdidx;
        struct pgdir pgdirs[4];
 
        unsigned long noirq_start, noirq_end;
@@ -110,22 +111,22 @@ extern struct mutex lguest_lock;
 /* core.c: */
 int lguest_address_ok(const struct lguest *lg,
                      unsigned long addr, unsigned long len);
-void __lgread(struct lguest *, void *, unsigned long, unsigned);
-void __lgwrite(struct lguest *, unsigned long, const void *, unsigned);
+void __lgread(struct lg_cpu *, void *, unsigned long, unsigned);
+void __lgwrite(struct lg_cpu *, unsigned long, const void *, unsigned);
 
 /*H:035 Using memory-copy operations like that is usually inconvient, so we
  * have the following helper macros which read and write a specific type (often
  * an unsigned long).
  *
  * This reads into a variable of the given type then returns that. */
-#define lgread(lg, addr, type)                                         \
-       ({ type _v; __lgread((lg), &_v, (addr), sizeof(_v)); _v; })
+#define lgread(cpu, addr, type)                                                \
+       ({ type _v; __lgread((cpu), &_v, (addr), sizeof(_v)); _v; })
 
 /* This checks that the variable is of the given type, then writes it out. */
-#define lgwrite(lg, addr, type, val)                           \
+#define lgwrite(cpu, addr, type, val)                          \
        do {                                                    \
                typecheck(type, val);                           \
-               __lgwrite((lg), (addr), &(val), sizeof(val));   \
+               __lgwrite((cpu), (addr), &(val), sizeof(val));  \
        } while(0)
 /* (end of memory access helper routines) :*/
 
@@ -135,7 +136,6 @@ int run_guest(struct lg_cpu *cpu, unsigned long __user *user);
  * first step in the migration to the kernel types.  pte_pfn is already defined
  * in the kernel. */
 #define pgd_flags(x)   (pgd_val(x) & ~PAGE_MASK)
-#define pte_flags(x)   (pte_val(x) & ~PAGE_MASK)
 #define pgd_pfn(x)     (pgd_val(x) >> PAGE_SHIFT)
 
 /* interrupts_and_traps.c: */
@@ -169,14 +169,14 @@ void free_guest_pagetable(struct lguest *lg);
 void guest_new_pagetable(struct lg_cpu *cpu, unsigned long pgtable);
 void guest_set_pmd(struct lguest *lg, unsigned long gpgdir, u32 i);
 void guest_pagetable_clear_all(struct lg_cpu *cpu);
-void guest_pagetable_flush_user(struct lguest *lg);
-void guest_set_pte(struct lguest *lg, unsigned long gpgdir,
+void guest_pagetable_flush_user(struct lg_cpu *cpu);
+void guest_set_pte(struct lg_cpu *cpu, unsigned long gpgdir,
                   unsigned long vaddr, pte_t val);
 void map_switcher_in_guest(struct lg_cpu *cpu, struct lguest_pages *pages);
-int demand_page(struct lguest *info, unsigned long cr2, int errcode);
-void pin_page(struct lguest *lg, unsigned long vaddr);
-unsigned long guest_pa(struct lguest *lg, unsigned long vaddr);
-void page_table_guest_data_init(struct lguest *lg);
+int demand_page(struct lg_cpu *cpu, unsigned long cr2, int errcode);
+void pin_page(struct lg_cpu *cpu, unsigned long vaddr);
+unsigned long guest_pa(struct lg_cpu *cpu, unsigned long vaddr);
+void page_table_guest_data_init(struct lg_cpu *cpu);
 
 /* <arch>/core.c: */
 void lguest_arch_host_init(void);
@@ -196,7 +196,7 @@ void lguest_device_remove(void);
 
 /* hypercalls.c: */
 void do_hypercalls(struct lg_cpu *cpu);
-void write_timestamp(struct lguest *lg);
+void write_timestamp(struct lg_cpu *cpu);
 
 /*L:035
  * Let's step aside for the moment, to study one important routine that's used
@@ -222,12 +222,12 @@ void write_timestamp(struct lguest *lg);
  * Like any macro which uses an "if", it is safely wrapped in a run-once "do {
  * } while(0)".
  */
-#define kill_guest(lg, fmt...)                                 \
+#define kill_guest(cpu, fmt...)                                        \
 do {                                                           \
-       if (!(lg)->dead) {                                      \
-               (lg)->dead = kasprintf(GFP_ATOMIC, fmt);        \
-               if (!(lg)->dead)                                \
-                       (lg)->dead = ERR_PTR(-ENOMEM);          \
+       if (!(cpu)->lg->dead) {                                 \
+               (cpu)->lg->dead = kasprintf(GFP_ATOMIC, fmt);   \
+               if (!(cpu)->lg->dead)                           \
+                       (cpu)->lg->dead = ERR_PTR(-ENOMEM);     \
        }                                                       \
 } while(0)
 /* (End of aside) :*/