From b017ce86eae6e5de8281d8e8e5d2aed59f619e63 Mon Sep 17 00:00:00 2001 From: Ziy1-Tan Date: Wed, 16 Oct 2024 23:26:53 +0800 Subject: [PATCH] fix style Signed-off-by: Ziy1-Tan --- vmm/sandbox/src/cloud_hypervisor/client.rs | 2 +- vmm/sandbox/src/network/mod.rs | 2 +- vmm/sandbox/src/qemu/devices/block.rs | 2 +- vmm/sandbox/src/qemu/devices/char.rs | 2 +- vmm/sandbox/src/qemu/mod.rs | 2 +- vmm/sandbox/src/qemu/qmp_client.rs | 2 +- vmm/sandbox/src/storage/mod.rs | 2 +- vmm/sandbox/src/stratovirt/devices/block.rs | 2 +- vmm/sandbox/src/stratovirt/mod.rs | 2 +- vmm/sandbox/src/stratovirt/qmp_client.rs | 2 +- vmm/sandbox/src/stratovirt/virtiofs.rs | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/vmm/sandbox/src/cloud_hypervisor/client.rs b/vmm/sandbox/src/cloud_hypervisor/client.rs index c33df889..a662e1cc 100644 --- a/vmm/sandbox/src/cloud_hypervisor/client.rs +++ b/vmm/sandbox/src/cloud_hypervisor/client.rs @@ -23,8 +23,8 @@ use std::{ use anyhow::anyhow; use api_client::{simple_api_command, simple_api_full_command_with_fds_and_response}; use containerd_sandbox::error::Result; -use tokio::task::spawn_blocking; use log::{debug, error, trace}; +use tokio::task::spawn_blocking; use crate::{ cloud_hypervisor::devices::{block::DiskConfig, AddDeviceResponse, RemoveDeviceRequest}, diff --git a/vmm/sandbox/src/network/mod.rs b/vmm/sandbox/src/network/mod.rs index 8612ab0a..9e2d212b 100644 --- a/vmm/sandbox/src/network/mod.rs +++ b/vmm/sandbox/src/network/mod.rs @@ -23,6 +23,7 @@ use std::{ use anyhow::anyhow; use containerd_sandbox::error::Result; use futures_util::TryStreamExt; +use log::{debug, error, info, warn}; use nix::{ fcntl::OFlag, sched::{setns, CloneFlags}, @@ -31,7 +32,6 @@ use nix::{ use rtnetlink::{new_connection, Handle, IpVersion}; use serde_derive::{Deserialize, Serialize}; use tokio::task::spawn_blocking; -use log::{debug, error, info, warn}; pub use crate::network::{address::IpNet, link::NetworkInterface, route::Route}; use crate::{network::link::LinkType, sandbox::KuasarSandbox, utils::safe_open_file, vm::VM}; diff --git a/vmm/sandbox/src/qemu/devices/block.rs b/vmm/sandbox/src/qemu/devices/block.rs index cfc0f511..829b8116 100644 --- a/vmm/sandbox/src/qemu/devices/block.rs +++ b/vmm/sandbox/src/qemu/devices/block.rs @@ -16,6 +16,7 @@ limitations under the License. use async_trait::async_trait; use containerd_sandbox::error::Result; +use log::{debug, error}; use qapi::{ qmp::{ blockdev_add, blockdev_del, device_add, BlockdevOptions, BlockdevOptionsBase, @@ -25,7 +26,6 @@ use qapi::{ }; use sandbox_derive::CmdLineParams; use serde_json::Value; -use log::{debug, error}; use crate::{ device::{BusType, Device, Transport}, diff --git a/vmm/sandbox/src/qemu/devices/char.rs b/vmm/sandbox/src/qemu/devices/char.rs index ff6dbfac..b266f193 100644 --- a/vmm/sandbox/src/qemu/devices/char.rs +++ b/vmm/sandbox/src/qemu/devices/char.rs @@ -17,13 +17,13 @@ limitations under the License. use anyhow::anyhow; use async_trait::async_trait; use containerd_sandbox::error::Result; +use log::{debug, error}; use qapi::{ qmp::{chardev_add, chardev_remove, device_add, ChardevBackend, ChardevCommon, ChardevHostdev}, Dictionary, }; use sandbox_derive::CmdLineParams; use serde_json::Value; -use log::{debug, error}; use crate::{ device::{BusType, CharBackendType}, diff --git a/vmm/sandbox/src/qemu/mod.rs b/vmm/sandbox/src/qemu/mod.rs index 6f398fb9..36c054d5 100644 --- a/vmm/sandbox/src/qemu/mod.rs +++ b/vmm/sandbox/src/qemu/mod.rs @@ -27,6 +27,7 @@ use anyhow::anyhow; use async_trait::async_trait; use containerd_sandbox::error::{Error, Result}; use futures_util::TryFutureExt; +use log::{debug, error, trace, warn}; use nix::{fcntl::OFlag, libc::kill, sys::stat::Mode}; use qapi::qmp::quit; use serde::{Deserialize, Serialize}; @@ -37,7 +38,6 @@ use tokio::{ task::spawn_blocking, time::sleep, }; -use log::{debug, error, trace, warn}; use unshare::Fd; use crate::{ diff --git a/vmm/sandbox/src/qemu/qmp_client.rs b/vmm/sandbox/src/qemu/qmp_client.rs index d424b625..ec3421bf 100644 --- a/vmm/sandbox/src/qemu/qmp_client.rs +++ b/vmm/sandbox/src/qemu/qmp_client.rs @@ -19,6 +19,7 @@ use std::sync::Arc; use anyhow::anyhow; use containerd_sandbox::error::Result; use futures_util::StreamExt; +use log::error; use qapi::{ futures::{QapiService, QmpStreamTokio}, qmp::{device_del, Event, QmpCommand}, @@ -31,7 +32,6 @@ use tokio::{ Mutex, }, }; -use log::error; pub struct QmpClient { qmp: QapiService>>, diff --git a/vmm/sandbox/src/storage/mod.rs b/vmm/sandbox/src/storage/mod.rs index 5a3ac4a6..a1fcf48f 100644 --- a/vmm/sandbox/src/storage/mod.rs +++ b/vmm/sandbox/src/storage/mod.rs @@ -22,8 +22,8 @@ use containerd_sandbox::{ spec::Mount, }; use containerd_shim::mount::mount_rootfs; -use nix::libc::MNT_DETACH; use log::debug; +use nix::libc::MNT_DETACH; pub use utils::*; use vmm_common::{ mount::{bind_mount, unmount, MNT_NOFOLLOW}, diff --git a/vmm/sandbox/src/stratovirt/devices/block.rs b/vmm/sandbox/src/stratovirt/devices/block.rs index 98cdb649..b3d9c038 100644 --- a/vmm/sandbox/src/stratovirt/devices/block.rs +++ b/vmm/sandbox/src/stratovirt/devices/block.rs @@ -16,6 +16,7 @@ limitations under the License. use async_trait::async_trait; use containerd_sandbox::error::Result; +use log::{debug, error}; use qapi::{ qmp::{ blockdev_add, blockdev_del, device_add, BlockdevCacheOptions, BlockdevOptions, @@ -26,7 +27,6 @@ use qapi::{ }; use sandbox_derive::CmdLineParams; use serde_json::Value; -use log::{debug, error}; use crate::{ device::Device, diff --git a/vmm/sandbox/src/stratovirt/mod.rs b/vmm/sandbox/src/stratovirt/mod.rs index 0cc3aecd..724a93c2 100644 --- a/vmm/sandbox/src/stratovirt/mod.rs +++ b/vmm/sandbox/src/stratovirt/mod.rs @@ -27,6 +27,7 @@ use anyhow::anyhow; use async_trait::async_trait; use containerd_sandbox::error::{Error, Result}; use futures_util::TryFutureExt; +use log::{debug, error, trace, warn}; use nix::{fcntl::OFlag, libc::kill, sys::stat::Mode}; use qapi::qmp::quit; use qmp::CpuInfo; @@ -38,7 +39,6 @@ use tokio::{ task::spawn_blocking, time::sleep, }; -use log::{debug, error, trace, warn}; use unshare::Fd; use self::devices::{pcie_rootbus::PcieRootBus, rootport::RootPort, PCIE_ROOTBUS_CAPACITY}; diff --git a/vmm/sandbox/src/stratovirt/qmp_client.rs b/vmm/sandbox/src/stratovirt/qmp_client.rs index d424b625..ec3421bf 100644 --- a/vmm/sandbox/src/stratovirt/qmp_client.rs +++ b/vmm/sandbox/src/stratovirt/qmp_client.rs @@ -19,6 +19,7 @@ use std::sync::Arc; use anyhow::anyhow; use containerd_sandbox::error::Result; use futures_util::StreamExt; +use log::error; use qapi::{ futures::{QapiService, QmpStreamTokio}, qmp::{device_del, Event, QmpCommand}, @@ -31,7 +32,6 @@ use tokio::{ Mutex, }, }; -use log::error; pub struct QmpClient { qmp: QapiService>>, diff --git a/vmm/sandbox/src/stratovirt/virtiofs.rs b/vmm/sandbox/src/stratovirt/virtiofs.rs index ec1836b0..4ef48c64 100644 --- a/vmm/sandbox/src/stratovirt/virtiofs.rs +++ b/vmm/sandbox/src/stratovirt/virtiofs.rs @@ -17,11 +17,11 @@ limitations under the License. use std::process::Stdio; use anyhow::{anyhow, Result}; +use log::{debug, error}; use sandbox_derive::CmdLineParamSet; use serde::{Deserialize, Serialize}; use time::OffsetDateTime; use tokio::{process::Child, sync::watch::Sender, task::JoinHandle}; -use log::{debug, error}; use crate::{ param::ToCmdLineParams,