From 02409f0a0969724450ce8998a5388e22718adbe2 Mon Sep 17 00:00:00 2001 From: Matej Hrica Date: Mon, 27 Jan 2025 13:59:38 +0100 Subject: [PATCH] Move vhost-user-gpu from staging to main directory The CLI interface should be stable now and coverage is good. Support for more backends as described in the README is comming later. Note that this decreases the test coverage in the staging directory from 82.43% to 74.62%. Signed-off-by: Matej Hrica --- .buildkite/staging-tests.json | 4 +- Cargo.lock | 157 +++++++++++- Cargo.toml | 1 + coverage_config_x86_64.json | 2 +- staging/Cargo.lock | 237 +----------------- staging/Cargo.toml | 1 - staging/coverage_config_x86_64.json | 2 +- .../CHANGELOG.md | 0 .../Cargo.toml | 0 .../LICENSE-APACHE | 0 .../LICENSE-BSD-3-Clause | 0 .../README.md | 0 .../rustfmt.toml | 0 .../src/device.rs | 0 .../src/lib.rs | 0 .../src/main.rs | 0 .../src/protocol.rs | 0 .../src/virtio_gpu.rs | 0 18 files changed, 162 insertions(+), 242 deletions(-) rename {staging/vhost-device-gpu => vhost-device-gpu}/CHANGELOG.md (100%) rename {staging/vhost-device-gpu => vhost-device-gpu}/Cargo.toml (100%) rename {staging/vhost-device-gpu => vhost-device-gpu}/LICENSE-APACHE (100%) rename {staging/vhost-device-gpu => vhost-device-gpu}/LICENSE-BSD-3-Clause (100%) rename {staging/vhost-device-gpu => vhost-device-gpu}/README.md (100%) rename {staging/vhost-device-gpu => vhost-device-gpu}/rustfmt.toml (100%) rename {staging/vhost-device-gpu => vhost-device-gpu}/src/device.rs (100%) rename {staging/vhost-device-gpu => vhost-device-gpu}/src/lib.rs (100%) rename {staging/vhost-device-gpu => vhost-device-gpu}/src/main.rs (100%) rename {staging/vhost-device-gpu => vhost-device-gpu}/src/protocol.rs (100%) rename {staging/vhost-device-gpu => vhost-device-gpu}/src/virtio_gpu.rs (100%) diff --git a/.buildkite/staging-tests.json b/.buildkite/staging-tests.json index ad8a7f8..dcc8d42 100644 --- a/.buildkite/staging-tests.json +++ b/.buildkite/staging-tests.json @@ -11,7 +11,7 @@ }, { "test_name": "staging: build-musl", - "command": "cd staging && RUSTFLAGS=\"-D warnings\" cargo build --release --workspace --exclude vhost-device-gpu --target {target_platform}-unknown-linux-musl", + "command": "cd staging && RUSTFLAGS=\"-D warnings\" cargo build --release --target {target_platform}-unknown-linux-musl", "soft_fail": "true", "platform": [ "x86_64", @@ -33,7 +33,7 @@ }, { "test_name": "staging: unittests-musl", - "command": "cd staging && cargo test --all-features --workspace --exclude vhost-device-gpu --target {target_platform}-unknown-linux-musl", + "command": "cd staging && cargo test --all-features --workspace --target {target_platform}-unknown-linux-musl", "soft_fail": "true", "platform": [ "x86_64", diff --git a/Cargo.lock b/Cargo.lock index 6bfd331..b4f39d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -239,6 +239,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "cfg_aliases" version = "0.2.1" @@ -358,6 +364,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "downcast" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" + [[package]] name = "either" version = "1.13.0" @@ -486,6 +498,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "fragile" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" + [[package]] name = "funty" version = "2.0.0" @@ -836,6 +854,32 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "mockall" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39a6bfcc6c8c7eed5ee98b9c3e33adc726054389233e201c95dab2d41a3839d2" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "mockall_derive", + "predicates", + "predicates-tree", +] + +[[package]] +name = "mockall_derive" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25ca3004c2efe9011bd4e461bd8256445052b9615405b4f7ea43fc8ca5c20898" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "nb" version = "1.1.0" @@ -878,6 +922,19 @@ dependencies = [ "libc", ] +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.8.0", + "cfg-if", + "cfg_aliases 0.1.1", + "libc", + "memoffset", +] + [[package]] name = "nix" version = "0.29.0" @@ -886,7 +943,7 @@ checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ "bitflags 2.8.0", "cfg-if", - "cfg_aliases", + "cfg_aliases 0.2.1", "libc", "memoffset", ] @@ -1012,6 +1069,32 @@ dependencies = [ "zerocopy 0.7.35", ] +[[package]] +name = "predicates" +version = "3.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573" +dependencies = [ + "anstyle", + "predicates-core", +] + +[[package]] +name = "predicates-core" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa" + +[[package]] +name = "predicates-tree" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c" +dependencies = [ + "predicates-core", + "termtree", +] + [[package]] name = "proc-macro-crate" version = "3.2.0" @@ -1132,6 +1215,17 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" +[[package]] +name = "remain" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46aef80f842736de545ada6ec65b81ee91504efd6853f4b96de7414c42ae7443" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "rstest" version = "0.24.0" @@ -1202,6 +1296,26 @@ dependencies = [ "wait-timeout", ] +[[package]] +name = "rutabaga_gfx" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acd02427a8910f1913170f0452fd8367ba4f530fa3c479bf247b7c988934dd6" +dependencies = [ + "anyhow", + "cfg-if", + "libc", + "log", + "nix 0.28.0", + "pkg-config", + "remain", + "serde", + "serde_json", + "thiserror 1.0.69", + "winapi", + "zerocopy 0.7.35", +] + [[package]] name = "ryu" version = "1.0.19" @@ -1240,6 +1354,18 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "serde_json" +version = "1.0.138" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + [[package]] name = "serde_spanned" version = "0.6.8" @@ -1442,6 +1568,12 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "termtree" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683" + [[package]] name = "thiserror" version = "1.0.69" @@ -1682,6 +1814,29 @@ dependencies = [ "vmm-sys-util", ] +[[package]] +name = "vhost-device-gpu" +version = "0.1.0" +dependencies = [ + "assert_matches", + "bitflags 2.8.0", + "clap", + "env_logger", + "libc", + "log", + "mockall", + "rusty-fork", + "rutabaga_gfx", + "tempfile", + "thiserror 2.0.11", + "vhost", + "vhost-user-backend", + "virtio-bindings", + "virtio-queue", + "vm-memory", + "vmm-sys-util", +] + [[package]] name = "vhost-device-i2c" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 8b84948..54a1c46 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,6 +5,7 @@ members = [ "vhost-device-can", "vhost-device-console", "vhost-device-gpio", + "vhost-device-gpu", "vhost-device-i2c", "vhost-device-input", "vhost-device-rng", diff --git a/coverage_config_x86_64.json b/coverage_config_x86_64.json index f9b448b..79c169f 100644 --- a/coverage_config_x86_64.json +++ b/coverage_config_x86_64.json @@ -1,5 +1,5 @@ { - "coverage_score": 86.55, + "coverage_score": 86.60, "exclude_path": "", "crate_features": "" } diff --git a/staging/Cargo.lock b/staging/Cargo.lock index 0a27ace..3f12e28 100644 --- a/staging/Cargo.lock +++ b/staging/Cargo.lock @@ -109,12 +109,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - [[package]] name = "clap" version = "4.5.29" @@ -161,12 +155,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" -[[package]] -name = "downcast" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" - [[package]] name = "enumn" version = "0.1.14" @@ -233,18 +221,6 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "fragile" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" - [[package]] name = "futures-core" version = "0.3.31" @@ -358,12 +334,6 @@ version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" -[[package]] -name = "itoa" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" - [[package]] name = "libc" version = "0.2.169" @@ -388,41 +358,6 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mockall" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39a6bfcc6c8c7eed5ee98b9c3e33adc726054389233e201c95dab2d41a3839d2" -dependencies = [ - "cfg-if", - "downcast", - "fragile", - "mockall_derive", - "predicates", - "predicates-tree", -] - -[[package]] -name = "mockall_derive" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25ca3004c2efe9011bd4e461bd8256445052b9615405b4f7ea43fc8ca5c20898" -dependencies = [ - "cfg-if", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "nix" version = "0.27.1" @@ -434,19 +369,6 @@ dependencies = [ "libc", ] -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.8.0", - "cfg-if", - "cfg_aliases", - "libc", - "memoffset", -] - [[package]] name = "num_cpus" version = "1.16.0" @@ -496,12 +418,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkg-config" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" - [[package]] name = "ppv-lite86" version = "0.2.20" @@ -511,32 +427,6 @@ dependencies = [ "zerocopy 0.7.35", ] -[[package]] -name = "predicates" -version = "3.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573" -dependencies = [ - "anstyle", - "predicates-core", -] - -[[package]] -name = "predicates-core" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa" - -[[package]] -name = "predicates-tree" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c" -dependencies = [ - "predicates-core", - "termtree", -] - [[package]] name = "proc-macro-crate" version = "3.2.0" @@ -555,12 +445,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quote" version = "1.0.38" @@ -636,17 +520,6 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" -[[package]] -name = "remain" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46aef80f842736de545ada6ec65b81ee91504efd6853f4b96de7414c42ae7443" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "rstest" version = "0.24.0" @@ -699,82 +572,12 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "rusty-fork" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" -dependencies = [ - "fnv", - "quick-error", - "tempfile", - "wait-timeout", -] - -[[package]] -name = "rutabaga_gfx" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acd02427a8910f1913170f0452fd8367ba4f530fa3c479bf247b7c988934dd6" -dependencies = [ - "anyhow", - "cfg-if", - "libc", - "log", - "nix 0.28.0", - "pkg-config", - "remain", - "serde", - "serde_json", - "thiserror 1.0.69", - "winapi", - "zerocopy 0.7.35", -] - -[[package]] -name = "ryu" -version = "1.0.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" - [[package]] name = "semver" version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03" -[[package]] -name = "serde" -version = "1.0.217" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.217" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.138" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde", -] - [[package]] name = "slab" version = "0.4.9" @@ -815,12 +618,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "termtree" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683" - [[package]] name = "thiserror" version = "1.0.69" @@ -921,7 +718,7 @@ dependencies = [ "bitflags 2.8.0", "enumn", "log", - "nix 0.27.1", + "nix", "thiserror 1.0.69", ] @@ -938,29 +735,6 @@ dependencies = [ "vmm-sys-util", ] -[[package]] -name = "vhost-device-gpu" -version = "0.1.0" -dependencies = [ - "assert_matches", - "bitflags 2.8.0", - "clap", - "env_logger", - "libc", - "log", - "mockall", - "rusty-fork", - "rutabaga_gfx", - "tempfile", - "thiserror 2.0.11", - "vhost", - "vhost-user-backend", - "virtio-bindings", - "virtio-queue", - "vm-memory", - "vmm-sys-util", -] - [[package]] name = "vhost-device-video" version = "0.1.0" @@ -1043,15 +817,6 @@ dependencies = [ "libc", ] -[[package]] -name = "wait-timeout" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11" -dependencies = [ - "libc", -] - [[package]] name = "wasi" version = "0.13.3+wasi-0.2.2" diff --git a/staging/Cargo.toml b/staging/Cargo.toml index fc3b8af..be199ad 100644 --- a/staging/Cargo.toml +++ b/staging/Cargo.toml @@ -1,6 +1,5 @@ [workspace] resolver = "2" members = [ - "vhost-device-gpu", "vhost-device-video", ] diff --git a/staging/coverage_config_x86_64.json b/staging/coverage_config_x86_64.json index ce5bb62..9a8bf06 100644 --- a/staging/coverage_config_x86_64.json +++ b/staging/coverage_config_x86_64.json @@ -1,5 +1,5 @@ { - "coverage_score": 82.43, + "coverage_score": 74.62, "exclude_path": "", "crate_features": "" } diff --git a/staging/vhost-device-gpu/CHANGELOG.md b/vhost-device-gpu/CHANGELOG.md similarity index 100% rename from staging/vhost-device-gpu/CHANGELOG.md rename to vhost-device-gpu/CHANGELOG.md diff --git a/staging/vhost-device-gpu/Cargo.toml b/vhost-device-gpu/Cargo.toml similarity index 100% rename from staging/vhost-device-gpu/Cargo.toml rename to vhost-device-gpu/Cargo.toml diff --git a/staging/vhost-device-gpu/LICENSE-APACHE b/vhost-device-gpu/LICENSE-APACHE similarity index 100% rename from staging/vhost-device-gpu/LICENSE-APACHE rename to vhost-device-gpu/LICENSE-APACHE diff --git a/staging/vhost-device-gpu/LICENSE-BSD-3-Clause b/vhost-device-gpu/LICENSE-BSD-3-Clause similarity index 100% rename from staging/vhost-device-gpu/LICENSE-BSD-3-Clause rename to vhost-device-gpu/LICENSE-BSD-3-Clause diff --git a/staging/vhost-device-gpu/README.md b/vhost-device-gpu/README.md similarity index 100% rename from staging/vhost-device-gpu/README.md rename to vhost-device-gpu/README.md diff --git a/staging/vhost-device-gpu/rustfmt.toml b/vhost-device-gpu/rustfmt.toml similarity index 100% rename from staging/vhost-device-gpu/rustfmt.toml rename to vhost-device-gpu/rustfmt.toml diff --git a/staging/vhost-device-gpu/src/device.rs b/vhost-device-gpu/src/device.rs similarity index 100% rename from staging/vhost-device-gpu/src/device.rs rename to vhost-device-gpu/src/device.rs diff --git a/staging/vhost-device-gpu/src/lib.rs b/vhost-device-gpu/src/lib.rs similarity index 100% rename from staging/vhost-device-gpu/src/lib.rs rename to vhost-device-gpu/src/lib.rs diff --git a/staging/vhost-device-gpu/src/main.rs b/vhost-device-gpu/src/main.rs similarity index 100% rename from staging/vhost-device-gpu/src/main.rs rename to vhost-device-gpu/src/main.rs diff --git a/staging/vhost-device-gpu/src/protocol.rs b/vhost-device-gpu/src/protocol.rs similarity index 100% rename from staging/vhost-device-gpu/src/protocol.rs rename to vhost-device-gpu/src/protocol.rs diff --git a/staging/vhost-device-gpu/src/virtio_gpu.rs b/vhost-device-gpu/src/virtio_gpu.rs similarity index 100% rename from staging/vhost-device-gpu/src/virtio_gpu.rs rename to vhost-device-gpu/src/virtio_gpu.rs