bitkeeper revision 1.593.1.1 (3fb2673ecxanxs8T80yNhChH3vMCyA)

add new domain 0 operation to read console ring in Xen

2 files changed, 48 insertions, 0 deletions

diff --git a/tools/internal/Makefile b/tools/internal/Makefile
index 3979cace5b..1a225c0d88 100644
--- a/tools/internal/Makefile
+++ b/tools/internal/Makefile
@@ -11,6 +11,7 @@ TARGETS  = xi_create xi_start xi_stop xi_destroy xi_build
 TARGETS += xi_phys_grant xi_list xi_save_linux xi_restore_linux
 TARGETS += xi_sched_global xi_sched_domain xi_usage xi_vif_params
 TARGETS += xi_vbd_create xi_vbd_add xi_vbd_list xi_vbd_info 
+TARGETS += xi_read_console_ring
 INSTALL  = $(TARGETS) xi_vifinit xi_helper
 
 all: check-for-zlib $(TARGETS)
diff --git a/tools/internal/xi_read_console_ring.c b/tools/internal/xi_read_console_ring.c
new file mode 100644
index 0000000000..9f28823c20
--- /dev/null
+++ b/tools/internal/xi_read_console_ring.c
@@ -0,0 +1,47 @@
+/* 
+ * Usage: <executable> [-c]
+ */
+
+#include "dom0_defs.h"
+
+#define CONSOLE_RING_SIZE 16392
+static char *argv0 = "read_console_ring";
+
+static long read_console_ring(char *str, unsigned count)
+{
+    int ret;
+    dom0_op_t op;
+
+    op.cmd = DOM0_READCONSOLE;
+    op.u.readconsole.str = str;
+    op.u.readconsole.count = count;
+
+    ret = do_dom0_op(&op);
+    if (ret > 0) {
+        *(str + ret) = '\0';
+    }
+
+    return ret;
+}    
+
+int main(int argc, char **argv)
+{
+    char str[CONSOLE_RING_SIZE];
+
+    if ( argv[0] != NULL ) 
+        argv0 = argv[0];
+    
+    if ( argc > 2) {
+        fprintf(stderr, "Usage: %s [-r]\n", argv0);
+        return 1;
+    }
+    
+    if ( read_console_ring(str, CONSOLE_RING_SIZE) < 0 ) {
+	printf("Read console ring error.\n");
+	printf("%s", str);
+        return 1;
+    }
+
+    printf("%s", str);
+    return 0;
+}