Skip to content

Commit b017ce8

Browse files
committed
fix style
Signed-off-by: Ziy1-Tan <[email protected]>
1 parent 78bb4ce commit b017ce8

File tree

11 files changed

+11
-11
lines changed

11 files changed

+11
-11
lines changed

vmm/sandbox/src/cloud_hypervisor/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ use std::{
2323
use anyhow::anyhow;
2424
use api_client::{simple_api_command, simple_api_full_command_with_fds_and_response};
2525
use containerd_sandbox::error::Result;
26-
use tokio::task::spawn_blocking;
2726
use log::{debug, error, trace};
27+
use tokio::task::spawn_blocking;
2828

2929
use crate::{
3030
cloud_hypervisor::devices::{block::DiskConfig, AddDeviceResponse, RemoveDeviceRequest},

vmm/sandbox/src/network/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ use std::{
2323
use anyhow::anyhow;
2424
use containerd_sandbox::error::Result;
2525
use futures_util::TryStreamExt;
26+
use log::{debug, error, info, warn};
2627
use nix::{
2728
fcntl::OFlag,
2829
sched::{setns, CloneFlags},
@@ -31,7 +32,6 @@ use nix::{
3132
use rtnetlink::{new_connection, Handle, IpVersion};
3233
use serde_derive::{Deserialize, Serialize};
3334
use tokio::task::spawn_blocking;
34-
use log::{debug, error, info, warn};
3535

3636
pub use crate::network::{address::IpNet, link::NetworkInterface, route::Route};
3737
use crate::{network::link::LinkType, sandbox::KuasarSandbox, utils::safe_open_file, vm::VM};

vmm/sandbox/src/qemu/devices/block.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ limitations under the License.
1616

1717
use async_trait::async_trait;
1818
use containerd_sandbox::error::Result;
19+
use log::{debug, error};
1920
use qapi::{
2021
qmp::{
2122
blockdev_add, blockdev_del, device_add, BlockdevOptions, BlockdevOptionsBase,
@@ -25,7 +26,6 @@ use qapi::{
2526
};
2627
use sandbox_derive::CmdLineParams;
2728
use serde_json::Value;
28-
use log::{debug, error};
2929

3030
use crate::{
3131
device::{BusType, Device, Transport},

vmm/sandbox/src/qemu/devices/char.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ limitations under the License.
1717
use anyhow::anyhow;
1818
use async_trait::async_trait;
1919
use containerd_sandbox::error::Result;
20+
use log::{debug, error};
2021
use qapi::{
2122
qmp::{chardev_add, chardev_remove, device_add, ChardevBackend, ChardevCommon, ChardevHostdev},
2223
Dictionary,
2324
};
2425
use sandbox_derive::CmdLineParams;
2526
use serde_json::Value;
26-
use log::{debug, error};
2727

2828
use crate::{
2929
device::{BusType, CharBackendType},

vmm/sandbox/src/qemu/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ use anyhow::anyhow;
2727
use async_trait::async_trait;
2828
use containerd_sandbox::error::{Error, Result};
2929
use futures_util::TryFutureExt;
30+
use log::{debug, error, trace, warn};
3031
use nix::{fcntl::OFlag, libc::kill, sys::stat::Mode};
3132
use qapi::qmp::quit;
3233
use serde::{Deserialize, Serialize};
@@ -37,7 +38,6 @@ use tokio::{
3738
task::spawn_blocking,
3839
time::sleep,
3940
};
40-
use log::{debug, error, trace, warn};
4141
use unshare::Fd;
4242

4343
use crate::{

vmm/sandbox/src/qemu/qmp_client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ use std::sync::Arc;
1919
use anyhow::anyhow;
2020
use containerd_sandbox::error::Result;
2121
use futures_util::StreamExt;
22+
use log::error;
2223
use qapi::{
2324
futures::{QapiService, QmpStreamTokio},
2425
qmp::{device_del, Event, QmpCommand},
@@ -31,7 +32,6 @@ use tokio::{
3132
Mutex,
3233
},
3334
};
34-
use log::error;
3535

3636
pub struct QmpClient {
3737
qmp: QapiService<QmpStreamTokio<WriteHalf<UnixStream>>>,

vmm/sandbox/src/storage/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ use containerd_sandbox::{
2222
spec::Mount,
2323
};
2424
use containerd_shim::mount::mount_rootfs;
25-
use nix::libc::MNT_DETACH;
2625
use log::debug;
26+
use nix::libc::MNT_DETACH;
2727
pub use utils::*;
2828
use vmm_common::{
2929
mount::{bind_mount, unmount, MNT_NOFOLLOW},

vmm/sandbox/src/stratovirt/devices/block.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ limitations under the License.
1616

1717
use async_trait::async_trait;
1818
use containerd_sandbox::error::Result;
19+
use log::{debug, error};
1920
use qapi::{
2021
qmp::{
2122
blockdev_add, blockdev_del, device_add, BlockdevCacheOptions, BlockdevOptions,
@@ -26,7 +27,6 @@ use qapi::{
2627
};
2728
use sandbox_derive::CmdLineParams;
2829
use serde_json::Value;
29-
use log::{debug, error};
3030

3131
use crate::{
3232
device::Device,

vmm/sandbox/src/stratovirt/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ use anyhow::anyhow;
2727
use async_trait::async_trait;
2828
use containerd_sandbox::error::{Error, Result};
2929
use futures_util::TryFutureExt;
30+
use log::{debug, error, trace, warn};
3031
use nix::{fcntl::OFlag, libc::kill, sys::stat::Mode};
3132
use qapi::qmp::quit;
3233
use qmp::CpuInfo;
@@ -38,7 +39,6 @@ use tokio::{
3839
task::spawn_blocking,
3940
time::sleep,
4041
};
41-
use log::{debug, error, trace, warn};
4242
use unshare::Fd;
4343

4444
use self::devices::{pcie_rootbus::PcieRootBus, rootport::RootPort, PCIE_ROOTBUS_CAPACITY};

vmm/sandbox/src/stratovirt/qmp_client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ use std::sync::Arc;
1919
use anyhow::anyhow;
2020
use containerd_sandbox::error::Result;
2121
use futures_util::StreamExt;
22+
use log::error;
2223
use qapi::{
2324
futures::{QapiService, QmpStreamTokio},
2425
qmp::{device_del, Event, QmpCommand},
@@ -31,7 +32,6 @@ use tokio::{
3132
Mutex,
3233
},
3334
};
34-
use log::error;
3535

3636
pub struct QmpClient {
3737
qmp: QapiService<QmpStreamTokio<WriteHalf<UnixStream>>>,

vmm/sandbox/src/stratovirt/virtiofs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ limitations under the License.
1717
use std::process::Stdio;
1818

1919
use anyhow::{anyhow, Result};
20+
use log::{debug, error};
2021
use sandbox_derive::CmdLineParamSet;
2122
use serde::{Deserialize, Serialize};
2223
use time::OffsetDateTime;
2324
use tokio::{process::Child, sync::watch::Sender, task::JoinHandle};
24-
use log::{debug, error};
2525

2626
use crate::{
2727
param::ToCmdLineParams,

0 commit comments

Comments
 (0)