Skip to content

Commit 119a679

Browse files
hoshinolinaslp
authored andcommitted
muvm-x11bridge: Vendor in x112virtgpu and rename it
This is based on x112virtgpu commit bd78728493d8f19: WhatAmISupposedToPutHere/x112virtgpu@bd78728 With the following changes: - Replaced util::create_shm_file() with nix::unistd::mkstemp() - Replaced clap with bpaf (so we don't have two cmdline parsing crates) - Fixed the clippy warnings - Dropped the other targets (preload, wrapper) Co-developed-by: Sasha Finkelstein <[email protected]> Signed-off-by: Sasha Finkelstein <[email protected]> Acked-by: Sasha Finkelstein <[email protected]> Signed-off-by: Asahi Lina <[email protected]>
1 parent b706c35 commit 119a679

3 files changed

Lines changed: 1652 additions & 10 deletions

File tree

Cargo.lock

Lines changed: 24 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/muvm/Cargo.toml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ byteorder = { version = "1.5.0", default-features = false, features = ["std"] }
1515
env_logger = { version = "0.11.3", default-features = false, features = ["auto-color", "humantime", "unstable-kv"] }
1616
krun-sys = { path = "../krun-sys", version = "1.9.1", default-features = false, features = [] }
1717
log = { version = "0.4.21", default-features = false, features = ["kv"] }
18-
nix = { version = "0.28.0", default-features = false, features = ["user"] }
18+
nix = { version = "0.29.0", default-features = false, features = ["user"] }
1919
procfs = { version = "0.17.0", default-features = false, features = [] }
2020
rustix = { version = "0.38.34", default-features = false, features = ["fs", "mount", "process", "std", "stdio", "system", "use-libc-auxv"] }
2121
serde = { version = "1.0.203", default-features = false, features = ["derive"] }
@@ -26,7 +26,8 @@ tokio-stream = { version = "0.1.15", default-features = false, features = ["net"
2626
uuid = { version = "1.10.0", default-features = false, features = ["serde", "std", "v7"] }
2727

2828
[features]
29-
default = []
29+
x11bridge = ["nix/event", "nix/fs", "nix/ioctl", "nix/mman", "nix/ptrace", "nix/signal", "nix/socket", "nix/uio"]
30+
default = ["x11bridge"]
3031

3132
[[bin]]
3233
name = "muvm"
@@ -39,3 +40,8 @@ path = "src/guest/bin/muvm-guest.rs"
3940
[[bin]]
4041
name = "muvm-server"
4142
path = "src/server/bin/muvm-server.rs"
43+
44+
[[bin]]
45+
name = "muvm-x11bridge"
46+
path = "src/x11bridge/bin/muvm-x11bridge.rs"
47+
required-features = ["x11bridge"]

0 commit comments

Comments
 (0)