LOC: qemu dbg

Author: TimNN

src/tools/qemu-test-client/src/main.rs

@@ -51,6 +51,9 @@ fn main() {
 }
 
 fn spawn_emulator(rootfs: &Path, tmpdir: &Path) {
+    use std::os::unix::io::{FromRawFd, IntoRawFd};
+    use std::fs::OpenOptions;
+
     // Generate a new rootfs image now that we've updated the test server
     // executable. This is the equivalent of:
     //
@@ -71,6 +74,10 @@ fn spawn_emulator(rootfs: &Path, tmpdir: &Path) {
                 &mut t!(File::create(&rootfs_img))));
     assert!(t!(child.wait()).success());
 
+    let log = OpenOptions::new().create(true).append(true).open("qemu.log").unwrap();
+    let qout = unsafe { Stdio::from_raw_fd(log.try_clone().unwrap().into_raw_fd()) };
+    let qerr = unsafe { Stdio::from_raw_fd(log.try_clone().unwrap().into_raw_fd()) };
+
     // Start up the emulator, in the background
     let mut cmd = Command::new("qemu-system-arm");
     cmd.arg("-M").arg("vexpress-a15")
@@ -80,7 +87,8 @@ fn spawn_emulator(rootfs: &Path, tmpdir: &Path) {
        .arg("-dtb").arg("/tmp/vexpress-v2p-ca15-tc1.dtb")
        .arg("-append").arg("console=ttyAMA0 root=/dev/ram rdinit=/sbin/init init=/sbin/init")
        .arg("-nographic")
-       .arg("-redir").arg("tcp:12345::12345");
+       .arg("-redir").arg("tcp:12345::12345")
+       .stdout(qout).stderr(qerr);
     t!(cmd.spawn());
 
     // Wait for the emulator to come online

src/tools/qemu-test-server/src/main.rs

@@ -8,6 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#![feature(libc)]
+
+extern crate libc;
+
 /// This is a small server which is intended to run inside of an emulator. This
 /// server pairs with the `qemu-test-client` program in this repository. The
 /// `qemu-test-client` connects to this server over a TCP socket and performs
@@ -41,7 +45,31 @@ macro_rules! t {
 
 static TEST: AtomicUsize = ATOMIC_USIZE_INIT;
 
+fn debug() {
+    ::std::env::set_var("RUST_BACKTRACE", "1");
+
+    unsafe {
+        let pid = libc::fork();
+        if pid == 0 {
+            println!("@@ Child is running.");
+            return; // we are the child
+        }
+        assert!(pid > 0);
+
+        println!("@@ Watcher is running.");
+
+        let mut status: libc::c_int = 0;
+        libc::waitpid(pid, &mut status, 0);
+
+        println!("@@EXIT@@: {}", status);
+
+        ::std::process::exit(0);
+    }
+}
+
 fn main() {
+    debug();
+
     println!("starting test server");
     let listener = t!(TcpListener::bind("10.0.2.15:12345"));
     println!("listening!");