Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update dependencies #6

Merged
merged 3 commits into from
Jan 28, 2021
Merged

Update dependencies #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc19ecd
Add disable-legacy=on to QEMU command line.
qwandor Sep 28, 2020
866064d
Use socklen_t rather than u32, as they are not always the same.
qwandor Sep 29, 2020
97a3299
Update dependencies.
qwandor Sep 28, 2020
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
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ edition = "2018"
exclude = ["test_fixture"]

[dependencies]
libc = "0.2.65"
nix = "0.17.0"
libc = "0.2.79"
nix = "0.19.1"

[dev-dependencies]
rand = "0.7.2"
rand = "0.8.3"
sha2 = ">=0.8.0"
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ kmod:
# Start a virtio socket enabled vm
vm: initrd.cpio
sudo qemu-system-x86_64 -kernel test_fixture/bzImage -initrd target/$(TOOLCHAIN)/debug/initrd.cpio \
-enable-kvm -m 256 -device vhost-vsock-pci,id=vhost-vsock-pci0,guest-cid=3 -nographic -append "console=ttyS0"
-enable-kvm -m 256 -device vhost-vsock-pci,id=vhost-vsock-pci0,guest-cid=3,disable-legacy=on -nographic -append "console=ttyS0"

# Create a simple operating system image for the vm
initrd.cpio: echo_server
Expand Down
93 changes: 42 additions & 51 deletions echo_server/Cargo.lock
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions echo_server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = "Apache-2.0"
edition = "2018"

[dependencies]
clap = "2.33.0"
libc = "0.2.65"
nix = "0.17.0"
clap = "2.33.3"
libc = "0.2.79"
nix = "0.19.0"
vsock = { path = "../" }
8 changes: 4 additions & 4 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ impl VsockListener {
bind(
socket,
&mut vsock_addr as *mut _ as *mut sockaddr,
size_of::<sockaddr_vm>() as u32,
size_of::<sockaddr_vm>() as socklen_t,
)
};
if res < 0 {
Expand Down Expand Up @@ -236,7 +236,7 @@ impl VsockStream {
connect(
sock,
&vsock_addr as *const _ as *const sockaddr,
size_of::<sockaddr_vm>() as u32,
size_of::<sockaddr_vm>() as socklen_t,
)
} < 0
{
Expand Down Expand Up @@ -322,7 +322,7 @@ impl VsockStream {
SOL_SOCKET,
SO_SNDTIMEO,
&timeout as *const _ as *const c_void,
size_of::<timeval>() as u32,
size_of::<timeval>() as socklen_t,
)
} < 0
{
Expand All @@ -341,7 +341,7 @@ impl VsockStream {
SOL_SOCKET,
SO_RCVTIMEO,
&timeout as *const _ as *const c_void,
size_of::<timeval>() as u32,
size_of::<timeval>() as socklen_t,
)
} < 0
{
Expand Down