summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2015-02-11 15:27:01 +1030
committerRusty Russell <rusty@rustcorp.com.au>2015-02-11 16:47:45 +1030
commit00f8d546512a7661d43600625f87a42a98cae26a (patch)
treebcd7a3e192674123341e35e45ec1a7e9517ae6d3 /tools
parenta561adfaecc9eb6fb66941b450458801f3f60ca0 (diff)
downloadlinux-00f8d546512a7661d43600625f87a42a98cae26a.tar.bz2
lguest: remove NOTIFY facility from demonstration launcher.
This was only used for early console, now we can get rid of it altogether. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'tools')
-rw-r--r--tools/lguest/lguest.c25
1 files changed, 1 insertions, 24 deletions
diff --git a/tools/lguest/lguest.c b/tools/lguest/lguest.c
index 7cc1fed1094d..5d104321f70f 100644
--- a/tools/lguest/lguest.c
+++ b/tools/lguest/lguest.c
@@ -1079,23 +1079,6 @@ static void cleanup_devices(void)
tcsetattr(STDIN_FILENO, TCSANOW, &orig_term);
}
-/*L:215
- * This is the generic routine we call when the Guest uses LHCALL_NOTIFY.
- */
-static void handle_output(unsigned long addr)
-{
- /*
- * Early console write is done using notify on a nul-terminated string
- * in Guest memory. It's also great for hacking debugging messages
- * into a Guest.
- */
- if (addr >= guest_limit)
- errx(1, "Bad NOTIFY %#lx", addr);
-
- write(STDOUT_FILENO, from_guest_phys(addr),
- strnlen(from_guest_phys(addr), guest_limit - addr));
-}
-
/*L:217
* We do PCI. This is mainly done to let us test the kernel virtio PCI
* code.
@@ -2662,14 +2645,8 @@ static void __attribute__((noreturn)) run_guest(void)
/* We read from the /dev/lguest device to run the Guest. */
readval = pread(lguest_fd, &notify, sizeof(notify), cpu_id);
-
- /* One unsigned long means the Guest did HCALL_NOTIFY */
if (readval == sizeof(notify)) {
- if (notify.trap == 0x1F) {
- verbose("Notify on address %#08x\n",
- notify.addr);
- handle_output(notify.addr);
- } else if (notify.trap == 13) {
+ if (notify.trap == 13) {
verbose("Emulating instruction at %#x\n",
getreg(eip));
emulate_insn(notify.insn);