diff --git a/Cargo.toml b/Cargo.toml index f20a473..213ce49 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,17 +1,17 @@ [workspace] members = [ - "libs/xen/xenstore", - "libs/xen/xenevtchn", - "libs/xen/xencall", - "libs/xen/xenclient", - "libs/advmac", - "libs/loopdev", - "shared", - "guest", - "runtime", - "daemon", - "network", - "controller", + "crates/krata", + "crates/krataguest", + "crates/kratart", + "crates/kratad", + "crates/kratanet", + "crates/kratactl", + "crates/vendor/advmac", + "crates/vendor/loopdev", + "crates/xen/xencall", + "crates/xen/xenclient", + "crates/xen/xenevtchn", + "crates/xen/xenstore", ] resolver = "2" diff --git a/shared/Cargo.toml b/crates/krata/Cargo.toml similarity index 100% rename from shared/Cargo.toml rename to crates/krata/Cargo.toml diff --git a/shared/build.rs b/crates/krata/build.rs similarity index 100% rename from shared/build.rs rename to crates/krata/build.rs diff --git a/shared/examples/ethtool.rs b/crates/krata/examples/ethtool.rs similarity index 100% rename from shared/examples/ethtool.rs rename to crates/krata/examples/ethtool.rs diff --git a/shared/proto/krata/control.proto b/crates/krata/proto/krata/control.proto similarity index 100% rename from shared/proto/krata/control.proto rename to crates/krata/proto/krata/control.proto diff --git a/shared/src/control.rs b/crates/krata/src/control.rs similarity index 100% rename from shared/src/control.rs rename to crates/krata/src/control.rs diff --git a/shared/src/dial.rs b/crates/krata/src/dial.rs similarity index 100% rename from shared/src/dial.rs rename to crates/krata/src/dial.rs diff --git a/shared/src/ethtool.rs b/crates/krata/src/ethtool.rs similarity index 100% rename from shared/src/ethtool.rs rename to crates/krata/src/ethtool.rs diff --git a/shared/src/launchcfg.rs b/crates/krata/src/launchcfg.rs similarity index 100% rename from shared/src/launchcfg.rs rename to crates/krata/src/launchcfg.rs diff --git a/shared/src/lib.rs b/crates/krata/src/lib.rs similarity index 100% rename from shared/src/lib.rs rename to crates/krata/src/lib.rs diff --git a/controller/Cargo.toml b/crates/kratactl/Cargo.toml similarity index 95% rename from controller/Cargo.toml rename to crates/kratactl/Cargo.toml index 442698f..5429843 100644 --- a/controller/Cargo.toml +++ b/crates/kratactl/Cargo.toml @@ -10,7 +10,7 @@ async-stream = { workspace = true } clap = { workspace = true } cli-tables = { workspace = true } env_logger = { workspace = true } -krata = { path = "../shared" } +krata = { path = "../krata" } log = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } diff --git a/controller/bin/control.rs b/crates/kratactl/bin/control.rs similarity index 100% rename from controller/bin/control.rs rename to crates/kratactl/bin/control.rs diff --git a/controller/src/client.rs b/crates/kratactl/src/client.rs similarity index 100% rename from controller/src/client.rs rename to crates/kratactl/src/client.rs diff --git a/controller/src/console.rs b/crates/kratactl/src/console.rs similarity index 100% rename from controller/src/console.rs rename to crates/kratactl/src/console.rs diff --git a/controller/src/lib.rs b/crates/kratactl/src/lib.rs similarity index 100% rename from controller/src/lib.rs rename to crates/kratactl/src/lib.rs diff --git a/daemon/Cargo.toml b/crates/kratad/Cargo.toml similarity index 89% rename from daemon/Cargo.toml rename to crates/kratad/Cargo.toml index 55c414e..01689d5 100644 --- a/daemon/Cargo.toml +++ b/crates/kratad/Cargo.toml @@ -11,8 +11,8 @@ async-trait = { workspace = true } clap = { workspace = true } env_logger = { workspace = true } futures = { workspace = true } -krata = { path = "../shared" } -kratart = { path = "../runtime" } +krata = { path = "../krata" } +kratart = { path = "../kratart" } log = { workspace = true } signal-hook = { workspace = true } tokio = { workspace = true } diff --git a/daemon/bin/daemon.rs b/crates/kratad/bin/daemon.rs similarity index 100% rename from daemon/bin/daemon.rs rename to crates/kratad/bin/daemon.rs diff --git a/daemon/src/control.rs b/crates/kratad/src/control.rs similarity index 100% rename from daemon/src/control.rs rename to crates/kratad/src/control.rs diff --git a/daemon/src/event.rs b/crates/kratad/src/event.rs similarity index 100% rename from daemon/src/event.rs rename to crates/kratad/src/event.rs diff --git a/daemon/src/lib.rs b/crates/kratad/src/lib.rs similarity index 100% rename from daemon/src/lib.rs rename to crates/kratad/src/lib.rs diff --git a/guest/Cargo.toml b/crates/krataguest/Cargo.toml similarity index 89% rename from guest/Cargo.toml rename to crates/krataguest/Cargo.toml index 2478c3a..5015981 100644 --- a/guest/Cargo.toml +++ b/crates/krataguest/Cargo.toml @@ -9,7 +9,7 @@ anyhow = { workspace = true } env_logger = { workspace = true } futures = { workspace = true } ipnetwork = { workspace = true } -krata = { path = "../shared" } +krata = { path = "../krata" } log = { workspace = true } nix = { workspace = true, features = ["process"] } oci-spec = { workspace = true } @@ -21,7 +21,7 @@ sys-mount = { workspace = true } tokio = { workspace = true } tokio-stream = { workspace = true } walkdir = { workspace = true } -xenstore = { path = "../libs/xen/xenstore" } +xenstore = { path = "../xen/xenstore" } [lib] name = "krataguest" diff --git a/guest/bin/init.rs b/crates/krataguest/bin/init.rs similarity index 100% rename from guest/bin/init.rs rename to crates/krataguest/bin/init.rs diff --git a/guest/src/background.rs b/crates/krataguest/src/background.rs similarity index 100% rename from guest/src/background.rs rename to crates/krataguest/src/background.rs diff --git a/guest/src/childwait.rs b/crates/krataguest/src/childwait.rs similarity index 100% rename from guest/src/childwait.rs rename to crates/krataguest/src/childwait.rs diff --git a/guest/src/init.rs b/crates/krataguest/src/init.rs similarity index 100% rename from guest/src/init.rs rename to crates/krataguest/src/init.rs diff --git a/guest/src/lib.rs b/crates/krataguest/src/lib.rs similarity index 100% rename from guest/src/lib.rs rename to crates/krataguest/src/lib.rs diff --git a/network/Cargo.toml b/crates/kratanet/Cargo.toml similarity index 90% rename from network/Cargo.toml rename to crates/kratanet/Cargo.toml index 8464c4f..e21146e 100644 --- a/network/Cargo.toml +++ b/crates/kratanet/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" resolver = "2" [dependencies] -advmac = { path = "../libs/advmac" } +advmac = { path = "../vendor/advmac" } anyhow = { workspace = true } async-trait = { workspace = true } bytes = { workspace = true } @@ -22,7 +22,7 @@ tokio = { workspace = true } tokio-tun = { workspace = true } udp-stream = { workspace = true } uuid = { workspace = true } -xenstore = { path = "../libs/xen/xenstore" } +xenstore = { path = "../xen/xenstore" } [lib] name = "kratanet" diff --git a/network/bin/network.rs b/crates/kratanet/bin/network.rs similarity index 100% rename from network/bin/network.rs rename to crates/kratanet/bin/network.rs diff --git a/network/examples/autonet.rs b/crates/kratanet/examples/autonet.rs similarity index 100% rename from network/examples/autonet.rs rename to crates/kratanet/examples/autonet.rs diff --git a/network/examples/ping.rs b/crates/kratanet/examples/ping.rs similarity index 100% rename from network/examples/ping.rs rename to crates/kratanet/examples/ping.rs diff --git a/network/src/autonet.rs b/crates/kratanet/src/autonet.rs similarity index 100% rename from network/src/autonet.rs rename to crates/kratanet/src/autonet.rs diff --git a/network/src/backend.rs b/crates/kratanet/src/backend.rs similarity index 100% rename from network/src/backend.rs rename to crates/kratanet/src/backend.rs diff --git a/network/src/chandev.rs b/crates/kratanet/src/chandev.rs similarity index 100% rename from network/src/chandev.rs rename to crates/kratanet/src/chandev.rs diff --git a/network/src/hbridge.rs b/crates/kratanet/src/hbridge.rs similarity index 100% rename from network/src/hbridge.rs rename to crates/kratanet/src/hbridge.rs diff --git a/network/src/icmp.rs b/crates/kratanet/src/icmp.rs similarity index 100% rename from network/src/icmp.rs rename to crates/kratanet/src/icmp.rs diff --git a/network/src/lib.rs b/crates/kratanet/src/lib.rs similarity index 100% rename from network/src/lib.rs rename to crates/kratanet/src/lib.rs diff --git a/network/src/nat/handler.rs b/crates/kratanet/src/nat/handler.rs similarity index 100% rename from network/src/nat/handler.rs rename to crates/kratanet/src/nat/handler.rs diff --git a/network/src/nat/key.rs b/crates/kratanet/src/nat/key.rs similarity index 100% rename from network/src/nat/key.rs rename to crates/kratanet/src/nat/key.rs diff --git a/network/src/nat/mod.rs b/crates/kratanet/src/nat/mod.rs similarity index 100% rename from network/src/nat/mod.rs rename to crates/kratanet/src/nat/mod.rs diff --git a/network/src/nat/processor.rs b/crates/kratanet/src/nat/processor.rs similarity index 100% rename from network/src/nat/processor.rs rename to crates/kratanet/src/nat/processor.rs diff --git a/network/src/nat/table.rs b/crates/kratanet/src/nat/table.rs similarity index 100% rename from network/src/nat/table.rs rename to crates/kratanet/src/nat/table.rs diff --git a/network/src/pkt.rs b/crates/kratanet/src/pkt.rs similarity index 100% rename from network/src/pkt.rs rename to crates/kratanet/src/pkt.rs diff --git a/network/src/proxynat/icmp.rs b/crates/kratanet/src/proxynat/icmp.rs similarity index 100% rename from network/src/proxynat/icmp.rs rename to crates/kratanet/src/proxynat/icmp.rs diff --git a/network/src/proxynat/mod.rs b/crates/kratanet/src/proxynat/mod.rs similarity index 100% rename from network/src/proxynat/mod.rs rename to crates/kratanet/src/proxynat/mod.rs diff --git a/network/src/proxynat/tcp.rs b/crates/kratanet/src/proxynat/tcp.rs similarity index 100% rename from network/src/proxynat/tcp.rs rename to crates/kratanet/src/proxynat/tcp.rs diff --git a/network/src/proxynat/udp.rs b/crates/kratanet/src/proxynat/udp.rs similarity index 100% rename from network/src/proxynat/udp.rs rename to crates/kratanet/src/proxynat/udp.rs diff --git a/network/src/raw_socket.rs b/crates/kratanet/src/raw_socket.rs similarity index 100% rename from network/src/raw_socket.rs rename to crates/kratanet/src/raw_socket.rs diff --git a/network/src/vbridge.rs b/crates/kratanet/src/vbridge.rs similarity index 100% rename from network/src/vbridge.rs rename to crates/kratanet/src/vbridge.rs diff --git a/runtime/Cargo.toml b/crates/kratart/Cargo.toml similarity index 84% rename from runtime/Cargo.toml rename to crates/kratart/Cargo.toml index 09a1c3e..44ad1c5 100644 --- a/runtime/Cargo.toml +++ b/crates/kratart/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" resolver = "2" [dependencies] -advmac = { path = "../libs/advmac" } +advmac = { path = "../vendor/advmac" } anyhow = { workspace = true } async-stream = { workspace = true } async-trait = { workspace = true } @@ -18,9 +18,9 @@ env_logger = { workspace = true } flate2 = { workspace = true } futures = { workspace = true } ipnetwork = { workspace = true } -krata = { path = "../shared" } +krata = { path = "../krata" } log = { workspace = true } -loopdev = { path = "../libs/loopdev" } +loopdev = { path = "../vendor/loopdev" } nix = { workspace = true, features = ["process"] } oci-spec = { workspace = true } path-clean = { workspace = true } @@ -38,8 +38,8 @@ url = { workspace = true } uuid = { workspace = true } walkdir = { workspace = true } zstd = { workspace = true } -xenclient = { path = "../libs/xen/xenclient" } -xenstore = { path = "../libs/xen/xenstore" } +xenclient = { path = "../xen/xenclient" } +xenstore = { path = "../xen/xenstore" } [lib] name = "kratart" diff --git a/runtime/src/autoloop.rs b/crates/kratart/src/autoloop.rs similarity index 100% rename from runtime/src/autoloop.rs rename to crates/kratart/src/autoloop.rs diff --git a/runtime/src/cfgblk.rs b/crates/kratart/src/cfgblk.rs similarity index 100% rename from runtime/src/cfgblk.rs rename to crates/kratart/src/cfgblk.rs diff --git a/runtime/src/console.rs b/crates/kratart/src/console.rs similarity index 100% rename from runtime/src/console.rs rename to crates/kratart/src/console.rs diff --git a/runtime/src/image/cache.rs b/crates/kratart/src/image/cache.rs similarity index 100% rename from runtime/src/image/cache.rs rename to crates/kratart/src/image/cache.rs diff --git a/runtime/src/image/fetch.rs b/crates/kratart/src/image/fetch.rs similarity index 100% rename from runtime/src/image/fetch.rs rename to crates/kratart/src/image/fetch.rs diff --git a/runtime/src/image/mod.rs b/crates/kratart/src/image/mod.rs similarity index 100% rename from runtime/src/image/mod.rs rename to crates/kratart/src/image/mod.rs diff --git a/runtime/src/image/name.rs b/crates/kratart/src/image/name.rs similarity index 100% rename from runtime/src/image/name.rs rename to crates/kratart/src/image/name.rs diff --git a/runtime/src/launch/mod.rs b/crates/kratart/src/launch/mod.rs similarity index 100% rename from runtime/src/launch/mod.rs rename to crates/kratart/src/launch/mod.rs diff --git a/runtime/src/lib.rs b/crates/kratart/src/lib.rs similarity index 100% rename from runtime/src/lib.rs rename to crates/kratart/src/lib.rs diff --git a/libs/advmac/Cargo.toml b/crates/vendor/advmac/Cargo.toml similarity index 100% rename from libs/advmac/Cargo.toml rename to crates/vendor/advmac/Cargo.toml diff --git a/libs/advmac/LICENSE b/crates/vendor/advmac/LICENSE similarity index 100% rename from libs/advmac/LICENSE rename to crates/vendor/advmac/LICENSE diff --git a/libs/advmac/src/lib.rs b/crates/vendor/advmac/src/lib.rs similarity index 100% rename from libs/advmac/src/lib.rs rename to crates/vendor/advmac/src/lib.rs diff --git a/libs/advmac/src/parser.rs b/crates/vendor/advmac/src/parser.rs similarity index 100% rename from libs/advmac/src/parser.rs rename to crates/vendor/advmac/src/parser.rs diff --git a/libs/loopdev/Cargo.toml b/crates/vendor/loopdev/Cargo.toml similarity index 100% rename from libs/loopdev/Cargo.toml rename to crates/vendor/loopdev/Cargo.toml diff --git a/libs/loopdev/LICENSE b/crates/vendor/loopdev/LICENSE similarity index 100% rename from libs/loopdev/LICENSE rename to crates/vendor/loopdev/LICENSE diff --git a/libs/loopdev/src/bindings.rs b/crates/vendor/loopdev/src/bindings.rs similarity index 100% rename from libs/loopdev/src/bindings.rs rename to crates/vendor/loopdev/src/bindings.rs diff --git a/libs/loopdev/src/lib.rs b/crates/vendor/loopdev/src/lib.rs similarity index 100% rename from libs/loopdev/src/lib.rs rename to crates/vendor/loopdev/src/lib.rs diff --git a/libs/loopdev/src/linux.rs b/crates/vendor/loopdev/src/linux.rs similarity index 100% rename from libs/loopdev/src/linux.rs rename to crates/vendor/loopdev/src/linux.rs diff --git a/libs/xen/xencall/Cargo.toml b/crates/xen/xencall/Cargo.toml similarity index 100% rename from libs/xen/xencall/Cargo.toml rename to crates/xen/xencall/Cargo.toml diff --git a/libs/xen/xencall/examples/domain_create.rs b/crates/xen/xencall/examples/domain_create.rs similarity index 100% rename from libs/xen/xencall/examples/domain_create.rs rename to crates/xen/xencall/examples/domain_create.rs diff --git a/libs/xen/xencall/examples/domain_info.rs b/crates/xen/xencall/examples/domain_info.rs similarity index 100% rename from libs/xen/xencall/examples/domain_info.rs rename to crates/xen/xencall/examples/domain_info.rs diff --git a/libs/xen/xencall/examples/vcpu_context.rs b/crates/xen/xencall/examples/vcpu_context.rs similarity index 100% rename from libs/xen/xencall/examples/vcpu_context.rs rename to crates/xen/xencall/examples/vcpu_context.rs diff --git a/libs/xen/xencall/examples/version_capabilities.rs b/crates/xen/xencall/examples/version_capabilities.rs similarity index 100% rename from libs/xen/xencall/examples/version_capabilities.rs rename to crates/xen/xencall/examples/version_capabilities.rs diff --git a/libs/xen/xencall/src/error.rs b/crates/xen/xencall/src/error.rs similarity index 100% rename from libs/xen/xencall/src/error.rs rename to crates/xen/xencall/src/error.rs diff --git a/libs/xen/xencall/src/lib.rs b/crates/xen/xencall/src/lib.rs similarity index 100% rename from libs/xen/xencall/src/lib.rs rename to crates/xen/xencall/src/lib.rs diff --git a/libs/xen/xencall/src/sys.rs b/crates/xen/xencall/src/sys.rs similarity index 100% rename from libs/xen/xencall/src/sys.rs rename to crates/xen/xencall/src/sys.rs diff --git a/libs/xen/xenclient/Cargo.toml b/crates/xen/xenclient/Cargo.toml similarity index 100% rename from libs/xen/xenclient/Cargo.toml rename to crates/xen/xenclient/Cargo.toml diff --git a/libs/xen/xenclient/examples/boot.rs b/crates/xen/xenclient/examples/boot.rs similarity index 100% rename from libs/xen/xenclient/examples/boot.rs rename to crates/xen/xenclient/examples/boot.rs diff --git a/libs/xen/xenclient/src/boot.rs b/crates/xen/xenclient/src/boot.rs similarity index 100% rename from libs/xen/xenclient/src/boot.rs rename to crates/xen/xenclient/src/boot.rs diff --git a/libs/xen/xenclient/src/elfloader.rs b/crates/xen/xenclient/src/elfloader.rs similarity index 100% rename from libs/xen/xenclient/src/elfloader.rs rename to crates/xen/xenclient/src/elfloader.rs diff --git a/libs/xen/xenclient/src/error.rs b/crates/xen/xenclient/src/error.rs similarity index 100% rename from libs/xen/xenclient/src/error.rs rename to crates/xen/xenclient/src/error.rs diff --git a/libs/xen/xenclient/src/lib.rs b/crates/xen/xenclient/src/lib.rs similarity index 100% rename from libs/xen/xenclient/src/lib.rs rename to crates/xen/xenclient/src/lib.rs diff --git a/libs/xen/xenclient/src/mem.rs b/crates/xen/xenclient/src/mem.rs similarity index 100% rename from libs/xen/xenclient/src/mem.rs rename to crates/xen/xenclient/src/mem.rs diff --git a/libs/xen/xenclient/src/sys.rs b/crates/xen/xenclient/src/sys.rs similarity index 100% rename from libs/xen/xenclient/src/sys.rs rename to crates/xen/xenclient/src/sys.rs diff --git a/libs/xen/xenclient/src/x86.rs b/crates/xen/xenclient/src/x86.rs similarity index 100% rename from libs/xen/xenclient/src/x86.rs rename to crates/xen/xenclient/src/x86.rs diff --git a/libs/xen/xenevtchn/Cargo.toml b/crates/xen/xenevtchn/Cargo.toml similarity index 100% rename from libs/xen/xenevtchn/Cargo.toml rename to crates/xen/xenevtchn/Cargo.toml diff --git a/libs/xen/xenevtchn/examples/simple.rs b/crates/xen/xenevtchn/examples/simple.rs similarity index 100% rename from libs/xen/xenevtchn/examples/simple.rs rename to crates/xen/xenevtchn/examples/simple.rs diff --git a/libs/xen/xenevtchn/src/error.rs b/crates/xen/xenevtchn/src/error.rs similarity index 100% rename from libs/xen/xenevtchn/src/error.rs rename to crates/xen/xenevtchn/src/error.rs diff --git a/libs/xen/xenevtchn/src/lib.rs b/crates/xen/xenevtchn/src/lib.rs similarity index 100% rename from libs/xen/xenevtchn/src/lib.rs rename to crates/xen/xenevtchn/src/lib.rs diff --git a/libs/xen/xenevtchn/src/sys.rs b/crates/xen/xenevtchn/src/sys.rs similarity index 100% rename from libs/xen/xenevtchn/src/sys.rs rename to crates/xen/xenevtchn/src/sys.rs diff --git a/libs/xen/xenstore/Cargo.toml b/crates/xen/xenstore/Cargo.toml similarity index 100% rename from libs/xen/xenstore/Cargo.toml rename to crates/xen/xenstore/Cargo.toml diff --git a/libs/xen/xenstore/examples/list.rs b/crates/xen/xenstore/examples/list.rs similarity index 100% rename from libs/xen/xenstore/examples/list.rs rename to crates/xen/xenstore/examples/list.rs diff --git a/libs/xen/xenstore/examples/watch.rs b/crates/xen/xenstore/examples/watch.rs similarity index 100% rename from libs/xen/xenstore/examples/watch.rs rename to crates/xen/xenstore/examples/watch.rs diff --git a/libs/xen/xenstore/src/bus.rs b/crates/xen/xenstore/src/bus.rs similarity index 100% rename from libs/xen/xenstore/src/bus.rs rename to crates/xen/xenstore/src/bus.rs diff --git a/libs/xen/xenstore/src/client.rs b/crates/xen/xenstore/src/client.rs similarity index 100% rename from libs/xen/xenstore/src/client.rs rename to crates/xen/xenstore/src/client.rs diff --git a/libs/xen/xenstore/src/error.rs b/crates/xen/xenstore/src/error.rs similarity index 100% rename from libs/xen/xenstore/src/error.rs rename to crates/xen/xenstore/src/error.rs diff --git a/libs/xen/xenstore/src/lib.rs b/crates/xen/xenstore/src/lib.rs similarity index 100% rename from libs/xen/xenstore/src/lib.rs rename to crates/xen/xenstore/src/lib.rs diff --git a/libs/xen/xenstore/src/sys.rs b/crates/xen/xenstore/src/sys.rs similarity index 100% rename from libs/xen/xenstore/src/sys.rs rename to crates/xen/xenstore/src/sys.rs