A better layout with both binaries in a single crate

2017-10-18 20:32:04 +00:00 · 2017-10-18 20:32:04 +00:00 · eb6a99eb90
commit eb6a99eb90
parent 0713cbce69
43 changed files with 8 additions and 0 deletions
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@ -3,6 +3,14 @@ name = "pH"
 version = "0.1.0"
 authors = ["Bruce Leidl <bruce@subgraph.com>"]

+[[bin]]
+name="pH"
+path="src/main.rs"
+
+[[bin]]
+name="ph-init"
+path="src/init/main.rs"
+
 [dependencies]
 byteorder="1.0.0"
 libc = "*"
--- a/rust/src/devices/mod.rs
+++ b/rust/src/devices/mod.rs
--- a/rust/src/devices/rtc.rs
+++ b/rust/src/devices/rtc.rs
--- a/rust/src/devices/serial.rs
+++ b/rust/src/devices/serial.rs
--- a/rust/src/devices/virtio_9p/commands.rs
+++ b/rust/src/devices/virtio_9p/commands.rs
--- a/rust/src/devices/virtio_9p/fid.rs
+++ b/rust/src/devices/virtio_9p/fid.rs
--- a/rust/src/devices/virtio_9p/filesystem.rs
+++ b/rust/src/devices/virtio_9p/filesystem.rs
--- a/rust/src/devices/virtio_9p/mod.rs
+++ b/rust/src/devices/virtio_9p/mod.rs
--- a/rust/src/devices/virtio_9p/pdu.rs
+++ b/rust/src/devices/virtio_9p/pdu.rs
--- a/rust/src/devices/virtio_9p/readdir.rs
+++ b/rust/src/devices/virtio_9p/readdir.rs
--- a/rust/src/devices/virtio_rng.rs
+++ b/rust/src/devices/virtio_rng.rs
--- a/rust/src/devices/virtio_serial.rs
+++ b/rust/src/devices/virtio_serial.rs
--- a/rust/src/init/main.rs
+++ b/rust/src/init/main.rs
--- a/rust/src/init/sys.rs
+++ b/rust/src/init/sys.rs
--- a/rust/src/kvm/ioctl.rs
+++ b/rust/src/kvm/ioctl.rs
--- a/rust/src/kvm/mod.rs
+++ b/rust/src/kvm/mod.rs
--- a/rust/src/main.rs
+++ b/rust/src/main.rs
--- a/rust/src/memory/address.rs
+++ b/rust/src/memory/address.rs
--- a/rust/src/memory/mmap.rs
+++ b/rust/src/memory/mmap.rs
--- a/rust/src/memory/mod.rs
+++ b/rust/src/memory/mod.rs
--- a/rust/src/memory/ram.rs
+++ b/rust/src/memory/ram.rs
--- a/rust/src/system/ioctl.rs
+++ b/rust/src/system/ioctl.rs
--- a/rust/src/system/mod.rs
+++ b/rust/src/system/mod.rs
--- a/rust/src/virtio/bus.rs
+++ b/rust/src/virtio/bus.rs
--- a/rust/src/virtio/chain.rs
+++ b/rust/src/virtio/chain.rs
--- a/rust/src/virtio/config.rs
+++ b/rust/src/virtio/config.rs
--- a/rust/src/virtio/consts.rs
+++ b/rust/src/virtio/consts.rs
--- a/rust/src/virtio/device.rs
+++ b/rust/src/virtio/device.rs
--- a/rust/src/virtio/eventfd.rs
+++ b/rust/src/virtio/eventfd.rs
--- a/rust/src/virtio/mod.rs
+++ b/rust/src/virtio/mod.rs
--- a/rust/src/virtio/pci.rs
+++ b/rust/src/virtio/pci.rs
--- a/rust/src/virtio/virtqueue.rs
+++ b/rust/src/virtio/virtqueue.rs
--- a/rust/src/virtio/vring.rs
+++ b/rust/src/virtio/vring.rs
--- a/rust/src/vm/error.rs
+++ b/rust/src/vm/error.rs
--- a/rust/src/vm/io.rs
+++ b/rust/src/vm/io.rs
--- a/rust/src/vm/kernel_cmdline.rs
+++ b/rust/src/vm/kernel_cmdline.rs
--- a/rust/src/vm/mod.rs
+++ b/rust/src/vm/mod.rs
--- a/rust/src/vm/run.rs
+++ b/rust/src/vm/run.rs
--- a/rust/src/vm/setup/cpu.rs
+++ b/rust/src/vm/setup/cpu.rs
--- a/rust/src/vm/setup/kernel.rs
+++ b/rust/src/vm/setup/kernel.rs
--- a/rust/src/vm/setup/mod.rs
+++ b/rust/src/vm/setup/mod.rs
--- a/rust/src/vm/setup/mptable.rs
+++ b/rust/src/vm/setup/mptable.rs