Skip to content

Commit cfebd11

Browse files
roypatzulinx86
authored andcommitted
chore: remove kernel_version.rs module
With all the 4.14 checks gone, this module is dead code, so remove it. If it ever becomes useful again, we can reintroduce it, that's what we have version control for after all. Signed-off-by: Patrick Roy <[email protected]>
1 parent 3964802 commit cfebd11

File tree

4 files changed

+0
-159
lines changed

4 files changed

+0
-159
lines changed

src/utils/src/kernel_version.rs

Lines changed: 0 additions & 147 deletions
This file was deleted.

src/utils/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ pub use vmm_sys_util::{
1313

1414
pub mod arg_parser;
1515
pub mod byte_order;
16-
pub mod kernel_version;
1716
pub mod net;
1817
pub mod signal;
1918
pub mod sm;

src/vmm/src/devices/virtio/block/virtio/io/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ pub enum BlockIoError {
3030
Sync(SyncIoError),
3131
/// Async error: {0}
3232
Async(AsyncIoError),
33-
/// Could not get kernel version: {0}
34-
GetKernelVersion(utils::kernel_version::KernelVersionError),
3533
}
3634

3735
impl BlockIoError {

src/vmm/src/vmm_config/machine_config.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
use std::fmt::Debug;
44

55
use serde::{Deserialize, Serialize};
6-
use utils::kernel_version;
76

87
use crate::cpu_config::templates::{CpuTemplateType, CustomCpuTemplate, StaticCpuTemplate};
98

@@ -36,14 +35,6 @@ pub enum VmConfigError {
3635
InitrdAndHugePages,
3736
}
3837

39-
// We cannot do a `KernelVersion(kernel_version::Error)` variant because `kernel_version::Error`
40-
// does not implement `PartialEq, Eq` (due to containing an io error).
41-
impl From<kernel_version::KernelVersionError> for VmConfigError {
42-
fn from(_: kernel_version::KernelVersionError) -> Self {
43-
VmConfigError::KernelVersion
44-
}
45-
}
46-
4738
/// Describes the possible (huge)page configurations for a microVM's memory.
4839
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
4940
pub enum HugePageConfig {

0 commit comments

Comments
 (0)