Skip to content

Commit 8a83183

Browse files
roypatShadowCurse
authored andcommitted
fix: import Bytes trait
vm-memory moved the read_exact_volatile_from function from GuestMemory to Bytes, so import this trait wherever we use the function. Signed-off-by: Patrick Roy <patrick.roy@linux.dev>
1 parent bcc6d86 commit 8a83183

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/loader/bzimage/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use std::fmt;
1515
use std::io::{Seek, SeekFrom};
1616

17-
use vm_memory::{Address, ByteValued, GuestAddress, GuestMemory, GuestUsize, ReadVolatile};
17+
use vm_memory::{Address, ByteValued, Bytes, GuestAddress, GuestMemory, GuestUsize, ReadVolatile};
1818

1919
use crate::loader::{
2020
bootparam, Error as KernelLoaderError, KernelLoader, KernelLoaderResult, Result,

src/loader/elf/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use std::io::{Read, Seek, SeekFrom};
1717
use std::mem;
1818
use std::result;
1919

20-
use vm_memory::{Address, ByteValued, GuestAddress, GuestMemory, GuestUsize, ReadVolatile};
20+
use vm_memory::{Address, ByteValued, Bytes, GuestAddress, GuestMemory, GuestUsize, ReadVolatile};
2121

2222
use crate::loader::{Error as KernelLoaderError, KernelLoader, KernelLoaderResult, Result};
2323
use crate::loader_gen::elf;

src/loader/pe/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use std::fmt;
1515
use std::io::{Read, Seek, SeekFrom};
1616

17-
use vm_memory::{Address, ByteValued, GuestAddress, GuestMemory, GuestUsize, ReadVolatile};
17+
use vm_memory::{Address, ByteValued, Bytes, GuestAddress, GuestMemory, GuestUsize, ReadVolatile};
1818

1919
use crate::loader::{Error as KernelLoaderError, KernelLoader, KernelLoaderResult, Result};
2020

0 commit comments

Comments
 (0)