1 files changed, 16 insertions, 45 deletions
diff --git a/include/linux/lguest_launcher.h b/include/linux/lguest_launcher.h
index 495203ff221c..acd5b12565cc 100644
--- a/include/linux/lguest_launcher.h
+++ b/include/linux/lguest_launcher.h
@@ -8,52 +8,13 @@
 *
 * The Guest needs devices to do anything useful.  Since we don't let it touch
 * real devices (think of the damage it could do!) we provide virtual devices.
- * We could emulate a PCI bus with various devices on it, but that is a fairly
+ * We emulate a PCI bus with virtio devices on it; we used to have our own
- * complex burden for the Host and suboptimal for the Guest, so we have our own
+ * lguest bus which was far simpler, but this tests the virtio 1.0 standard.
- * simple lguest bus and we use "virtio" drivers.  These drivers need a set of
- * routines from us which will actually do the virtual I/O, but they handle all
- * the net/block/console stuff themselves.  This means that if we want to add
- * a new device, we simply need to write a new virtio driver and create support
- * for it in the Launcher: this code won't need to change.
 *
 * Virtio devices are also used by kvm, so we can simply reuse their optimized
 * device drivers.  And one day when everyone uses virtio, my plan will be
 * complete.  Bwahahahah!
- *
- * 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.  Type 0 terminates. */
-        __u8 type;
-        /* The number of virtqueues (first in config array) */
-        __u8 num_vq;
-        /*
-         * The number of bytes of feature bits.  Multiply by 2: one for host
-         * features and one for Guest acknowledgements.
-         */
-        __u8 feature_len;
-        /* The number of bytes of the config array after virtqueues. */
-        __u8 config_len;
-        /* A status byte, written by the Guest. */
-        __u8 status;
-        __u8 config[0];
-};
-/*D:135
- * This is how we expect the device configuration field for a virtqueue
- * to be laid out in config space.
 */
-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;
-};
-/*:*/
 /* Write command first word is a request. */
 enum lguest_req
@@ -62,12 +23,22 @@ enum lguest_req
        LHREQ_GETDMA, /* No longer used */
        LHREQ_IRQ, /* + irq */
        LHREQ_BREAK, /* No longer used */
-        LHREQ_EVENTFD, /* + address, fd. */
+        LHREQ_EVENTFD, /* No longer used. */
+        LHREQ_GETREG, /* + offset within struct pt_regs (then read value). */
+        LHREQ_SETREG, /* + offset within struct pt_regs, value. */
+        LHREQ_TRAP, /* + trap number to deliver to guest. */
 };
 /*
- * The alignment to use between consumer and producer parts of vring.
+ * This is what read() of the lguest fd populates.  trap ==
- * x86 pagesize for historical reasons.
+ * LGUEST_TRAP_ENTRY for an LHCALL_NOTIFY (addr is the
+ * argument), 14 for a page fault in the MMIO region (addr is
+ * the trap address, insn is the instruction), or 13 for a GPF
+ * (insn is the instruction).
 */
-#define LGUEST_VRING_ALIGN      4096
+struct lguest_pending {
+        __u8 trap;
+        __u8 insn[7];
+        __u32 addr;
+};
 #endif /* _LINUX_LGUEST_LAUNCHER */

diff --git a/include/linux/lguest_launcher.h b/include/linux/lguest_launcher.h index 495203ff221c..acd5b12565cc 100644 --- a/include/linux/lguest_launcher.h +++ b/include/linux/lguest_launcher.h
@@ -8,52 +8,13 @@
8	*	8	*
9	* The Guest needs devices to do anything useful. Since we don't let it touch	9	* The Guest needs devices to do anything useful. Since we don't let it touch
10	* real devices (think of the damage it could do!) we provide virtual devices.	10	* real devices (think of the damage it could do!) we provide virtual devices.
11	* We could emulate a PCI bus with various devices on it, but that is a fairly	11	* We emulate a PCI bus with virtio devices on it; we used to have our own
12	* complex burden for the Host and suboptimal for the Guest, so we have our own	12	* lguest bus which was far simpler, but this tests the virtio 1.0 standard.
13	* simple lguest bus and we use "virtio" drivers. These drivers need a set of
14	* routines from us which will actually do the virtual I/O, but they handle all
15	* the net/block/console stuff themselves. This means that if we want to add
16	* a new device, we simply need to write a new virtio driver and create support
17	* for it in the Launcher: this code won't need to change.
18	*	13	*
19	* Virtio devices are also used by kvm, so we can simply reuse their optimized	14	* Virtio devices are also used by kvm, so we can simply reuse their optimized
20	* device drivers. And one day when everyone uses virtio, my plan will be	15	* device drivers. And one day when everyone uses virtio, my plan will be
21	* complete. Bwahahahah!	16	* complete. Bwahahahah!
22	*
23	* Devices are described by a simplified ID, a status byte, and some "config"
24	* bytes which describe this device's configuration. This is placed by the
25	* Launcher just above the top of physical memory:
26	*/
27	struct lguest_device_desc {
28	/* The device type: console, network, disk etc. Type 0 terminates. */
29	__u8 type;
30	/* The number of virtqueues (first in config array) */
31	__u8 num_vq;
32	/*
33	* The number of bytes of feature bits. Multiply by 2: one for host
34	* features and one for Guest acknowledgements.
35	*/
36	__u8 feature_len;
37	/* The number of bytes of the config array after virtqueues. */
38	__u8 config_len;
39	/* A status byte, written by the Guest. */
40	__u8 status;
41	__u8 config[0];
42	};
43
44	/*D:135
45	* This is how we expect the device configuration field for a virtqueue
46	* to be laid out in config space.
47	*/	17	*/
48	struct lguest_vqconfig {
49	/* The number of entries in the virtio_ring */
50	__u16 num;
51	/* The interrupt we get when something happens. */
52	__u16 irq;
53	/* The page number of the virtio ring for this device. */
54	__u32 pfn;
55	};
56	/:/
57		18
58	/* Write command first word is a request. */	19	/* Write command first word is a request. */
59	enum lguest_req	20	enum lguest_req
@@ -62,12 +23,22 @@ enum lguest_req
62	LHREQ_GETDMA, /* No longer used */	23	LHREQ_GETDMA, /* No longer used */
63	LHREQ_IRQ, /* + irq */	24	LHREQ_IRQ, /* + irq */
64	LHREQ_BREAK, /* No longer used */	25	LHREQ_BREAK, /* No longer used */
65	LHREQ_EVENTFD, /* + address, fd. */	26	LHREQ_EVENTFD, /* No longer used. */
		27	LHREQ_GETREG, /* + offset within struct pt_regs (then read value). */
		28	LHREQ_SETREG, /* + offset within struct pt_regs, value. */
		29	LHREQ_TRAP, /* + trap number to deliver to guest. */
66	};	30	};
67		31
68	/*	32	/*
69	* The alignment to use between consumer and producer parts of vring.	33	* This is what read() of the lguest fd populates. trap ==
70	* x86 pagesize for historical reasons.	34	* LGUEST_TRAP_ENTRY for an LHCALL_NOTIFY (addr is the
		35	* argument), 14 for a page fault in the MMIO region (addr is
		36	* the trap address, insn is the instruction), or 13 for a GPF
		37	* (insn is the instruction).
71	*/	38	*/
72	#define LGUEST_VRING_ALIGN 4096	39	struct lguest_pending {
		40	__u8 trap;
		41	__u8 insn[7];
		42	__u32 addr;
		43	};
73	#endif /* _LINUX_LGUEST_LAUNCHER */	44	#endif /* _LINUX_LGUEST_LAUNCHER */