krata: reorganize crates

2025-08-02 12:50:54 +00:00 · 2024-03-07 18:12:47 +00:00 · 2024-03-07 18:12:47 +00:00 · 7bc0c95f00
commit 7bc0c95f00
parent c0eeab4047
97 changed files with 24 additions and 24 deletions
--- 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"

--- a/crates/krata/Cargo.toml
+++ b/crates/krata/Cargo.toml
--- a/crates/krata/build.rs
+++ b/crates/krata/build.rs
--- a/crates/krata/examples/ethtool.rs
+++ b/crates/krata/examples/ethtool.rs
--- a/crates/krata/proto/krata/control.proto
+++ b/crates/krata/proto/krata/control.proto
--- a/crates/krata/src/control.rs
+++ b/crates/krata/src/control.rs
--- a/crates/krata/src/dial.rs
+++ b/crates/krata/src/dial.rs
--- a/crates/krata/src/ethtool.rs
+++ b/crates/krata/src/ethtool.rs
--- a/crates/krata/src/launchcfg.rs
+++ b/crates/krata/src/launchcfg.rs
--- a/crates/krata/src/lib.rs
+++ b/crates/krata/src/lib.rs
--- a/crates/kratactl/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 }
--- a/crates/kratactl/bin/control.rs
+++ b/crates/kratactl/bin/control.rs
--- a/crates/kratactl/src/client.rs
+++ b/crates/kratactl/src/client.rs
--- a/crates/kratactl/src/console.rs
+++ b/crates/kratactl/src/console.rs
--- a/crates/kratactl/src/lib.rs
+++ b/crates/kratactl/src/lib.rs
--- a/crates/kratad/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 }
--- a/crates/kratad/bin/daemon.rs
+++ b/crates/kratad/bin/daemon.rs
--- a/crates/kratad/src/control.rs
+++ b/crates/kratad/src/control.rs
--- a/crates/kratad/src/event.rs
+++ b/crates/kratad/src/event.rs
--- a/crates/kratad/src/lib.rs
+++ b/crates/kratad/src/lib.rs
--- a/crates/krataguest/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"
--- a/crates/krataguest/bin/init.rs
+++ b/crates/krataguest/bin/init.rs
--- a/crates/krataguest/src/background.rs
+++ b/crates/krataguest/src/background.rs
--- a/crates/krataguest/src/childwait.rs
+++ b/crates/krataguest/src/childwait.rs
--- a/crates/krataguest/src/init.rs
+++ b/crates/krataguest/src/init.rs
--- a/crates/krataguest/src/lib.rs
+++ b/crates/krataguest/src/lib.rs
--- a/crates/kratanet/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"
--- a/crates/kratanet/bin/network.rs
+++ b/crates/kratanet/bin/network.rs
--- a/crates/kratanet/examples/autonet.rs
+++ b/crates/kratanet/examples/autonet.rs
--- a/crates/kratanet/examples/ping.rs
+++ b/crates/kratanet/examples/ping.rs
--- a/crates/kratanet/src/autonet.rs
+++ b/crates/kratanet/src/autonet.rs
--- a/crates/kratanet/src/backend.rs
+++ b/crates/kratanet/src/backend.rs
--- a/crates/kratanet/src/chandev.rs
+++ b/crates/kratanet/src/chandev.rs
--- a/crates/kratanet/src/hbridge.rs
+++ b/crates/kratanet/src/hbridge.rs
--- a/crates/kratanet/src/icmp.rs
+++ b/crates/kratanet/src/icmp.rs
--- a/crates/kratanet/src/lib.rs
+++ b/crates/kratanet/src/lib.rs
--- a/crates/kratanet/src/nat/handler.rs
+++ b/crates/kratanet/src/nat/handler.rs
--- a/crates/kratanet/src/nat/key.rs
+++ b/crates/kratanet/src/nat/key.rs
--- a/crates/kratanet/src/nat/mod.rs
+++ b/crates/kratanet/src/nat/mod.rs
--- a/crates/kratanet/src/nat/processor.rs
+++ b/crates/kratanet/src/nat/processor.rs
--- a/crates/kratanet/src/nat/table.rs
+++ b/crates/kratanet/src/nat/table.rs
--- a/crates/kratanet/src/pkt.rs
+++ b/crates/kratanet/src/pkt.rs
--- a/crates/kratanet/src/proxynat/icmp.rs
+++ b/crates/kratanet/src/proxynat/icmp.rs
--- a/crates/kratanet/src/proxynat/mod.rs
+++ b/crates/kratanet/src/proxynat/mod.rs
--- a/crates/kratanet/src/proxynat/tcp.rs
+++ b/crates/kratanet/src/proxynat/tcp.rs
--- a/crates/kratanet/src/proxynat/udp.rs
+++ b/crates/kratanet/src/proxynat/udp.rs
--- a/crates/kratanet/src/raw_socket.rs
+++ b/crates/kratanet/src/raw_socket.rs
--- a/crates/kratanet/src/vbridge.rs
+++ b/crates/kratanet/src/vbridge.rs
--- a/crates/kratart/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"
--- a/crates/kratart/src/autoloop.rs
+++ b/crates/kratart/src/autoloop.rs
--- a/crates/kratart/src/cfgblk.rs
+++ b/crates/kratart/src/cfgblk.rs
--- a/crates/kratart/src/console.rs
+++ b/crates/kratart/src/console.rs
--- a/crates/kratart/src/image/cache.rs
+++ b/crates/kratart/src/image/cache.rs
--- a/crates/kratart/src/image/fetch.rs
+++ b/crates/kratart/src/image/fetch.rs
--- a/crates/kratart/src/image/mod.rs
+++ b/crates/kratart/src/image/mod.rs
--- a/crates/kratart/src/image/name.rs
+++ b/crates/kratart/src/image/name.rs
--- a/crates/kratart/src/launch/mod.rs
+++ b/crates/kratart/src/launch/mod.rs
--- a/crates/kratart/src/lib.rs
+++ b/crates/kratart/src/lib.rs
--- a/crates/vendor/advmac/Cargo.toml
+++ b/crates/vendor/advmac/Cargo.toml
--- a/crates/vendor/advmac/LICENSE
+++ b/crates/vendor/advmac/LICENSE
--- a/crates/vendor/advmac/src/lib.rs
+++ b/crates/vendor/advmac/src/lib.rs
--- a/crates/vendor/advmac/src/parser.rs
+++ b/crates/vendor/advmac/src/parser.rs
--- a/crates/vendor/loopdev/Cargo.toml
+++ b/crates/vendor/loopdev/Cargo.toml
--- a/crates/vendor/loopdev/LICENSE
+++ b/crates/vendor/loopdev/LICENSE
--- a/crates/vendor/loopdev/src/bindings.rs
+++ b/crates/vendor/loopdev/src/bindings.rs
--- a/crates/vendor/loopdev/src/lib.rs
+++ b/crates/vendor/loopdev/src/lib.rs
--- a/crates/vendor/loopdev/src/linux.rs
+++ b/crates/vendor/loopdev/src/linux.rs
--- a/crates/xen/xencall/Cargo.toml
+++ b/crates/xen/xencall/Cargo.toml
--- a/crates/xen/xencall/examples/domain_create.rs
+++ b/crates/xen/xencall/examples/domain_create.rs
--- a/crates/xen/xencall/examples/domain_info.rs
+++ b/crates/xen/xencall/examples/domain_info.rs
--- a/crates/xen/xencall/examples/vcpu_context.rs
+++ b/crates/xen/xencall/examples/vcpu_context.rs
--- a/crates/xen/xencall/examples/version_capabilities.rs
+++ b/crates/xen/xencall/examples/version_capabilities.rs
--- a/crates/xen/xencall/src/error.rs
+++ b/crates/xen/xencall/src/error.rs
--- a/crates/xen/xencall/src/lib.rs
+++ b/crates/xen/xencall/src/lib.rs
--- a/crates/xen/xencall/src/sys.rs
+++ b/crates/xen/xencall/src/sys.rs
--- a/crates/xen/xenclient/Cargo.toml
+++ b/crates/xen/xenclient/Cargo.toml
--- a/crates/xen/xenclient/examples/boot.rs
+++ b/crates/xen/xenclient/examples/boot.rs
--- a/crates/xen/xenclient/src/boot.rs
+++ b/crates/xen/xenclient/src/boot.rs
--- a/crates/xen/xenclient/src/elfloader.rs
+++ b/crates/xen/xenclient/src/elfloader.rs
--- a/crates/xen/xenclient/src/error.rs
+++ b/crates/xen/xenclient/src/error.rs
--- a/crates/xen/xenclient/src/lib.rs
+++ b/crates/xen/xenclient/src/lib.rs
--- a/crates/xen/xenclient/src/mem.rs
+++ b/crates/xen/xenclient/src/mem.rs
--- a/crates/xen/xenclient/src/sys.rs
+++ b/crates/xen/xenclient/src/sys.rs
--- a/crates/xen/xenclient/src/x86.rs
+++ b/crates/xen/xenclient/src/x86.rs
--- a/crates/xen/xenevtchn/Cargo.toml
+++ b/crates/xen/xenevtchn/Cargo.toml
--- a/crates/xen/xenevtchn/examples/simple.rs
+++ b/crates/xen/xenevtchn/examples/simple.rs
--- a/crates/xen/xenevtchn/src/error.rs
+++ b/crates/xen/xenevtchn/src/error.rs
--- a/crates/xen/xenevtchn/src/lib.rs
+++ b/crates/xen/xenevtchn/src/lib.rs
--- a/crates/xen/xenevtchn/src/sys.rs
+++ b/crates/xen/xenevtchn/src/sys.rs
--- a/crates/xen/xenstore/Cargo.toml
+++ b/crates/xen/xenstore/Cargo.toml
--- a/crates/xen/xenstore/examples/list.rs
+++ b/crates/xen/xenstore/examples/list.rs
--- a/crates/xen/xenstore/examples/watch.rs
+++ b/crates/xen/xenstore/examples/watch.rs
--- a/crates/xen/xenstore/src/bus.rs
+++ b/crates/xen/xenstore/src/bus.rs
--- a/crates/xen/xenstore/src/client.rs
+++ b/crates/xen/xenstore/src/client.rs
--- a/crates/xen/xenstore/src/error.rs
+++ b/crates/xen/xenstore/src/error.rs
--- a/crates/xen/xenstore/src/lib.rs
+++ b/crates/xen/xenstore/src/lib.rs
--- a/crates/xen/xenstore/src/sys.rs
+++ b/crates/xen/xenstore/src/sys.rs