Skip to content

Drop versionize support, substitute with serde #4230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
snapshot: remove versionize dependencies
Remove versionize and versionize_derive dependencies.

Also, re-enable the rust integration tests. Now that we have all of the
state serialized with serde these should work again.

Signed-off-by: Babis Chalios <[email protected]>
  • Loading branch information
bchalios committed Jan 12, 2024
commit 4bf66dd9f1b7b99e5f8b0d2b406aa0916eb4257c
32 changes: 0 additions & 32 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions src/utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ libc = "0.2.147"
serde = { version = "1.0.165", features = ["derive"] }
thiserror = "1.0.32"
displaydoc = "0.2.4"
versionize = "0.2.0"
versionize_derive = "0.1.6"
vmm-sys-util = "0.12.0"
vmm-sys-util = "0.12.1"
vm-memory = { version = "0.13.0", features = ["backend-mmap", "backend-bitmap"] }
log-instrument = { path = "../log-instrument", optional = true }

Expand Down
2 changes: 0 additions & 2 deletions src/vmm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ timerfd = "1.5.0"
thiserror = "1.0.32"
displaydoc = "0.2.4"
userfaultfd = "0.7.0"
versionize = "0.2.0"
versionize_derive = "0.1.6"
vhost = { version = "0.10.0", features = ["vhost-user-frontend"] }
vm-allocator = "0.1.0"
vm-superio = "0.7.0"
Expand Down
2 changes: 0 additions & 2 deletions src/vmm/tests/integration_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,6 @@ fn verify_load_snapshot(snapshot_file: TempFile, memory_file: TempFile) {
vmm.lock().unwrap().stop(FcExitCode::Ok);
}

#[ignore]
#[test]
fn test_create_and_load_snapshot() {
// Create diff snapshot.
Expand All @@ -283,7 +282,6 @@ fn test_create_and_load_snapshot() {
verify_load_snapshot(snapshot_file, memory_file);
}

#[ignore]
#[test]
fn test_snapshot_load_sanity_checks() {
use vmm::persist::SnapShotStateSanityCheckError;
Expand Down