kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

block, hypervisor: Fix cargo +nightly fmt issues

Browse Source 
Signed-off-by: Bo Chen <bchen@crusoe.ai>
This commit is contained in:
Bo Chen
2026-05-14 20:01:33 +00:00
committed by Bo Chen
parent 3ba8e92c6a
commit e2cd6ff8c9
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
block/src/lib.rs
View File

@@ -41,6 +41,7 @@ use std::str::FromStr;
use std::time::Instant; use std::time::Instant;
use std::{cmp, result}; use std::{cmp, result};
pub use aligned_operation::AlignedOperation;
#[cfg(feature = "io_uring")] #[cfg(feature = "io_uring")]
use io_uring::{IoUring, Probe, opcode}; use io_uring::{IoUring, Probe, opcode};
use libc::{S_IFBLK, S_IFMT, ioctl}; use libc::{S_IFBLK, S_IFMT, ioctl};
@@ -58,8 +59,6 @@ use vm_virtio::{AccessPlatform, Translatable};
use vmm_sys_util::eventfd::EventFd; use vmm_sys_util::eventfd::EventFd;
use vmm_sys_util::{aio, ioctl_io_nr}; use vmm_sys_util::{aio, ioctl_io_nr};
pub use aligned_operation::AlignedOperation;
use crate::async_io::{AsyncIo, AsyncIoError, AsyncIoResult}; use crate::async_io::{AsyncIo, AsyncIoError, AsyncIoResult};
use crate::vhdx::VhdxError; use crate::vhdx::VhdxError;

13
hypervisor/src/kvm/mod.rs
View File

@@ -90,11 +90,11 @@ pub use kvm_bindings::kvm_vcpu_events as VcpuEvents;
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
use kvm_bindings::nested::KvmNestedStateBuffer; use kvm_bindings::nested::KvmNestedStateBuffer;
pub use kvm_bindings::{ pub use kvm_bindings::{
KVM_GUESTDBG_ENABLE, KVM_GUESTDBG_SINGLESTEP, KVM_IRQ_ROUTING_IRQCHIP, KVM_IRQ_ROUTING_MSI, self, KVM_GUESTDBG_ENABLE, KVM_GUESTDBG_SINGLESTEP, KVM_IRQ_ROUTING_IRQCHIP,
KVM_MEM_LOG_DIRTY_PAGES, KVM_MEM_READONLY, KVM_MSI_VALID_DEVID, kvm_clock_data, KVM_IRQ_ROUTING_MSI, KVM_MEM_LOG_DIRTY_PAGES, KVM_MEM_READONLY, KVM_MSI_VALID_DEVID,
kvm_create_device, kvm_create_device as CreateDevice, kvm_device_attr as DeviceAttr, kvm_clock_data, kvm_create_device, kvm_create_device as CreateDevice,
kvm_device_type_KVM_DEV_TYPE_VFIO, kvm_guest_debug, kvm_irq_routing, kvm_irq_routing_entry, kvm_device_attr as DeviceAttr, kvm_device_type_KVM_DEV_TYPE_VFIO, kvm_guest_debug,
kvm_mp_state, kvm_run, kvm_userspace_memory_region, kvm_irq_routing, kvm_irq_routing_entry, kvm_mp_state, kvm_run, kvm_userspace_memory_region,
}; };
#[cfg(target_arch = "aarch64")] #[cfg(target_arch = "aarch64")]
use kvm_bindings::{ use kvm_bindings::{
@@ -109,14 +109,13 @@ use kvm_bindings::{KVM_REG_RISCV_CORE, kvm_riscv_core};
use kvm_bindings::{KVM_X86_DEFAULT_VM, KVM_X86_SW_PROTECTED_VM, KVMIO, kvm_run__bindgen_ty_1}; use kvm_bindings::{KVM_X86_DEFAULT_VM, KVM_X86_SW_PROTECTED_VM, KVMIO, kvm_run__bindgen_ty_1};
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
use kvm_bindings::{Xsave as xsave2, kvm_xsave2}; use kvm_bindings::{Xsave as xsave2, kvm_xsave2};
pub use kvm_ioctls::{Cap, Kvm, VcpuExit}; pub use kvm_ioctls::{self, Cap, Kvm, VcpuExit};
use thiserror::Error; use thiserror::Error;
use vfio_ioctls::VfioDeviceFd; use vfio_ioctls::VfioDeviceFd;
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
use vmm_sys_util::{fam::FamStruct, ioctl_io_nr}; use vmm_sys_util::{fam::FamStruct, ioctl_io_nr};
#[cfg(feature = "tdx")] #[cfg(feature = "tdx")]
use vmm_sys_util::{ioctl::ioctl_with_val, ioctl_iowr_nr}; use vmm_sys_util::{ioctl::ioctl_with_val, ioctl_iowr_nr};
pub use {kvm_bindings, kvm_ioctls};
#[cfg(any(target_arch = "aarch64", target_arch = "riscv64"))] #[cfg(any(target_arch = "aarch64", target_arch = "riscv64"))]
use crate::RegList; use crate::RegList;