Skip to content

Commit 8757b06

Browse files
committed
refactor: Rename VmError::VmFd to VmError::CreateVm
The error variant is used when creating a new VM from KVM FD via KVM_CREATE_VM call. On success, VM FD is returned. The previous error message doesn't tell a lie but is a bit unintuitive. Signed-off-by: Takahiro Itazuri <[email protected]>
1 parent 26a3a1e commit 8757b06

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/vmm/src/vstate/vm/aarch64.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub enum ArchVmError {
3030
impl ArchVm {
3131
/// Create a new `Vm` struct.
3232
pub fn new(kvm: &Kvm) -> Result<ArchVm, VmError> {
33-
let fd = kvm.fd.create_vm().map_err(VmError::VmFd)?;
33+
let fd = kvm.fd.create_vm().map_err(VmError::CreateVm)?;
3434
Ok(ArchVm {
3535
fd,
3636
irqchip_handle: None,

src/vmm/src/vstate/vm/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ use crate::Vcpu;
3030
pub enum VmError {
3131
/// Cannot set the memory regions: {0}
3232
SetUserMemoryRegion(kvm_ioctls::Error),
33-
/// Cannot open the VM file descriptor: {0}
34-
VmFd(kvm_ioctls::Error),
33+
/// Failed to create VM: {0}
34+
CreateVm(kvm_ioctls::Error),
3535
/// {0}
3636
Arch(#[from] ArchVmError),
3737
/// Error during eventfd operations: {0}

src/vmm/src/vstate/vm/x86_64.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pub struct ArchVm {
5353
impl ArchVm {
5454
/// Create a new `Vm` struct.
5555
pub fn new(kvm: &crate::vstate::kvm::Kvm) -> Result<ArchVm, VmError> {
56-
let fd = kvm.fd.create_vm().map_err(VmError::VmFd)?;
56+
let fd = kvm.fd.create_vm().map_err(VmError::CreateVm)?;
5757
let msrs_to_save = kvm.msrs_to_save().map_err(ArchVmError::GetMsrsToSave)?;
5858

5959
fd.set_tss_address(u64_to_usize(crate::arch::x86_64::layout::KVM_TSS_ADDRESS))

0 commit comments

Comments
 (0)