The following changes since commit ff54250a0ebab7f90a5f848a0ba63f999830c872:
Linus Torvalds (1):
Remove 'recurse into child resources' logic from
'reserve_region_with_split()'
are available in the git repository at:
ssh://master.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio.git
master
Marcelo Tosatti (1):
virtio: fix suspend when using virtio_balloon
Matias Zabaljauregui (1):
lguest: fix crash on vmlinux images
Matt Kraai (1):
lguest: tell git to ignore Documentation/lguest/lguest
Rusty Russell (2):
lguest: fix guest crash on non-linear addresses in gdt pvops
lguest: document 32-bit and PAE requirements
Documentation/lguest/.gitignore |1 +
Documentation/lguest/lguest.txt | 11 ++-
arch/x86/include/asm/lguest_hcall.h |2 +-
arch/x86/lguest/boot.c | 16 +---
drivers/lguest/lg.h |3 ++-
drivers/lguest/segments.c | 13 +++--
drivers/lguest/x86/core.c |9 +++--
drivers/virtio/virtio_balloon.c |3 ++-
8 files changed, 35 insertions(+), 23 deletions(-)
create mode 100644 Documentation/lguest/.gitignore
commit 88df781afb788fa588dbf2e77f205214022a8893
Author: Matias Zabaljauregui
Date: Wed Apr 8 17:58:39 2009 -0300
lguest: fix crash on vmlinux images
Typical message: 'lguest: unhandled trap 6 at 0x418726 (0x0)'
vmlinux guests were broken by 4cd8b5e2a159f18a1507f1187b44a1acbfa6341b
'lguest: use KVM hypercalls', which rewrites guest text from kvm hypercalls
to trap 31.
The Launcher mmaps the kernel image. The Guest executes and
immediately faults in the first text page (read-only). Then it hits a
hypercall, and we rewrite that hypercall, causing a copy-on-write.
But the Guest pagetables still refer to the old page: we fault again,
but as Host we see the hypercall already rewritten, and pass the fault
back to the Guest. The Guest hasn't set up an IDT yet, so we kill it.
This doesn't happen with bzImages: they unpack themselves and so the
text pages are already read-write.
Signed-off-by: Rusty Russell
Tested-by: Patrick McHardy
drivers/lguest/x86/core.c |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
commit a489f0b555b753f9df8ddc24c7e74f657ef7ee7b
Author: Rusty Russell
Date: Sun Apr 19 23:14:00 2009 -0600
lguest: fix guest crash on non-linear addresses in gdt pvops
Fixes guest crash 'lguest: bad read address 0x480 len 256'
The new per-cpu allocator ends up handing a non-linear address to
write_gdt_entry. We do __pa() on it, and hand it to the host, which
kills us.
I've long wanted to make the hypercall "LOAD_GDT_ENTRY" to match the IDT
code, but had no pressing reason until now.
Signed-off-by: Rusty Russell
Cc: lgu...@ozlabs.org
arch/x86/include/asm/lguest_hcall.h |2 +-
arch/x86/lguest/boot.c | 16 +---
drivers/lguest/lg.h |3 ++-
drivers/lguest/segments.c | 13 +++--
drivers/lguest/x86/core.c |4 ++--
5 files changed, 21 insertions(+), 17 deletions(-)
commit 84a139a985300901dfad99bd93c7345d180af860
Author: Marcelo Tosatti
Date: Thu Apr 16 21:14:04 2009 -0300
virtio: fix suspend when using virtio_balloon
Break out of wait_event_interruptible() if freezing has been requested,
in the vballoon thread. Without this change vballoon refuses to stop and
the system can't suspend.
Signed-off-by: Marcelo Tosatti
Signed-off-by: Rusty Russell
Cc: sta...@kernel.org
drivers/virtio/virtio_balloon.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit 9536c26b31ae34ba6371a1b8f406028e9756f913
Author: Matt Kraai
Date: Thu Apr 16 23:46:20 2009 -0700
lguest: tell git to ignore Documentation/lguest/lguest
This is the example lguest launcher binary.
Signed-off-by: Matt Kraai
Signed-off-by: Rusty Russell
Documentation/lguest/.gitignore |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 38cfe968040250b89c3554a17219a9fda45b9665
Author: Rusty Russell
Date: Sun Apr 19 23:14:02 2009 -0600
lguest: document 32-bit and PAE requirements
Robert noted that we don't actually document that lguest is 32-bit only,
nor that PAE must be off (CONFIG_PAE is now prompted for if HIGHMEM is
set to "off).
Signed-off-by: Rusty Russell
Cc: lgu...@ozlabs.org
Cc: "Robert P. J. Day"
Documentation/lguest/lguest.txt | 11 ++-
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Documentation/lguest/.gitignore b/Documentation/lguest/.gitignore
new file mode 100644
index 000..115587f
--- /dev/null
+++ b/Documentation/lguest/.gitignore
@@ -0,0 +1 @@
+lguest
diff --git a/Documentation/lguest/lguest.txt b/Documentation/lguest/lguest.txt
ind
