Skip to content

Commit 748970a

Browse files
dianpopasandreim
dianpopa
authored and
sandreim
committed
use latest versionize/versionize_derive
Other style adjustments were applied. Signed-off-by: Diana Popa <[email protected]>
1 parent f749e90 commit 748970a

File tree

15 files changed

+42
-486
lines changed

15 files changed

+42
-486
lines changed

‎Cargo.lock

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

‎src/arch/Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ edition = "2018"
88
kvm-bindings = { git = "https://github.com/firecracker-microvm/kvm-bindings", tag = "v0.2.0-2", features = ["fam-wrappers"] }
99
kvm-ioctls = { git = "https://github.com/firecracker-microvm/kvm-ioctls", tag = "v0.5.0-2" }
1010
libc = ">=0.2.39"
11-
utils = { path = "../utils" }
11+
vm-memory = { version = ">=0.2.2", features = ["backend-mmap"] }
1212

1313
arch_gen = { path = "../arch_gen" }
14-
vm-memory = { version = ">=0.2.2", features = ["backend-mmap"] }
14+
utils = { path = "../utils" }
1515

1616
[dev-dependencies]
17-
utils = { path = "../utils" }
1817
device_tree = ">=1.1.0"

‎src/cpuid/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ edition = "2018"
77
[dependencies]
88
kvm-bindings = { git = "https://github.com/firecracker-microvm/kvm-bindings", tag = "v0.2.0-2", features = ["fam-wrappers"] }
99
kvm-ioctls = { git = "https://github.com/firecracker-microvm/kvm-ioctls", tag = "v0.5.0-2" }
10+
1011
utils = { path = "../utils"}

‎src/devices/Cargo.toml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,18 @@ edition = "2018"
66

77
[dependencies]
88
libc = ">=0.2.39"
9+
timerfd = ">=1.0"
10+
versionize = ">=0.1.2"
11+
versionize_derive = ">=0.1.1"
12+
vm-memory = { version = ">=0.2.2", features = ["backend-mmap"] }
13+
914
dumbo = { path = "../dumbo" }
1015
logger = { path = "../logger" }
11-
vm-memory = { version = ">=0.2.2", features = ["backend-mmap"] }
12-
utils = { path = "../utils" }
16+
mmds = { path = "../mmds" }
1317
net_gen = { path = "../net_gen" }
1418
polly = { path = "../polly" }
1519
rate_limiter = { path = "../rate_limiter" }
1620
snapshot = { path = "../snapshot" }
17-
timerfd = ">=1.0"
18-
versionize = { version = "0.1.1" }
19-
versionize_derive = { git = "https://github.com/firecracker-microvm/versionize_derive", tag = "v0.1.0" }
21+
utils = { path = "../utils" }
2022
virtio_gen = { path = "../virtio_gen" }
21-
mmds = { path = "../mmds" }
23+

‎src/dumbo/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ edition = "2018"
66

77
[dependencies]
88
bitflags = ">=1.0.4"
9-
serde = ">=1.0.27"
109

1110
utils = { path = "../utils" }
1211
logger = { path = "../logger" }

‎src/kernel/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ edition = "2018"
55

66
[dependencies]
77
vm-memory = { version = ">=0.2.2", features = ["backend-mmap"] }
8+
89
utils = { path = "../utils" }

‎src/logger/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,3 @@ serde_json = ">=1.0.9"
1313

1414
utils = { path = "../utils" }
1515

16-
[dev-dependencies]
17-
libc = ">=0.2.39"

‎src/micro_http/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ edition = "2018"
66

77
[dependencies]
88
libc = ">=0.2.39"
9+
910
utils = { path = "../utils" }

‎src/mmds/Cargo.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ edition = "2018"
77
[dependencies]
88
lazy_static = ">=1.1.0"
99
serde_json = ">=1.0.9"
10+
versionize = ">=0.1.2"
11+
versionize_derive = ">=0.1.1"
1012

13+
dumbo = { path = "../dumbo" }
14+
logger = { path = "../logger" }
1115
micro_http = { path = "../micro_http" }
1216
utils = { path = "../utils" }
13-
logger = { path = "../logger" }
14-
dumbo = { path = "../dumbo" }
1517
snapshot = { path = "../snapshot" }
16-
versionize = { version = "0.1.1" }
17-
versionize_derive = { git = "https://github.com/firecracker-microvm/versionize_derive", tag = "v0.1.0" }
18+

‎src/polly/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ edition = "2018"
66

77
[dependencies]
88
libc = ">=0.2.39"
9+
910
utils = { path="../utils" }

‎src/rate_limiter/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ edition = "2018"
77
[dependencies]
88
libc = ">=0.2.39"
99
timerfd = ">=1.0"
10+
versionize = ">=0.1.2"
11+
versionize_derive = ">=0.1.1"
1012

1113
logger = { path = "../logger" }
1214
utils = { path = "../utils" }
1315
snapshot = { path = "../snapshot" }
14-
versionize = { version = "0.1.1" }
15-
versionize_derive = { git = "https://github.com/firecracker-microvm/versionize_derive", tag = "v0.1.0" }
16+

‎src/snapshot/Cargo.toml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,8 @@ edition = "2018"
66
autobenches = false
77

88
[dependencies]
9-
serde = ">=1.0.27"
10-
serde_derive = ">=1.0.27"
11-
bincode = "1.2.1"
12-
versionize = { version = "0.1.1" }
13-
versionize_derive = { git = "https://github.com/firecracker-microvm/versionize_derive", tag = "v0.1.0" }
14-
15-
[dev-dependencies]
16-
criterion = "0.3.0"
9+
versionize = "0.1.2"
10+
versionize_derive = ">=0.1.1"
1711

1812
[[bench]]
1913
name = "main"

‎src/snapshot/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
//!
2121
//! Each structure, union or enum is versioned separately and only needs to increment their version
2222
//! if a field is added or removed. For each state snapshot we define 2 versions:
23-
//! - **the format version** which refers to the SnapshotHdr, CRC, or the
24-
//! representation of primitives types (currently we use serde bincode as a backend). The current
23+
//! - **the format version** which refers to the SnapshotHdr, CRC, or the representation of
24+
//! primitives types (currently we use versionize that uses serde bincode as a backend). The current
2525
//! implementation does not have any logic dependent on it.
2626
//! - **the data version** which refers to the state.
2727
//!

‎src/utils/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ vmm-sys-util = ">=0.6.1"
1111

1212
net_gen = { path = "../net_gen" }
1313

14-
1514
[dev-dependencies]
1615
serde_json = ">=1.0.9"
1716

‎src/vmm/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@ authors = ["Amazon Firecracker team <[email protected]>"]
55
edition = "2018"
66

77
[dependencies]
8-
kvm-bindings = { git = "https://github.com/firecracker-microvm/kvm-bindings", tag = "v0.2.0-2", features = ["fam-wrappers"] }
9-
kvm-ioctls = { git = "https://github.com/firecracker-microvm/kvm-ioctls", tag = "v0.5.0-2" }
10-
lazy_static = "1.4.0"
8+
lazy_static = ">=1.4.0"
119
libc = ">=0.2.39"
1210
serde = { version = ">=1.0.27", features = ["derive"] }
1311
serde_json = ">=1.0.9"
14-
sysconf = "0.3.4"
15-
versionize = { version = "0.1.1" }
16-
versionize_derive = { git = "https://github.com/firecracker-microvm/versionize_derive", tag = "v0.1.0" }
12+
sysconf = ">=0.3.4"
13+
versionize = ">=0.1.2"
14+
versionize_derive = ">=0.1.1"
15+
vm-memory = { version = ">=0.2.2", features = ["backend-mmap"] }
1716

1817
arch = { path = "../arch" }
1918
devices = { path = "../devices" }
2019
kernel = { path = "../kernel" }
20+
kvm-bindings = { git = "https://github.com/firecracker-microvm/kvm-bindings", tag = "v0.2.0-2", features = ["fam-wrappers"] }
21+
kvm-ioctls = { git = "https://github.com/firecracker-microvm/kvm-ioctls", tag = "v0.5.0-2" }
2122
logger = { path = "../logger" }
22-
vm-memory = { version = ">=0.2.2", features = ["backend-mmap"] }
2323
mmds = { path = "../mmds" }
24+
polly = { path = "../polly" }
2425
rate_limiter = { path = "../rate_limiter" }
2526
seccomp = { path = "../seccomp" }
26-
polly = { path = "../polly" }
2727
snapshot = { path = "../snapshot"}
2828
utils = { path = "../utils" }
2929

0 commit comments

Comments
 (0)