Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest: (45 commits)
  Use "struct boot_params" in example launcher
  Loading bzImage directly.
  Revert lguest magic and use hook in head.S
  Update lguest documentation to reflect the new virtual block device name.
  generalize lgread_u32/lgwrite_u32.
  Example launcher handle guests not being ready for input
  Update example launcher for virtio
  Lguest support for Virtio
  Remove old lguest I/O infrrasructure.
  Remove old lguest bus and drivers.
  Virtio helper routines for a descriptor ringbuffer implementation
  Module autoprobing support for virtio drivers.
  Virtio console driver
  Block driver using virtio.
  Net driver using virtio
  Virtio interface
  Boot with virtual == physical to get closer to native Linux.
  Allow guest to specify syscall vector to use.
  Rename "cr3" to "gpgdir" to avoid x86-specific naming.
  Pagetables to use normal kernel types
  ...

24 files changed, 867 insertions, 433 deletions

diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild
index 559830ece755..5e3539c129b9 100644
--- a/include/asm-x86/Kbuild
+++ b/include/asm-x86/Kbuild
@@ -1,6 +1,7 @@
 include include/asm-generic/Kbuild.asm
 
 header-y += boot.h
+header-y += bootparam.h
 header-y += debugreg.h
 header-y += ldt.h
 header-y += msr-index.h
@@ -14,8 +15,10 @@ unifdef-y += a.out_32.h
 unifdef-y += a.out_64.h
 unifdef-y += byteorder_32.h
 unifdef-y += byteorder_64.h
+unifdef-y += e820.h
 unifdef-y += elf_32.h
 unifdef-y += elf_64.h
+unifdef-y += ist.h
 unifdef-y += mce.h
 unifdef-y += msgbuf_32.h
 unifdef-y += msgbuf_64.h
diff --git a/include/asm-x86/bootparam.h b/include/asm-x86/bootparam.h
index dc031cf44633..19f3ddf2df4b 100644
--- a/include/asm-x86/bootparam.h
+++ b/include/asm-x86/bootparam.h
@@ -10,85 +10,85 @@
 #include <video/edid.h>
 
 struct setup_header {
-        u8      setup_sects;
-        u16     root_flags;
-        u32     syssize;
-        u16     ram_size;
+        __u8    setup_sects;
+        __u16   root_flags;
+        __u32   syssize;
+        __u16   ram_size;
 #define RAMDISK_IMAGE_START_MASK        0x07FF
 #define RAMDISK_PROMPT_FLAG             0x8000
 #define RAMDISK_LOAD_FLAG               0x4000
-        u16     vid_mode;
-        u16     root_dev;
-        u16     boot_flag;
-        u16     jump;
-        u32     header;
-        u16     version;
-        u32     realmode_swtch;
-        u16     start_sys;
-        u16     kernel_version;
-        u8      type_of_loader;
-        u8      loadflags;
+        __u16   vid_mode;
+        __u16   root_dev;
+        __u16   boot_flag;
+        __u16   jump;
+        __u32   header;
+        __u16   version;
+        __u32   realmode_swtch;
+        __u16   start_sys;
+        __u16   kernel_version;
+        __u8    type_of_loader;
+        __u8    loadflags;
 #define LOADED_HIGH     (1<<0)
 #define KEEP_SEGMENTS   (1<<6)
 #define CAN_USE_HEAP    (1<<7)
-        u16     setup_move_size;
-        u32     code32_start;
-        u32     ramdisk_image;
-        u32     ramdisk_size;
-        u32     bootsect_kludge;
-        u16     heap_end_ptr;
-        u16     _pad1;
-        u32     cmd_line_ptr;
-        u32     initrd_addr_max;
-        u32     kernel_alignment;
-        u8      relocatable_kernel;
-        u8      _pad2[3];
-        u32     cmdline_size;
-        u32     hardware_subarch;
-        u64     hardware_subarch_data;
+        __u16   setup_move_size;
+        __u32   code32_start;
+        __u32   ramdisk_image;
+        __u32   ramdisk_size;
+        __u32   bootsect_kludge;
+        __u16   heap_end_ptr;
+        __u16   _pad1;
+        __u32   cmd_line_ptr;
+        __u32   initrd_addr_max;
+        __u32   kernel_alignment;
+        __u8    relocatable_kernel;
+        __u8    _pad2[3];
+        __u32   cmdline_size;
+        __u32   hardware_subarch;
+        __u64   hardware_subarch_data;
 } __attribute__((packed));
 
 struct sys_desc_table {
-        u16 length;
-        u8  table[14];
+        __u16 length;
+        __u8  table[14];
 };
 
 struct efi_info {
-        u32 _pad1;
-        u32 efi_systab;
-        u32 efi_memdesc_size;
-        u32 efi_memdesc_version;
-        u32 efi_memmap;
-        u32 efi_memmap_size;
-        u32 _pad2[2];
+        __u32 _pad1;
+        __u32 efi_systab;
+        __u32 efi_memdesc_size;
+        __u32 efi_memdesc_version;
+        __u32 efi_memmap;
+        __u32 efi_memmap_size;
+        __u32 _pad2[2];
 };
 
 /* The so-called "zeropage" */
 struct boot_params {
         struct screen_info screen_info;                 /* 0x000 */
         struct apm_bios_info apm_bios_info;             /* 0x040 */
-        u8  _pad2[12];                                  /* 0x054 */
+        __u8  _pad2[12];                                /* 0x054 */
         struct ist_info ist_info;                       /* 0x060 */
-        u8  _pad3[16];                                  /* 0x070 */
-        u8  hd0_info[16];       /* obsolete! */         /* 0x080 */
-        u8  hd1_info[16];       /* obsolete! */         /* 0x090 */
+        __u8  _pad3[16];                                /* 0x070 */
+        __u8  hd0_info[16];     /* obsolete! */         /* 0x080 */
+        __u8  hd1_info[16];     /* obsolete! */         /* 0x090 */
         struct sys_desc_table sys_desc_table;           /* 0x0a0 */
-        u8  _pad4[144];                                 /* 0x0b0 */
+        __u8  _pad4[144];                               /* 0x0b0 */
         struct edid_info edid_info;                     /* 0x140 */
         struct efi_info efi_info;                       /* 0x1c0 */
-        u32 alt_mem_k;                                  /* 0x1e0 */
-        u32 scratch;            /* Scratch field! */    /* 0x1e4 */
-        u8  e820_entries;                               /* 0x1e8 */
-        u8  eddbuf_entries;                             /* 0x1e9 */
-        u8  edd_mbr_sig_buf_entries;                    /* 0x1ea */
-        u8  _pad6[6];                                   /* 0x1eb */
+        __u32 alt_mem_k;                                /* 0x1e0 */
+        __u32 scratch;          /* Scratch field! */    /* 0x1e4 */
+        __u8  e820_entries;                             /* 0x1e8 */
+        __u8  eddbuf_entries;                           /* 0x1e9 */
+        __u8  edd_mbr_sig_buf_entries;                  /* 0x1ea */
+        __u8  _pad6[6];                                 /* 0x1eb */
         struct setup_header hdr;    /* setup header */  /* 0x1f1 */
-        u8  _pad7[0x290-0x1f1-sizeof(struct setup_header)];
-        u32 edd_mbr_sig_buffer[EDD_MBR_SIG_MAX];        /* 0x290 */
+        __u8  _pad7[0x290-0x1f1-sizeof(struct setup_header)];
+        __u32 edd_mbr_sig_buffer[EDD_MBR_SIG_MAX];      /* 0x290 */
         struct e820entry e820_map[E820MAX];             /* 0x2d0 */
-        u8  _pad8[48];                                  /* 0xcd0 */
+        __u8  _pad8[48];                                /* 0xcd0 */
         struct edd_info eddbuf[EDDMAXNR];               /* 0xd00 */
-        u8  _pad9[276];                                 /* 0xeec */
+        __u8  _pad9[276];                               /* 0xeec */
 } __attribute__((packed));
 
 #endif /* _ASM_BOOTPARAM_H */
diff --git a/include/asm-x86/e820.h b/include/asm-x86/e820.h
index 5d4d2183e5db..3e214f39fad3 100644
--- a/include/asm-x86/e820.h
+++ b/include/asm-x86/e820.h
@@ -1,5 +1,33 @@
+#ifndef __ASM_E820_H
+#define __ASM_E820_H
+#define E820MAP 0x2d0           /* our map */
+#define E820MAX 128             /* number of entries in E820MAP */
+#define E820NR  0x1e8           /* # entries in E820MAP */
+
+#define E820_RAM        1
+#define E820_RESERVED   2
+#define E820_ACPI       3
+#define E820_NVS        4
+
+#ifndef __ASSEMBLY__
+struct e820entry {
+        __u64 addr;     /* start of memory segment */
+        __u64 size;     /* size of memory segment */
+        __u32 type;     /* type of memory segment */
+} __attribute__((packed));
+
+struct e820map {
+        __u32 nr_map;
+        struct e820entry map[E820MAX];
+};
+#endif /* __ASSEMBLY__ */
+
+#ifdef __KERNEL__
 #ifdef CONFIG_X86_32
 # include "e820_32.h"
 #else
 # include "e820_64.h"
 #endif
+#endif /* __KERNEL__ */
+
+#endif  /* __ASM_E820_H */
diff --git a/include/asm-x86/e820_32.h b/include/asm-x86/e820_32.h
index cf67dbb1db79..03f60c690c8a 100644
--- a/include/asm-x86/e820_32.h
+++ b/include/asm-x86/e820_32.h
@@ -12,30 +12,10 @@
 #ifndef __E820_HEADER
 #define __E820_HEADER
 
-#define E820MAP 0x2d0           /* our map */
-#define E820MAX 128             /* number of entries in E820MAP */
-#define E820NR  0x1e8           /* # entries in E820MAP */
-
-#define E820_RAM        1
-#define E820_RESERVED   2
-#define E820_ACPI       3
-#define E820_NVS        4
-
 #define HIGH_MEMORY     (1024*1024)
 
 #ifndef __ASSEMBLY__
 
-struct e820entry {
-        u64 addr;       /* start of memory segment */
-        u64 size;       /* size of memory segment */
-        u32 type;       /* type of memory segment */
-} __attribute__((packed));
-
-struct e820map {
-        u32 nr_map;
-        struct e820entry map[E820MAX];
-};
-
 extern struct e820map e820;
 
 extern int e820_all_mapped(unsigned long start, unsigned long end,
@@ -56,5 +36,4 @@ static inline void e820_mark_nosave_regions(void)
 #endif
 
 #endif/*!__ASSEMBLY__*/
-
 #endif/*__E820_HEADER*/
diff --git a/include/asm-x86/e820_64.h b/include/asm-x86/e820_64.h
index 3486e701bd86..0bd4787a5d57 100644
--- a/include/asm-x86/e820_64.h
+++ b/include/asm-x86/e820_64.h
@@ -11,27 +11,7 @@
 #ifndef __E820_HEADER
 #define __E820_HEADER
 
-#define E820MAP 0x2d0           /* our map */
-#define E820MAX 128             /* number of entries in E820MAP */
-#define E820NR  0x1e8           /* # entries in E820MAP */
-
-#define E820_RAM        1
-#define E820_RESERVED   2
-#define E820_ACPI       3
-#define E820_NVS        4
-
 #ifndef __ASSEMBLY__
-struct e820entry {
-        u64 addr;       /* start of memory segment */
-        u64 size;       /* size of memory segment */
-        u32 type;       /* type of memory segment */
-} __attribute__((packed));
-
-struct e820map {
-        u32 nr_map;
-        struct e820entry map[E820MAX];
-};
-
 extern unsigned long find_e820_area(unsigned long start, unsigned long end, 
                                     unsigned size);
 extern void add_memory_region(unsigned long start, unsigned long size, 
diff --git a/include/asm-x86/ist.h b/include/asm-x86/ist.h
index ef2003ebc6f9..6ec6ceed95a7 100644
--- a/include/asm-x86/ist.h
+++ b/include/asm-x86/ist.h
@@ -17,17 +17,17 @@
  */
 
 
-#ifdef __KERNEL__
-
 #include <linux/types.h>
 
 struct ist_info {
-        u32 signature;
-        u32 command;
-        u32 event;
-        u32 perf_level;
+        __u32 signature;
+        __u32 command;
+        __u32 event;
+        __u32 perf_level;
 };
 
+#ifdef __KERNEL__
+
 extern struct ist_info ist_info;
 
 #endif  /* __KERNEL__ */
diff --git a/include/asm-x86/lguest.h b/include/asm-x86/lguest.h
new file mode 100644
index 000000000000..ccd338460811
--- /dev/null
+++ b/include/asm-x86/lguest.h
@@ -0,0 +1,86 @@
+#ifndef _X86_LGUEST_H
+#define _X86_LGUEST_H
+
+#define GDT_ENTRY_LGUEST_CS     10
+#define GDT_ENTRY_LGUEST_DS     11
+#define LGUEST_CS               (GDT_ENTRY_LGUEST_CS * 8)
+#define LGUEST_DS               (GDT_ENTRY_LGUEST_DS * 8)
+
+#ifndef __ASSEMBLY__
+#include <asm/desc.h>
+
+#define GUEST_PL 1
+
+/* Every guest maps the core switcher code. */
+#define SHARED_SWITCHER_PAGES \
+        DIV_ROUND_UP(end_switcher_text - start_switcher_text, PAGE_SIZE)
+/* Pages for switcher itself, then two pages per cpu */
+#define TOTAL_SWITCHER_PAGES (SHARED_SWITCHER_PAGES + 2 * NR_CPUS)
+
+/* We map at -4M for ease of mapping into the guest (one PTE page). */
+#define SWITCHER_ADDR 0xFFC00000
+
+/* Found in switcher.S */
+extern unsigned long default_idt_entries[];
+
+struct lguest_regs
+{
+        /* Manually saved part. */
+        unsigned long eax, ebx, ecx, edx;
+        unsigned long esi, edi, ebp;
+        unsigned long gs;
+        unsigned long fs, ds, es;
+        unsigned long trapnum, errcode;
+        /* Trap pushed part */
+        unsigned long eip;
+        unsigned long cs;
+        unsigned long eflags;
+        unsigned long esp;
+        unsigned long ss;
+};
+
+/* This is a guest-specific page (mapped ro) into the guest. */
+struct lguest_ro_state
+{
+        /* Host information we need to restore when we switch back. */
+        u32 host_cr3;
+        struct Xgt_desc_struct host_idt_desc;
+        struct Xgt_desc_struct host_gdt_desc;
+        u32 host_sp;
+
+        /* Fields which are used when guest is running. */
+        struct Xgt_desc_struct guest_idt_desc;
+        struct Xgt_desc_struct guest_gdt_desc;
+        struct i386_hw_tss guest_tss;
+        struct desc_struct guest_idt[IDT_ENTRIES];
+        struct desc_struct guest_gdt[GDT_ENTRIES];
+};
+
+struct lguest_arch
+{
+        /* The GDT entries copied into lguest_ro_state when running. */
+        struct desc_struct gdt[GDT_ENTRIES];
+
+        /* The IDT entries: some copied into lguest_ro_state when running. */
+        struct desc_struct idt[IDT_ENTRIES];
+
+        /* The address of the last guest-visible pagefault (ie. cr2). */
+        unsigned long last_pagefault;
+};
+
+static inline void lguest_set_ts(void)
+{
+        u32 cr0;
+
+        cr0 = read_cr0();
+        if (!(cr0 & 8))
+                write_cr0(cr0|8);
+}
+
+/* Full 4G segment descriptors, suitable for CS and DS. */
+#define FULL_EXEC_SEGMENT ((struct desc_struct){0x0000ffff, 0x00cf9b00})
+#define FULL_SEGMENT ((struct desc_struct){0x0000ffff, 0x00cf9300})
+
+#endif /* __ASSEMBLY__ */
+
+#endif
diff --git a/include/asm-x86/lguest_hcall.h b/include/asm-x86/lguest_hcall.h
new file mode 100644
index 000000000000..f948491eb56a
--- /dev/null
+++ b/include/asm-x86/lguest_hcall.h
@@ -0,0 +1,71 @@
+/* Architecture specific portion of the lguest hypercalls */
+#ifndef _X86_LGUEST_HCALL_H
+#define _X86_LGUEST_HCALL_H
+
+#define LHCALL_FLUSH_ASYNC      0
+#define LHCALL_LGUEST_INIT      1
+#define LHCALL_CRASH            2
+#define LHCALL_LOAD_GDT         3
+#define LHCALL_NEW_PGTABLE      4
+#define LHCALL_FLUSH_TLB        5
+#define LHCALL_LOAD_IDT_ENTRY   6
+#define LHCALL_SET_STACK        7
+#define LHCALL_TS               8
+#define LHCALL_SET_CLOCKEVENT   9
+#define LHCALL_HALT             10
+#define LHCALL_SET_PTE          14
+#define LHCALL_SET_PMD          15
+#define LHCALL_LOAD_TLS         16
+#define LHCALL_NOTIFY           17
+
+/*G:031 First, how does our Guest contact the Host to ask for privileged
+ * operations?  There are two ways: the direct way is to make a "hypercall",
+ * to make requests of the Host Itself.
+ *
+ * Our hypercall mechanism uses the highest unused trap code (traps 32 and
+ * above are used by real hardware interrupts).  Seventeen hypercalls are
+ * available: the hypercall number is put in the %eax register, and the
+ * arguments (when required) are placed in %edx, %ebx and %ecx.  If a return
+ * value makes sense, it's returned in %eax.
+ *
+ * Grossly invalid calls result in Sudden Death at the hands of the vengeful
+ * Host, rather than returning failure.  This reflects Winston Churchill's
+ * definition of a gentleman: "someone who is only rude intentionally". */
+#define LGUEST_TRAP_ENTRY 0x1F
+
+#ifndef __ASSEMBLY__
+#include <asm/hw_irq.h>
+
+static inline unsigned long
+hcall(unsigned long call,
+      unsigned long arg1, unsigned long arg2, unsigned long arg3)
+{
+        /* "int" is the Intel instruction to trigger a trap. */
+        asm volatile("int $" __stringify(LGUEST_TRAP_ENTRY)
+                       /* The call is in %eax (aka "a"), and can be replaced */
+                     : "=a"(call)
+                       /* The other arguments are in %eax, %edx, %ebx & %ecx */
+                     : "a"(call), "d"(arg1), "b"(arg2), "c"(arg3)
+                       /* "memory" means this might write somewhere in memory.
+                        * This isn't true for all calls, but it's safe to tell
+                        * gcc that it might happen so it doesn't get clever. */
+                     : "memory");
+        return call;
+}
+/*:*/
+
+void async_hcall(unsigned long call,
+                 unsigned long arg1, unsigned long arg2, unsigned long arg3);
+
+/* Can't use our min() macro here: needs to be a constant */
+#define LGUEST_IRQS (NR_IRQS < 32 ? NR_IRQS: 32)
+
+#define LHCALL_RING_SIZE 64
+struct hcall_args
+{
+        /* These map directly onto eax, ebx, ecx, edx in struct lguest_regs */
+        unsigned long arg0, arg2, arg3, arg1;
+};
+
+#endif /* !__ASSEMBLY__ */
+#endif  /* _I386_LGUEST_HCALL_H */
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index e3ffd14a3f0b..6a65231bc785 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -186,6 +186,7 @@ unifdef-y += cyclades.h
 unifdef-y += dccp.h
 unifdef-y += dirent.h
 unifdef-y += dlm.h
+unifdef-y += edd.h
 unifdef-y += elfcore.h
 unifdef-y += errno.h
 unifdef-y += errqueue.h
@@ -306,6 +307,7 @@ unifdef-y += rtc.h
 unifdef-y += rtnetlink.h
 unifdef-y += scc.h
 unifdef-y += sched.h
+unifdef-y += screen_info.h
 unifdef-y += sdla.h
 unifdef-y += selinux_netlink.h
 unifdef-y += sem.h
@@ -341,6 +343,9 @@ unifdef-y += user.h
 unifdef-y += utsname.h
 unifdef-y += videodev2.h
 unifdef-y += videodev.h
+unifdef-y += virtio_config.h
+unifdef-y += virtio_blk.h
+unifdef-y += virtio_net.h
 unifdef-y += wait.h
 unifdef-y += wanrouter.h
 unifdef-y += watchdog.h
diff --git a/include/linux/apm_bios.h b/include/linux/apm_bios.h
index 5f921c84827a..9754baa14921 100644
--- a/include/linux/apm_bios.h
+++ b/include/linux/apm_bios.h
@@ -16,29 +16,29 @@
  * General Public License for more details.
  */
 
-typedef unsigned short  apm_event_t;
-typedef unsigned short  apm_eventinfo_t;
+#include <linux/types.h>
+
+struct apm_bios_info {
+        __u16   version;
+        __u16   cseg;
+        __u32   offset;
+        __u16   cseg_16;
+        __u16   dseg;
+        __u16   flags;
+        __u16   cseg_len;
+        __u16   cseg_16_len;
+        __u16   dseg_len;
+};
 
 #ifdef __KERNEL__
 
-#include <linux/types.h>
+typedef unsigned short  apm_event_t;
+typedef unsigned short  apm_eventinfo_t;
 
 #define APM_CS          (GDT_ENTRY_APMBIOS_BASE * 8)
 #define APM_CS_16       (APM_CS + 8)
 #define APM_DS          (APM_CS_16 + 8)
 
-struct apm_bios_info {
-        u16     version;
-        u16     cseg;
-        u32     offset;
-        u16     cseg_16;
-        u16     dseg;
-        u16     flags;
-        u16     cseg_len;
-        u16     cseg_16_len;
-        u16     dseg_len;
-};
-
 /* Results of APM Installation Check */
 #define APM_16_BIT_SUPPORT      0x0001
 #define APM_32_BIT_SUPPORT      0x0002
diff --git a/include/linux/edd.h b/include/linux/edd.h
index 7b647822d6dc..5d747c5cd0fe 100644
--- a/include/linux/edd.h
+++ b/include/linux/edd.h
@@ -67,113 +67,113 @@
 #define EDD_INFO_USE_INT13_FN50                (1 << 7)
 
 struct edd_device_params {
-        u16 length;
-        u16 info_flags;
-        u32 num_default_cylinders;
-        u32 num_default_heads;
-        u32 sectors_per_track;
-        u64 number_of_sectors;
-        u16 bytes_per_sector;
-        u32 dpte_ptr;           /* 0xFFFFFFFF for our purposes */
-        u16 key;                /* = 0xBEDD */
-        u8 device_path_info_length;     /* = 44 */
-        u8 reserved2;
-        u16 reserved3;
-        u8 host_bus_type[4];
-        u8 interface_type[8];
+        __u16 length;
+        __u16 info_flags;
+        __u32 num_default_cylinders;
+        __u32 num_default_heads;
+        __u32 sectors_per_track;
+        __u64 number_of_sectors;
+        __u16 bytes_per_sector;
+        __u32 dpte_ptr;         /* 0xFFFFFFFF for our purposes */
+        __u16 key;              /* = 0xBEDD */
+        __u8 device_path_info_length;   /* = 44 */
+        __u8 reserved2;
+        __u16 reserved3;
+        __u8 host_bus_type[4];
+        __u8 interface_type[8];
         union {
                 struct {
-                        u16 base_address;
-                        u16 reserved1;
-                        u32 reserved2;
+                        __u16 base_address;
+                        __u16 reserved1;
+                        __u32 reserved2;
                 } __attribute__ ((packed)) isa;
                 struct {
-                        u8 bus;
-                        u8 slot;
-                        u8 function;
-                        u8 channel;
-                        u32 reserved;
+                        __u8 bus;
+                        __u8 slot;
+                        __u8 function;
+                        __u8 channel;
+                        __u32 reserved;
                 } __attribute__ ((packed)) pci;
                 /* pcix is same as pci */
                 struct {
-                        u64 reserved;
+                        __u64 reserved;
                 } __attribute__ ((packed)) ibnd;
                 struct {
-                        u64 reserved;
+                        __u64 reserved;
                 } __attribute__ ((packed)) xprs;
                 struct {
-                        u64 reserved;
+                        __u64 reserved;
                 } __attribute__ ((packed)) htpt;
                 struct {
-                        u64 reserved;
+                        __u64 reserved;
                 } __attribute__ ((packed)) unknown;
         } interface_path;
         union {
                 struct {
-                        u8 device;
-                        u8 reserved1;
-                        u16 reserved2;
-                        u32 reserved3;
-                        u64 reserved4;
+                        __u8 device;
+                        __u8 reserved1;
+                        __u16 reserved2;
+                        __u32 reserved3;
+                        __u64 reserved4;
                 } __attribute__ ((packed)) ata;
                 struct {
-                        u8 device;
-                        u8 lun;
-                        u8 reserved1;
-                        u8 reserved2;
-                        u32 reserved3;
-                        u64 reserved4;
+                        __u8 device;
+                        __u8 lun;
+                        __u8 reserved1;
+                        __u8 reserved2;
+                        __u32 reserved3;
+                        __u64 reserved4;
                 } __attribute__ ((packed)) atapi;
                 struct {
-                        u16 id;
-                        u64 lun;
-                        u16 reserved1;
-                        u32 reserved2;
+                        __u16 id;
+                        __u64 lun;
+                        __u16 reserved1;
+                        __u32 reserved2;
                 } __attribute__ ((packed)) scsi;
                 struct {
-                        u64 serial_number;
-                        u64 reserved;
+                        __u64 serial_number;
+                        __u64 reserved;
                 } __attribute__ ((packed)) usb;
                 struct {
-                        u64 eui;
-                        u64 reserved;
+                        __u64 eui;
+                        __u64 reserved;
                 } __attribute__ ((packed)) i1394;
                 struct {
-                        u64 wwid;
-                        u64 lun;
+                        __u64 wwid;
+                        __u64 lun;
                 } __attribute__ ((packed)) fibre;
                 struct {
-                        u64 identity_tag;
-                        u64 reserved;
+                        __u64 identity_tag;
+                        __u64 reserved;
                 } __attribute__ ((packed)) i2o;
                 struct {
-                        u32 array_number;
-                        u32 reserved1;
-                        u64 reserved2;
+                        __u32 array_number;
+                        __u32 reserved1;
+                        __u64 reserved2;
                 } __attribute__ ((packed)) raid;
                 struct {
-                        u8 device;
-                        u8 reserved1;
-                        u16 reserved2;
-                        u32 reserved3;
-                        u64 reserved4;
+                        __u8 device;
+                        __u8 reserved1;
+                        __u16 reserved2;
+                        __u32 reserved3;
+                        __u64 reserved4;
                 } __attribute__ ((packed)) sata;
                 struct {
-                        u64 reserved1;
-                        u64 reserved2;
+                        __u64 reserved1;
+                        __u64 reserved2;
                 } __attribute__ ((packed)) unknown;
         } device_path;
-        u8 reserved4;
-        u8 checksum;
+        __u8 reserved4;
+        __u8 checksum;
 } __attribute__ ((packed));
 
 struct edd_info {
-        u8 device;
-        u8 version;
-        u16 interface_support;
-        u16 legacy_max_cylinder;
-        u8 legacy_max_head;
-        u8 legacy_sectors_per_track;
+        __u8 device;
+        __u8 version;
+        __u16 interface_support;
+        __u16 legacy_max_cylinder;
+        __u8 legacy_max_head;
+        __u8 legacy_sectors_per_track;
         struct edd_device_params params;
 } __attribute__ ((packed));
 
@@ -184,8 +184,9 @@ struct edd {
         unsigned char edd_info_nr;
 };
 
+#ifdef __KERNEL__
 extern struct edd edd;
-
+#endif /* __KERNEL__ */
 #endif                          /*!__ASSEMBLY__ */
 
 #endif                          /* _LINUX_EDD_H */
diff --git a/include/linux/lguest.h b/include/linux/lguest.h
index 157ad64aa7ce..8beb29134626 100644
--- a/include/linux/lguest.h
+++ b/include/linux/lguest.h
@@ -1,76 +1,16 @@
 /* Things the lguest guest needs to know.  Note: like all lguest interfaces,
  * this is subject to wild and random change between versions. */
-#ifndef _ASM_LGUEST_H
-#define _ASM_LGUEST_H
+#ifndef _LINUX_LGUEST_H
+#define _LINUX_LGUEST_H
 
 #ifndef __ASSEMBLY__
+#include <linux/time.h>
 #include <asm/irq.h>
-
-#define LHCALL_FLUSH_ASYNC      0
-#define LHCALL_LGUEST_INIT      1
-#define LHCALL_CRASH            2
-#define LHCALL_LOAD_GDT         3
-#define LHCALL_NEW_PGTABLE      4
-#define LHCALL_FLUSH_TLB        5
-#define LHCALL_LOAD_IDT_ENTRY   6
-#define LHCALL_SET_STACK        7
-#define LHCALL_TS               8
-#define LHCALL_SET_CLOCKEVENT   9
-#define LHCALL_HALT             10
-#define LHCALL_BIND_DMA         12
-#define LHCALL_SEND_DMA         13
-#define LHCALL_SET_PTE          14
-#define LHCALL_SET_PMD          15
-#define LHCALL_LOAD_TLS         16
+#include <asm/lguest_hcall.h>
 
 #define LG_CLOCK_MIN_DELTA      100UL
 #define LG_CLOCK_MAX_DELTA      ULONG_MAX
 
-/*G:031 First, how does our Guest contact the Host to ask for privileged
- * operations?  There are two ways: the direct way is to make a "hypercall",
- * to make requests of the Host Itself.
- *
- * Our hypercall mechanism uses the highest unused trap code (traps 32 and
- * above are used by real hardware interrupts).  Seventeen hypercalls are
- * available: the hypercall number is put in the %eax register, and the
- * arguments (when required) are placed in %edx, %ebx and %ecx.  If a return
- * value makes sense, it's returned in %eax.
- *
- * Grossly invalid calls result in Sudden Death at the hands of the vengeful
- * Host, rather than returning failure.  This reflects Winston Churchill's
- * definition of a gentleman: "someone who is only rude intentionally". */
-#define LGUEST_TRAP_ENTRY 0x1F
-
-static inline unsigned long
-hcall(unsigned long call,
-      unsigned long arg1, unsigned long arg2, unsigned long arg3)
-{
-        /* "int" is the Intel instruction to trigger a trap. */
-        asm volatile("int $" __stringify(LGUEST_TRAP_ENTRY)
-                       /* The call is in %eax (aka "a"), and can be replaced */
-                     : "=a"(call)
-                       /* The other arguments are in %eax, %edx, %ebx & %ecx */
-                     : "a"(call), "d"(arg1), "b"(arg2), "c"(arg3)
-                       /* "memory" means this might write somewhere in memory.
-                        * This isn't true for all calls, but it's safe to tell
-                        * gcc that it might happen so it doesn't get clever. */
-                     : "memory");
-        return call;
-}
-/*:*/
-
-void async_hcall(unsigned long call,
-                 unsigned long arg1, unsigned long arg2, unsigned long arg3);
-
-/* Can't use our min() macro here: needs to be a constant */
-#define LGUEST_IRQS (NR_IRQS < 32 ? NR_IRQS: 32)
-
-#define LHCALL_RING_SIZE 64
-struct hcall_ring
-{
-        u32 eax, edx, ebx, ecx;
-};
-
 /*G:032 The second method of communicating with the Host is to via "struct
  * lguest_data".  The Guest's very first hypercall is to tell the Host where
  * this is, and then the Guest and Host both publish information in it. :*/
@@ -97,20 +37,24 @@ struct lguest_data
         /* 0xFF == done (set by Host), 0 == pending (set by Guest). */
         u8 hcall_status[LHCALL_RING_SIZE];
         /* The actual registers for the hypercalls. */
-        struct hcall_ring hcalls[LHCALL_RING_SIZE];
+        struct hcall_args hcalls[LHCALL_RING_SIZE];
 
 /* Fields initialized by the Host at boot: */
         /* Memory not to try to access */
         unsigned long reserve_mem;
-        /* ID of this Guest (used by network driver to set ethernet address) */
-        u16 guestid;
         /* KHz for the TSC clock. */
         u32 tsc_khz;
+        /* Page where the top-level pagetable is */
+        unsigned long pgdir;
 
 /* Fields initialized by the Guest at boot: */
         /* Instruction range to suppress interrupts even if enabled */
         unsigned long noirq_start, noirq_end;
+        /* Address above which page tables are all identical. */
+        unsigned long kernel_address;
+        /* The vector to try to use for system calls (0x40 or 0x80). */
+        unsigned int syscall_vec;
 };
 extern struct lguest_data lguest_data;
 #endif /* __ASSEMBLY__ */
-#endif  /* _ASM_LGUEST_H */
+#endif  /* _LINUX_LGUEST_H */
diff --git a/include/linux/lguest_bus.h b/include/linux/lguest_bus.h
deleted file mode 100644
index d27853ddc644..000000000000
--- a/include/linux/lguest_bus.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef _ASM_LGUEST_DEVICE_H
-#define _ASM_LGUEST_DEVICE_H
-/* Everything you need to know about lguest devices. */
-#include <linux/device.h>
-#include <linux/lguest.h>
-#include <linux/lguest_launcher.h>
-
-struct lguest_device {
-        /* Unique busid, and index into lguest_page->devices[] */
-        unsigned int index;
-
-        struct device dev;
-
-        /* Driver can hang data off here. */
-        void *private;
-};
-
-/*D:380 Since interrupt numbers are arbitrary, we use a convention: each device
- * can use the interrupt number corresponding to its index.  The +1 is because
- * interrupt 0 is not usable (it's actually the timer interrupt). */
-static inline int lgdev_irq(const struct lguest_device *dev)
-{
-        return dev->index + 1;
-}
-/*:*/
-
-/* dma args must not be vmalloced! */
-void lguest_send_dma(unsigned long key, struct lguest_dma *dma);
-int lguest_bind_dma(unsigned long key, struct lguest_dma *dmas,
-                    unsigned int num, u8 irq);
-void lguest_unbind_dma(unsigned long key, struct lguest_dma *dmas);
-
-/* Map the virtual device space */
-void *lguest_map(unsigned long phys_addr, unsigned long pages);
-void lguest_unmap(void *);
-
-struct lguest_driver {
-        const char *name;
-        struct module *owner;
-        u16 device_type;
-        int (*probe)(struct lguest_device *dev);
-        void (*remove)(struct lguest_device *dev);
-
-        struct device_driver drv;
-};
-
-extern int register_lguest_driver(struct lguest_driver *drv);
-extern void unregister_lguest_driver(struct lguest_driver *drv);
-
-extern struct lguest_device_desc *lguest_devices; /* Just past max_pfn */
-#endif /* _ASM_LGUEST_DEVICE_H */
diff --git a/include/linux/lguest_launcher.h b/include/linux/lguest_launcher.h
index 641670579446..61e1e3e6b1cc 100644
--- a/include/linux/lguest_launcher.h
+++ b/include/linux/lguest_launcher.h
@@ -1,6 +1,7 @@
 #ifndef _ASM_LGUEST_USER
 #define _ASM_LGUEST_USER
 /* Everything the "lguest" userspace program needs to know. */
+#include <linux/types.h>
 /* They can register up to 32 arrays of lguest_dma. */
 #define LGUEST_MAX_DMA          32
 /* At most we can dma 16 lguest_dma in one op. */
@@ -9,66 +10,6 @@
 /* How many devices?  Assume each one wants up to two dma arrays per device. */
 #define LGUEST_MAX_DEVICES (LGUEST_MAX_DMA/2)
 
-/*D:200
- * Lguest I/O
- *
- * The lguest I/O mechanism is the only way Guests can talk to devices.  There
- * are two hypercalls involved: SEND_DMA for output and BIND_DMA for input.  In
- * each case, "struct lguest_dma" describes the buffer: this contains 16
- * addr/len pairs, and if there are fewer buffer elements the len array is
- * terminated with a 0.
- *
- * I/O is organized by keys: BIND_DMA attaches buffers to a particular key, and
- * SEND_DMA transfers to buffers bound to particular key.  By convention, keys
- * correspond to a physical address within the device's page.  This means that
- * devices will never accidentally end up with the same keys, and allows the
- * Host use The Futex Trick (as we'll see later in our journey).
- *
- * SEND_DMA simply indicates a key to send to, and the physical address of the
- * "struct lguest_dma" to send.  The Host will write the number of bytes
- * transferred into the "struct lguest_dma"'s used_len member.
- *
- * BIND_DMA indicates a key to bind to, a pointer to an array of "struct
- * lguest_dma"s ready for receiving, the size of that array, and an interrupt
- * to trigger when data is received.  The Host will only allow transfers into
- * buffers with a used_len of zero: it then sets used_len to the number of
- * bytes transferred and triggers the interrupt for the Guest to process the
- * new input. */
-struct lguest_dma
-{
-        /* 0 if free to be used, filled by the Host. */
-        u32 used_len;
-        unsigned long addr[LGUEST_MAX_DMA_SECTIONS];
-        u16 len[LGUEST_MAX_DMA_SECTIONS];
-};
-/*:*/
-
-/*D:460 This is the layout of a block device memory page.  The Launcher sets up
- * the num_sectors initially to tell the Guest the size of the disk.  The Guest
- * puts the type, sector and length of the request in the first three fields,
- * then DMAs to the Host.  The Host processes the request, sets up the result,
- * then DMAs back to the Guest. */
-struct lguest_block_page
-{
-        /* 0 is a read, 1 is a write. */
-        int type;
-        u32 sector;     /* Offset in device = sector * 512. */
-        u32 bytes;      /* Length expected to be read/written in bytes */
-        /* 0 = pending, 1 = done, 2 = done, error */
-        int result;
-        u32 num_sectors; /* Disk length = num_sectors * 512 */
-};
-
-/*D:520 The network device is basically a memory page where all the Guests on
- * the network publish their MAC (ethernet) addresses: it's an array of "struct
- * lguest_net": */
-struct lguest_net
-{
-        /* Simply the mac address (with multicast bit meaning promisc). */
-        unsigned char mac[6];
-};
-/*:*/
-
 /* Where the Host expects the Guest to SEND_DMA console output to. */
 #define LGUEST_CONSOLE_DMA_KEY 0
 
@@ -81,38 +22,29 @@ struct lguest_net
  * complex burden for the Host and suboptimal for the Guest, so we have our own
  * "lguest" bus and simple drivers.
  *
- * Devices are described by an array of LGUEST_MAX_DEVICES of these structs,
- * placed by the Launcher just above the top of physical memory:
+ * Devices are described by a simplified ID, a status byte, and some "config"
+ * bytes which describe this device's configuration.  This is placed by the
+ * Launcher just above the top of physical memory:
  */
 struct lguest_device_desc {
-        /* The device type: console, network, disk etc. */
-        u16 type;
-#define LGUEST_DEVICE_T_CONSOLE 1
-#define LGUEST_DEVICE_T_NET     2
-#define LGUEST_DEVICE_T_BLOCK   3
-
-        /* The specific features of this device: these depends on device type
-         * except for LGUEST_DEVICE_F_RANDOMNESS. */
-        u16 features;
-#define LGUEST_NET_F_NOCSUM             0x4000 /* Don't bother checksumming */
-#define LGUEST_DEVICE_F_RANDOMNESS      0x8000 /* IRQ is fairly random */
-
-        /* This is how the Guest reports status of the device: the Host can set
-         * LGUEST_DEVICE_S_REMOVED to indicate removal, but the rest are only
-         * ever manipulated by the Guest, and only ever set. */
-        u16 status;
-/* 256 and above are device specific. */
-#define LGUEST_DEVICE_S_ACKNOWLEDGE     1 /* We have seen device. */
-#define LGUEST_DEVICE_S_DRIVER          2 /* We have found a driver */
-#define LGUEST_DEVICE_S_DRIVER_OK       4 /* Driver says OK! */
-#define LGUEST_DEVICE_S_REMOVED         8 /* Device has gone away. */
-#define LGUEST_DEVICE_S_REMOVED_ACK     16 /* Driver has been told. */
-#define LGUEST_DEVICE_S_FAILED          128 /* Something actually failed */
+        /* The device type: console, network, disk etc.  Type 0 terminates. */
+        __u8 type;
+        /* The number of bytes of the config array. */
+        __u8 config_len;
+        /* A status byte, written by the Guest. */
+        __u8 status;
+        __u8 config[0];
+};
 
-        /* Each device exists somewhere in Guest physical memory, over some
-         * number of pages. */
-        u16 num_pages;
-        u32 pfn;
+/*D:135 This is how we expect the device configuration field for a virtqueue
+ * (type VIRTIO_CONFIG_F_VIRTQUEUE) to be laid out: */
+struct lguest_vqconfig {
+        /* The number of entries in the virtio_ring */
+        __u16 num;
+        /* The interrupt we get when something happens. */
+        __u16 irq;
+        /* The page number of the virtio ring for this device. */
+        __u32 pfn;
 };
 /*:*/
 
@@ -120,7 +52,7 @@ struct lguest_device_desc {
 enum lguest_req
 {
         LHREQ_INITIALIZE, /* + pfnlimit, pgdir, start, pageoffset */
-        LHREQ_GETDMA, /* + addr (returns &lguest_dma, irq in ->used_len) */
+        LHREQ_GETDMA, /* No longer used */
         LHREQ_IRQ, /* + irq */
         LHREQ_BREAK, /* + on/off flag (on blocks until someone does off) */
 };
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 522b0dd836cf..e9fddb42f26c 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -361,4 +361,10 @@ struct ssb_device_id {
 #define SSB_ANY_ID              0xFFFF
 #define SSB_ANY_REV             0xFF
 
+struct virtio_device_id {
+        __u32 device;
+        __u32 vendor;
+};
+#define VIRTIO_DEV_ANY_ID       0xffffffff
+
 #endif /* LINUX_MOD_DEVICETABLE_H */
diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
index ba81ffe9958a..827b85bbf388 100644
--- a/include/linux/screen_info.h
+++ b/include/linux/screen_info.h
@@ -8,45 +8,43 @@
  */
 
 struct screen_info {
-        u8  orig_x;             /* 0x00 */
-        u8  orig_y;             /* 0x01 */
-        u16 ext_mem_k;          /* 0x02 */
-        u16 orig_video_page;    /* 0x04 */
-        u8  orig_video_mode;    /* 0x06 */
-        u8  orig_video_cols;    /* 0x07 */
-        u16 unused2;            /* 0x08 */
-        u16 orig_video_ega_bx;  /* 0x0a */
-        u16 unused3;            /* 0x0c */
-        u8  orig_video_lines;   /* 0x0e */
-        u8  orig_video_isVGA;   /* 0x0f */
-        u16 orig_video_points;  /* 0x10 */
+        __u8  orig_x;           /* 0x00 */
+        __u8  orig_y;           /* 0x01 */
+        __u16 ext_mem_k;        /* 0x02 */
+        __u16 orig_video_page;  /* 0x04 */
+        __u8  orig_video_mode;  /* 0x06 */
+        __u8  orig_video_cols;  /* 0x07 */
+        __u16 unused2;          /* 0x08 */
+        __u16 orig_video_ega_bx;/* 0x0a */
+        __u16 unused3;          /* 0x0c */
+        __u8  orig_video_lines; /* 0x0e */
+        __u8  orig_video_isVGA; /* 0x0f */
+        __u16 orig_video_points;/* 0x10 */
 
         /* VESA graphic mode -- linear frame buffer */
-        u16 lfb_width;          /* 0x12 */
-        u16 lfb_height;         /* 0x14 */
-        u16 lfb_depth;          /* 0x16 */
-        u32 lfb_base;           /* 0x18 */
-        u32 lfb_size;           /* 0x1c */
-        u16 cl_magic, cl_offset; /* 0x20 */
-        u16 lfb_linelength;     /* 0x24 */
-        u8  red_size;           /* 0x26 */
-        u8  red_pos;            /* 0x27 */
-        u8  green_size;         /* 0x28 */
-        u8  green_pos;          /* 0x29 */
-        u8  blue_size;          /* 0x2a */
-        u8  blue_pos;           /* 0x2b */
-        u8  rsvd_size;          /* 0x2c */
-        u8  rsvd_pos;           /* 0x2d */
-        u16 vesapm_seg;         /* 0x2e */
-        u16 vesapm_off;         /* 0x30 */
-        u16 pages;              /* 0x32 */
-        u16 vesa_attributes;    /* 0x34 */
-        u32 capabilities;       /* 0x36 */
-        u8  _reserved[6];       /* 0x3a */
+        __u16 lfb_width;        /* 0x12 */
+        __u16 lfb_height;       /* 0x14 */
+        __u16 lfb_depth;        /* 0x16 */
+        __u32 lfb_base;         /* 0x18 */
+        __u32 lfb_size;         /* 0x1c */
+        __u16 cl_magic, cl_offset; /* 0x20 */
+        __u16 lfb_linelength;   /* 0x24 */
+        __u8  red_size;         /* 0x26 */
+        __u8  red_pos;          /* 0x27 */
+        __u8  green_size;       /* 0x28 */
+        __u8  green_pos;        /* 0x29 */
+        __u8  blue_size;        /* 0x2a */
+        __u8  blue_pos;         /* 0x2b */
+        __u8  rsvd_size;        /* 0x2c */
+        __u8  rsvd_pos;         /* 0x2d */
+        __u16 vesapm_seg;       /* 0x2e */
+        __u16 vesapm_off;       /* 0x30 */
+        __u16 pages;            /* 0x32 */
+        __u16 vesa_attributes;  /* 0x34 */
+        __u32 capabilities;     /* 0x36 */
+        __u8  _reserved[6];     /* 0x3a */
 } __attribute__((packed));
 
-extern struct screen_info screen_info;
-
 #define VIDEO_TYPE_MDA          0x10    /* Monochrome Text Display      */
 #define VIDEO_TYPE_CGA          0x11    /* CGA Display                  */
 #define VIDEO_TYPE_EGAM         0x20    /* EGA/VGA in Monochrome Mode   */
@@ -65,4 +63,17 @@ extern struct screen_info screen_info;
 
 #define VIDEO_TYPE_PMAC         0x60    /* PowerMacintosh frame buffer. */
 
+#ifdef __KERNEL__
+extern struct screen_info screen_info;
+
+#define ORIG_X                  (screen_info.orig_x)
+#define ORIG_Y                  (screen_info.orig_y)
+#define ORIG_VIDEO_MODE         (screen_info.orig_video_mode)
+#define ORIG_VIDEO_COLS         (screen_info.orig_video_cols)
+#define ORIG_VIDEO_EGA_BX       (screen_info.orig_video_ega_bx)
+#define ORIG_VIDEO_LINES        (screen_info.orig_video_lines)
+#define ORIG_VIDEO_ISVGA        (screen_info.orig_video_isVGA)
+#define ORIG_VIDEO_POINTS       (screen_info.orig_video_points)
+#endif /* __KERNEL__ */
+
 #endif /* _SCREEN_INFO_H */
diff --git a/include/linux/virtio.h b/include/linux/virtio.h
new file mode 100644
index 000000000000..14e1379876d3
--- /dev/null
+++ b/include/linux/virtio.h
@@ -0,0 +1,110 @@
+#ifndef _LINUX_VIRTIO_H
+#define _LINUX_VIRTIO_H
+/* Everything a virtio driver needs to work with any particular virtio
+ * implementation. */
+#include <linux/types.h>
+#include <linux/scatterlist.h>
+#include <linux/spinlock.h>
+#include <linux/device.h>
+#include <linux/mod_devicetable.h>
+
+/**
+ * virtqueue - a queue to register buffers for sending or receiving.
+ * @callback: the function to call when buffers are consumed (can be NULL).
+ *    If this returns false, callbacks are suppressed until vq_ops->restart
+ *    is called.
+ * @vdev: the virtio device this queue was created for.
+ * @vq_ops: the operations for this virtqueue (see below).
+ * @priv: a pointer for the virtqueue implementation to use.
+ */
+struct virtqueue
+{
+        bool (*callback)(struct virtqueue *vq);
+        struct virtio_device *vdev;
+        struct virtqueue_ops *vq_ops;
+        void *priv;
+};
+
+/**
+ * virtqueue_ops - operations for virtqueue abstraction layer
+ * @add_buf: expose buffer to other end
+ *      vq: the struct virtqueue we're talking about.
+ *      sg: the description of the buffer(s).
+ *      out_num: the number of sg readable by other side
+ *      in_num: the number of sg which are writable (after readable ones)
+ *      data: the token identifying the buffer.
+ *      Returns 0 or an error.
+ * @kick: update after add_buf
+ *      vq: the struct virtqueue
+ *      After one or more add_buf calls, invoke this to kick the other side.
+ * @get_buf: get the next used buffer
+ *      vq: the struct virtqueue we're talking about.
+ *      len: the length written into the buffer
+ *      Returns NULL or the "data" token handed to add_buf.
+ * @restart: restart callbacks after callback returned false.
+ *      vq: the struct virtqueue we're talking about.
+ *      This returns "false" (and doesn't re-enable) if there are pending
+ *      buffers in the queue, to avoid a race.
+ * @shutdown: "unadd" all buffers.
+ *      vq: the struct virtqueue we're talking about.
+ *      Remove everything from the queue.
+ *
+ * Locking rules are straightforward: the driver is responsible for
+ * locking.  No two operations may be invoked simultaneously.
+ *
+ * All operations can be called in any context.
+ */
+struct virtqueue_ops {
+        int (*add_buf)(struct virtqueue *vq,
+                       struct scatterlist sg[],
+                       unsigned int out_num,
+                       unsigned int in_num,
+                       void *data);
+
+        void (*kick)(struct virtqueue *vq);
+
+        void *(*get_buf)(struct virtqueue *vq, unsigned int *len);
+
+        bool (*restart)(struct virtqueue *vq);
+
+        void (*shutdown)(struct virtqueue *vq);
+};
+
+/**
+ * virtio_device - representation of a device using virtio
+ * @index: unique position on the virtio bus
+ * @dev: underlying device.
+ * @id: the device type identification (used to match it with a driver).
+ * @config: the configuration ops for this device.
+ * @priv: private pointer for the driver's use.
+ */
+struct virtio_device
+{
+        int index;
+        struct device dev;
+        struct virtio_device_id id;
+        struct virtio_config_ops *config;
+        void *priv;
+};
+
+int register_virtio_device(struct virtio_device *dev);
+void unregister_virtio_device(struct virtio_device *dev);
+
+/**
+ * virtio_driver - operations for a virtio I/O driver
+ * @driver: underlying device driver (populate name and owner).
+ * @id_table: the ids serviced by this driver.
+ * @probe: the function to call when a device is found.  Returns a token for
+ *    remove, or PTR_ERR().
+ * @remove: the function when a device is removed.
+ */
+struct virtio_driver {
+        struct device_driver driver;
+        const struct virtio_device_id *id_table;
+        int (*probe)(struct virtio_device *dev);
+        void (*remove)(struct virtio_device *dev);
+};
+
+int register_virtio_driver(struct virtio_driver *drv);
+void unregister_virtio_driver(struct virtio_driver *drv);
+#endif /* _LINUX_VIRTIO_H */
diff --git a/include/linux/virtio_blk.h b/include/linux/virtio_blk.h
new file mode 100644
index 000000000000..7bd2bce0cfd9
--- /dev/null
+++ b/include/linux/virtio_blk.h
@@ -0,0 +1,51 @@
+#ifndef _LINUX_VIRTIO_BLK_H
+#define _LINUX_VIRTIO_BLK_H
+#include <linux/virtio_config.h>
+
+/* The ID for virtio_block */
+#define VIRTIO_ID_BLOCK 2
+
+/* Feature bits */
+#define VIRTIO_CONFIG_BLK_F     0x40
+#define VIRTIO_BLK_F_BARRIER    1       /* Does host support barriers? */
+
+/* The capacity (in 512-byte sectors). */
+#define VIRTIO_CONFIG_BLK_F_CAPACITY    0x41
+/* The maximum segment size. */
+#define VIRTIO_CONFIG_BLK_F_SIZE_MAX    0x42
+/* The maximum number of segments. */
+#define VIRTIO_CONFIG_BLK_F_SEG_MAX     0x43
+
+/* These two define direction. */
+#define VIRTIO_BLK_T_IN         0
+#define VIRTIO_BLK_T_OUT        1
+
+/* This bit says it's a scsi command, not an actual read or write. */
+#define VIRTIO_BLK_T_SCSI_CMD   2
+
+/* Barrier before this op. */
+#define VIRTIO_BLK_T_BARRIER    0x80000000
+
+/* This is the first element of the read scatter-gather list. */
+struct virtio_blk_outhdr
+{
+        /* VIRTIO_BLK_T* */
+        __u32 type;
+        /* io priority. */
+        __u32 ioprio;
+        /* Sector (ie. 512 byte offset) */
+        __u64 sector;
+        /* Where to put reply. */
+        __u64 id;
+};
+
+#define VIRTIO_BLK_S_OK         0
+#define VIRTIO_BLK_S_IOERR      1
+#define VIRTIO_BLK_S_UNSUPP     2
+
+/* This is the first element of the write scatter-gather list */
+struct virtio_blk_inhdr
+{
+        unsigned char status;
+};
+#endif /* _LINUX_VIRTIO_BLK_H */
diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h
new file mode 100644
index 000000000000..bcc01888df78
--- /dev/null
+++ b/include/linux/virtio_config.h
@@ -0,0 +1,111 @@
+#ifndef _LINUX_VIRTIO_CONFIG_H
+#define _LINUX_VIRTIO_CONFIG_H
+/* Virtio devices use a standardized configuration space to define their
+ * features and pass configuration information, but each implementation can
+ * store and access that space differently. */
+#include <linux/types.h>
+
+/* Status byte for guest to report progress, and synchronize config. */
+/* We have seen device and processed generic fields (VIRTIO_CONFIG_F_VIRTIO) */
+#define VIRTIO_CONFIG_S_ACKNOWLEDGE     1
+/* We have found a driver for the device. */
+#define VIRTIO_CONFIG_S_DRIVER          2
+/* Driver has used its parts of the config, and is happy */
+#define VIRTIO_CONFIG_S_DRIVER_OK       4
+/* We've given up on this device. */
+#define VIRTIO_CONFIG_S_FAILED          0x80
+
+/* Feature byte (actually 7 bits availabe): */
+/* Requirements/features of the virtio implementation. */
+#define VIRTIO_CONFIG_F_VIRTIO 1
+/* Requirements/features of the virtqueue (may have more than one). */
+#define VIRTIO_CONFIG_F_VIRTQUEUE 2
+
+#ifdef __KERNEL__
+struct virtio_device;
+
+/**
+ * virtio_config_ops - operations for configuring a virtio device
+ * @find: search for the next configuration field of the given type.
+ *      vdev: the virtio_device
+ *      type: the feature type
+ *      len: the (returned) length of the field if found.
+ *      Returns a token if found, or NULL.  Never returnes the same field twice
+ *      (ie. it's used up).
+ * @get: read the value of a configuration field after find().
+ *      vdev: the virtio_device
+ *      token: the token returned from find().
+ *      buf: the buffer to write the field value into.
+ *      len: the length of the buffer (given by find()).
+ *      Note that contents are conventionally little-endian.
+ * @set: write the value of a configuration field after find().
+ *      vdev: the virtio_device
+ *      token: the token returned from find().
+ *      buf: the buffer to read the field value from.
+ *      len: the length of the buffer (given by find()).
+ *      Note that contents are conventionally little-endian.
+ * @get_status: read the status byte
+ *      vdev: the virtio_device
+ *      Returns the status byte
+ * @set_status: write the status byte
+ *      vdev: the virtio_device
+ *      status: the new status byte
+ * @find_vq: find the first VIRTIO_CONFIG_F_VIRTQUEUE and create a virtqueue.
+ *      vdev: the virtio_device
+ *      callback: the virqtueue callback
+ *      Returns the new virtqueue or ERR_PTR().
+ * @del_vq: free a virtqueue found by find_vq().
+ */
+struct virtio_config_ops
+{
+        void *(*find)(struct virtio_device *vdev, u8 type, unsigned *len);
+        void (*get)(struct virtio_device *vdev, void *token,
+                    void *buf, unsigned len);
+        void (*set)(struct virtio_device *vdev, void *token,
+                    const void *buf, unsigned len);
+        u8 (*get_status)(struct virtio_device *vdev);
+        void (*set_status)(struct virtio_device *vdev, u8 status);
+        struct virtqueue *(*find_vq)(struct virtio_device *vdev,
+                                     bool (*callback)(struct virtqueue *));
+        void (*del_vq)(struct virtqueue *vq);
+};
+
+/**
+ * virtio_config_val - get a single virtio config and mark it used.
+ * @config: the virtio config space
+ * @type: the type to search for.
+ * @val: a pointer to the value to fill in.
+ *
+ * Once used, the config type is marked with VIRTIO_CONFIG_F_USED so it can't
+ * be found again.  This version does endian conversion. */
+#define virtio_config_val(vdev, type, v) ({                             \
+        int _err = __virtio_config_val((vdev),(type),(v),sizeof(*(v))); \
+                                                                        \
+        BUILD_BUG_ON(sizeof(*(v)) != 1 && sizeof(*(v)) != 2             \
+                     && sizeof(*(v)) != 4 && sizeof(*(v)) != 8);        \
+        if (!_err) {                                                    \
+                switch (sizeof(*(v))) {                                 \
+                case 2: le16_to_cpus((__u16 *) v); break;               \
+                case 4: le32_to_cpus((__u32 *) v); break;               \
+                case 8: le64_to_cpus((__u64 *) v); break;               \
+                }                                                       \
+        }                                                               \
+        _err;                                                           \
+})
+
+int __virtio_config_val(struct virtio_device *dev,
+                        u8 type, void *val, size_t size);
+
+/**
+ * virtio_use_bit - helper to use a feature bit in a bitfield value.
+ * @dev: the virtio device
+ * @token: the token as returned from vdev->config->find().
+ * @len: the length of the field.
+ * @bitnum: the bit to test.
+ *
+ * If handed a NULL token, it returns false, otherwise returns bit status.
+ * If it's one, it sets the mirroring acknowledgement bit. */
+int virtio_use_bit(struct virtio_device *vdev,
+                   void *token, unsigned int len, unsigned int bitnum);
+#endif /* __KERNEL__ */
+#endif /* _LINUX_VIRTIO_CONFIG_H */
diff --git a/include/linux/virtio_console.h b/include/linux/virtio_console.h
new file mode 100644
index 000000000000..ed2d4ead7eb7
--- /dev/null
+++ b/include/linux/virtio_console.h
@@ -0,0 +1,12 @@
+#ifndef _LINUX_VIRTIO_CONSOLE_H
+#define _LINUX_VIRTIO_CONSOLE_H
+#include <linux/virtio_config.h>
+
+/* The ID for virtio console */
+#define VIRTIO_ID_CONSOLE       3
+
+#ifdef __KERNEL__
+int __init virtio_cons_early_init(int (*put_chars)(u32, const char *, int));
+#endif /* __KERNEL__ */
+
+#endif /* _LINUX_VIRTIO_CONSOLE_H */
diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h
new file mode 100644
index 000000000000..ae469ae55d36
--- /dev/null
+++ b/include/linux/virtio_net.h
@@ -0,0 +1,36 @@
+#ifndef _LINUX_VIRTIO_NET_H
+#define _LINUX_VIRTIO_NET_H
+#include <linux/virtio_config.h>
+
+/* The ID for virtio_net */
+#define VIRTIO_ID_NET   1
+
+/* The bitmap of config for virtio net */
+#define VIRTIO_CONFIG_NET_F     0x40
+#define VIRTIO_NET_F_NO_CSUM    0
+#define VIRTIO_NET_F_TSO4       1
+#define VIRTIO_NET_F_UFO        2
+#define VIRTIO_NET_F_TSO4_ECN   3
+#define VIRTIO_NET_F_TSO6       4
+
+/* The config defining mac address. */
+#define VIRTIO_CONFIG_NET_MAC_F 0x41
+
+/* This is the first element of the scatter-gather list.  If you don't
+ * specify GSO or CSUM features, you can simply ignore the header. */
+struct virtio_net_hdr
+{
+#define VIRTIO_NET_HDR_F_NEEDS_CSUM     1       // Use csum_start, csum_offset
+      __u8 flags;
+#define VIRTIO_NET_HDR_GSO_NONE         0       // Not a GSO frame
+#define VIRTIO_NET_HDR_GSO_TCPV4        1       // GSO frame, IPv4 TCP (TSO)
+/* FIXME: Do we need this?  If they said they can handle ECN, do they care? */
+#define VIRTIO_NET_HDR_GSO_TCPV4_ECN    2       // GSO frame, IPv4 TCP w/ ECN
+#define VIRTIO_NET_HDR_GSO_UDP          3       // GSO frame, IPv4 UDP (UFO)
+#define VIRTIO_NET_HDR_GSO_TCPV6        4       // GSO frame, IPv6 TCP
+      __u8 gso_type;
+      __u16 gso_size;
+      __u16 csum_start;
+      __u16 csum_offset;
+};
+#endif /* _LINUX_VIRTIO_NET_H */
diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h
new file mode 100644
index 000000000000..ac69e7bb5a14
--- /dev/null
+++ b/include/linux/virtio_ring.h
@@ -0,0 +1,119 @@
+#ifndef _LINUX_VIRTIO_RING_H
+#define _LINUX_VIRTIO_RING_H
+/* An interface for efficient virtio implementation, currently for use by KVM
+ * and lguest, but hopefully others soon.  Do NOT change this since it will
+ * break existing servers and clients.
+ *
+ * This header is BSD licensed so anyone can use the definitions to implement
+ * compatible drivers/servers.
+ *
+ * Copyright Rusty Russell IBM Corporation 2007. */
+#include <linux/types.h>
+
+/* This marks a buffer as continuing via the next field. */
+#define VRING_DESC_F_NEXT       1
+/* This marks a buffer as write-only (otherwise read-only). */
+#define VRING_DESC_F_WRITE      2
+
+/* This means don't notify other side when buffer added. */
+#define VRING_USED_F_NO_NOTIFY  1
+/* This means don't interrupt guest when buffer consumed. */
+#define VRING_AVAIL_F_NO_INTERRUPT      1
+
+/* Virtio ring descriptors: 16 bytes.  These can chain together via "next". */
+struct vring_desc
+{
+        /* Address (guest-physical). */
+        __u64 addr;
+        /* Length. */
+        __u32 len;
+        /* The flags as indicated above. */
+        __u16 flags;
+        /* We chain unused descriptors via this, too */
+        __u16 next;
+};
+
+struct vring_avail
+{
+        __u16 flags;
+        __u16 idx;
+        __u16 ring[];
+};
+
+/* u32 is used here for ids for padding reasons. */
+struct vring_used_elem
+{
+        /* Index of start of used descriptor chain. */
+        __u32 id;
+        /* Total length of the descriptor chain which was used (written to) */
+        __u32 len;
+};
+
+struct vring_used
+{
+        __u16 flags;
+        __u16 idx;
+        struct vring_used_elem ring[];
+};
+
+struct vring {
+        unsigned int num;
+
+        struct vring_desc *desc;
+
+        struct vring_avail *avail;
+
+        struct vring_used *used;
+};
+
+/* The standard layout for the ring is a continuous chunk of memory which looks
+ * like this.  The used fields will be aligned to a "num+1" boundary.
+ *
+ * struct vring
+ * {
+ *      // The actual descriptors (16 bytes each)
+ *      struct vring_desc desc[num];
+ *
+ *      // A ring of available descriptor heads with free-running index.
+ *      __u16 avail_flags;
+ *      __u16 avail_idx;
+ *      __u16 available[num];
+ *
+ *      // Padding so a correctly-chosen num value will cache-align used_idx.
+ *      char pad[sizeof(struct vring_desc) - sizeof(avail_flags)];
+ *
+ *      // A ring of used descriptor heads with free-running index.
+ *      __u16 used_flags;
+ *      __u16 used_idx;
+ *      struct vring_used_elem used[num];
+ * };
+ */
+static inline void vring_init(struct vring *vr, unsigned int num, void *p)
+{
+        vr->num = num;
+        vr->desc = p;
+        vr->avail = p + num*sizeof(struct vring);
+        vr->used = p + (num+1)*(sizeof(struct vring) + sizeof(__u16));
+}
+
+static inline unsigned vring_size(unsigned int num)
+{
+        return (num + 1) * (sizeof(struct vring_desc) + sizeof(__u16))
+                + sizeof(__u32) + num * sizeof(struct vring_used_elem);
+}
+
+#ifdef __KERNEL__
+#include <linux/irqreturn.h>
+struct virtio_device;
+struct virtqueue;
+
+struct virtqueue *vring_new_virtqueue(unsigned int num,
+                                      struct virtio_device *vdev,
+                                      void *pages,
+                                      void (*notify)(struct virtqueue *vq),
+                                      bool (*callback)(struct virtqueue *vq));
+void vring_del_virtqueue(struct virtqueue *vq);
+
+irqreturn_t vring_interrupt(int irq, void *_vq);
+#endif /* __KERNEL__ */
+#endif /* _LINUX_VIRTIO_RING_H */
diff --git a/include/video/Kbuild b/include/video/Kbuild
index 53a6c7310e61..0e406f730c2f 100644
--- a/include/video/Kbuild
+++ b/include/video/Kbuild
@@ -1 +1,2 @@
 unifdef-y += sisfb.h uvesafb.h
+unifdef-y += edid.h
diff --git a/include/video/edid.h b/include/video/edid.h
index f6a42d6c2e2d..928c342b33d6 100644
--- a/include/video/edid.h
+++ b/include/video/edid.h
@@ -1,17 +1,16 @@
 #ifndef __linux_video_edid_h__
 #define __linux_video_edid_h__
 
-#ifdef __KERNEL__
-
+#if !defined(__KERNEL__) || defined(CONFIG_X86)
 
-#ifdef CONFIG_X86
 struct edid_info {
         unsigned char dummy[128];
 };
 
+#ifdef __KERNEL__
 extern struct edid_info edid_info;
-#endif /* CONFIG_X86 */
-
 #endif /* __KERNEL__ */
 
+#endif
+
 #endif /* __linux_video_edid_h__ */