pxcloud/vhost-device
5
0
Fork 0
mirror of https://github.com/rust-vmm/vhost-device.git synced 2026-01-09 22:25:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update versions of rust-vmm dependency crates

Browse Source 
Update a number of rust-vmm crates to align to the common version of
vm-memory.

Also update the tests to fix the build.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
This commit is contained in:
Viresh Kumar 2022-07-11 09:57:19 +05:30
parent bd4cd4544a
commit c037e60442
7 changed files with 33 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Cargo.lock generated
View File

@ -431,7 +431,7 @@ checksum = "53567fd9ab820e4f3cc156f24146882fee3c365194c3e1dea74723265f27fc88"
dependencies = [
"bitflags",
"libc",
"vm-memory 0.8.0",
"vm-memory",
"vmm-sys-util",
]
@ -449,7 +449,7 @@ dependencies = [
"vhost-user-backend",
"virtio-bindings",
"virtio-queue",
"vm-memory 0.8.0",
"vm-memory",
"vmm-sys-util",
]
@ -466,7 +466,7 @@ dependencies = [
"vhost-user-backend",
"virtio-bindings",
"virtio-queue",
"vm-memory 0.8.0",
"vm-memory",
"vmm-sys-util",
]
@ -486,22 +486,22 @@ dependencies = [
"vhost-user-backend",
"virtio-bindings",
"virtio-queue",
"vm-memory 0.8.0",
"vm-memory",
"vmm-sys-util",
]
[[package]]
name = "vhost-user-backend"
version = "0.3.0"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1490f2028d4f119b2292efe218b5f8cfc6471f039b53b6a6eb5d9513e964facc"
checksum = "3eeb6723bbee20dbc2db95c575941922fb96e77eb41786ecd1c8c03348709c4c"
dependencies = [
"libc",
"log",
"vhost",
"virtio-bindings",
"virtio-queue",
"vm-memory 0.7.0",
"vm-memory",
"vmm-sys-util",
]
@ -513,26 +513,15 @@ checksum = "3ff512178285488516ed85f15b5d0113a7cdb89e9e8a760b269ae4f02b84bd6b"
[[package]]
name = "virtio-queue"
version = "0.2.0"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3785325315e6496fa88673842ee6cd198b9658e88e8b0e1ad48a5dc818b221dc"
checksum = "519c0a333c871650269cba303bc108075d52a0c0d64f9b91fae61829b53725af"
dependencies = [
"log",
"vm-memory 0.7.0",
"vm-memory",
"vmm-sys-util",
]
[[package]]
name = "vm-memory"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "339d4349c126fdcd87e034631d7274370cf19eb0e87b33166bcd956589fc72c5"
dependencies = [
"arc-swap",
"libc",
"winapi",
]
[[package]]
name = "vm-memory"
version = "0.8.0"

10
gpio/Cargo.toml
View File

@ -18,15 +18,15 @@ libc = ">=0.2.95"
log = ">=0.4.6"
thiserror = "1.0"
vhost = { version = "0.4", features = ["vhost-user-slave"] }
vhost-user-backend = "0.3"
vhost-user-backend = "0.5"
virtio-bindings = ">=0.1"
virtio-queue = "0.2"
vm-memory = ">=0.7"
virtio-queue = "0.4"
vm-memory = ">=0.8"
vmm-sys-util = "=0.9.0"
[target.'cfg(target_env = "gnu")'.dependencies]
libgpiod = { git = "https://github.com/vireshk/libgpiod" }
[dev-dependencies]
virtio-queue = { version = "0.2", features = ["test-utils"] }
vm-memory = { version = ">=0.7.0", features = ["backend-mmap", "backend-atomic"] }
virtio-queue = { version = "0.4", features = ["test-utils"] }
vm-memory = { version = ">=0.8.0", features = ["backend-mmap", "backend-atomic"] }

6
gpio/src/vhu_gpio.rs
View File

@ -518,13 +518,13 @@ mod tests {
);
mem.write_obj::<R>(out_hdr, desc_out.addr()).unwrap();
vq.desc_table().store(index, desc_out);
vq.desc_table().store(index, desc_out).unwrap();
next_addr += desc_out.len() as u64;
index += 1;
// In response descriptor
let desc_in = Descriptor::new(next_addr, response_len, VIRTQ_DESC_F_WRITE, 0);
vq.desc_table().store(index, desc_in);
vq.desc_table().store(index, desc_in).unwrap();
// Put the descriptor index 0 in the first available ring position.
mem.write_obj(0u16, vq.avail_addr().unchecked_add(4))
@ -597,7 +597,7 @@ mod tests {
};
let desc = Descriptor::new(offset, len[i], f, (i + 1) as u16);
vq.desc_table().store(i as u16, desc);
vq.desc_table().store(i as u16, desc).unwrap();
}
// Put the descriptor index 0 in the first available ring position.

10
i2c/Cargo.toml
View File

@ -18,12 +18,12 @@ libc = ">=0.2.95"
log = ">=0.4.6"
thiserror = "1.0"
vhost = { version = "0.4", features = ["vhost-user-slave"] }
vhost-user-backend = "0.3"
vhost-user-backend = "0.5"
virtio-bindings = ">=0.1"
virtio-queue = "0.2"
vm-memory = ">=0.7"
virtio-queue = "0.4"
vm-memory = ">=0.8"
vmm-sys-util = "=0.9.0"
[dev-dependencies]
virtio-queue = { version = "0.2", features = ["test-utils"] }
vm-memory = { version = ">=0.7.0", features = ["backend-mmap", "backend-atomic"] }
virtio-queue = { version = "0.4", features = ["test-utils"] }
vm-memory = { version = ">=0.8.0", features = ["backend-mmap", "backend-atomic"] }

8
i2c/src/vhu_i2c.rs
View File

@ -391,7 +391,7 @@ mod tests {
mem.write_obj::<VirtioI2cOutHdr>(out_hdr, desc_out.addr())
.unwrap();
vq.desc_table().store(index, desc_out);
vq.desc_table().store(index, desc_out).unwrap();
next_addr += desc_out.len() as u64;
index += 1;
@ -412,14 +412,14 @@ mod tests {
index + 1,
);
mem.write(buf, desc_buf.addr()).unwrap();
vq.desc_table().store(index, desc_buf);
vq.desc_table().store(index, desc_buf).unwrap();
next_addr += desc_buf.len() as u64;
index += 1;
}
// In response descriptor
let desc_in = Descriptor::new(next_addr, size_of::<u8>() as u32, VIRTQ_DESC_F_WRITE, 0);
vq.desc_table().store(index, desc_in);
vq.desc_table().store(index, desc_in).unwrap();
// Put the descriptor index 0 in the first available ring position.
mem.write_obj(0u16, vq.avail_addr().unchecked_add(4))
@ -492,7 +492,7 @@ mod tests {
};
let desc = Descriptor::new(offset, len[i], f, (i + 1) as u16);
vq.desc_table().store(i as u16, desc);
vq.desc_table().store(i as u16, desc).unwrap();
}
// Put the descriptor index 0 in the first available ring position.

10
rng/Cargo.toml
View File

@ -19,12 +19,12 @@ rand = ">=0.8.5"
tempfile = "3.2.0"
thiserror = "1.0"
vhost = { version = "0.4", features = ["vhost-user-slave"] }
vhost-user-backend = "0.3"
vhost-user-backend = "0.5"
virtio-bindings = ">=0.1"
virtio-queue = "0.2"
vm-memory = ">=0.7"
virtio-queue = "0.4"
vm-memory = ">=0.8"
vmm-sys-util = ">=0.9.0"
[dev-dependencies]
virtio-queue = { version = "0.2", features = ["test-utils"] }
vm-memory = { version = ">=0.7.0", features = ["backend-mmap", "backend-atomic"] }
virtio-queue = { version = "0.4", features = ["test-utils"] }
vm-memory = { version = ">=0.8.0", features = ["backend-mmap", "backend-atomic"] }

2
rng/src/vhu_rng.rs
View File

@ -349,7 +349,7 @@ mod tests {
};
let desc = Descriptor::new((0x100 * (i + 1)) as u64, 0x200, desc_flags, i + 1);
vq.desc_table().store(i, desc);
vq.desc_table().store(i, desc).unwrap();
}
// Put the descriptor index 0 in the first available ring position.