mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-01 02:55:45 +00:00
build: Fix beta clippy issue (derive_partial_eq_without_eq)
warning: you are deriving `PartialEq` and can implement `Eq` --> vmm/src/serial_manager.rs:59:30 | 59 | #[derive(Debug, Clone, Copy, PartialEq)] | ^^^^^^^^^ help: consider deriving `Eq` as well: `PartialEq, Eq` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#derive_partial_eq_without_eq Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
parent
9cf0dee264
commit
2716bc3311
@ -54,7 +54,7 @@ pub enum Error {
|
|||||||
pub type Result<T> = result::Result<T, Error>;
|
pub type Result<T> = result::Result<T, Error>;
|
||||||
|
|
||||||
/// Type for memory region types.
|
/// Type for memory region types.
|
||||||
#[derive(Clone, Copy, PartialEq, Debug, Serialize, Deserialize, Versionize)]
|
#[derive(Clone, Copy, PartialEq, Eq, Debug, Serialize, Deserialize, Versionize)]
|
||||||
pub enum RegionType {
|
pub enum RegionType {
|
||||||
/// RAM type
|
/// RAM type
|
||||||
Ram,
|
Ram,
|
||||||
|
@ -138,7 +138,7 @@ impl ExecuteError {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq)]
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||||
pub enum RequestType {
|
pub enum RequestType {
|
||||||
In,
|
In,
|
||||||
Out,
|
Out,
|
||||||
|
@ -16,7 +16,7 @@ use iced_x86::*;
|
|||||||
mod instructions;
|
mod instructions;
|
||||||
|
|
||||||
/// x86 CPU modes
|
/// x86 CPU modes
|
||||||
#[derive(Debug, PartialEq)]
|
#[derive(Debug, PartialEq, Eq)]
|
||||||
pub enum CpuMode {
|
pub enum CpuMode {
|
||||||
/// Real mode
|
/// Real mode
|
||||||
Real,
|
Real,
|
||||||
|
@ -160,7 +160,7 @@ pub struct TdxCapabilities {
|
|||||||
pub cpuid_configs: [TdxCpuidConfig; TDX_MAX_NR_CPUID_CONFIGS],
|
pub cpuid_configs: [TdxCpuidConfig; TDX_MAX_NR_CPUID_CONFIGS],
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq, Deserialize, Serialize)]
|
#[derive(Clone, Copy, Debug, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub struct KvmVmState {}
|
pub struct KvmVmState {}
|
||||||
|
|
||||||
pub use KvmVmState as VmState;
|
pub use KvmVmState as VmState;
|
||||||
|
@ -15,7 +15,7 @@ use serde::ser::{Serialize, Serializer};
|
|||||||
|
|
||||||
pub const MAC_ADDR_LEN: usize = 6;
|
pub const MAC_ADDR_LEN: usize = 6;
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq)]
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||||
pub struct MacAddr {
|
pub struct MacAddr {
|
||||||
bytes: [u8; MAC_ADDR_LEN],
|
bytes: [u8; MAC_ADDR_LEN],
|
||||||
}
|
}
|
||||||
|
@ -187,7 +187,7 @@ pub trait PciProgrammingInterface {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Types of PCI capabilities.
|
/// Types of PCI capabilities.
|
||||||
#[derive(PartialEq, Copy, Clone)]
|
#[derive(PartialEq, Eq, Copy, Clone)]
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
#[allow(non_camel_case_types)]
|
#[allow(non_camel_case_types)]
|
||||||
#[repr(C)]
|
#[repr(C)]
|
||||||
@ -321,7 +321,7 @@ pub struct PciConfiguration {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// See pci_regs.h in kernel
|
/// See pci_regs.h in kernel
|
||||||
#[derive(Copy, Clone, PartialEq, Versionize, Debug)]
|
#[derive(Copy, Clone, PartialEq, Eq, Versionize, Debug)]
|
||||||
pub enum PciBarRegionType {
|
pub enum PciBarRegionType {
|
||||||
Memory32BitRegion = 0,
|
Memory32BitRegion = 0,
|
||||||
IoRegion = 0x01,
|
IoRegion = 0x01,
|
||||||
|
@ -52,7 +52,7 @@ pub const PCI_CONFIG_IO_PORT: u64 = 0xcf8;
|
|||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(target_arch = "x86_64")]
|
||||||
pub const PCI_CONFIG_IO_PORT_SIZE: u64 = 0x8;
|
pub const PCI_CONFIG_IO_PORT_SIZE: u64 = 0x8;
|
||||||
|
|
||||||
#[derive(Clone, Copy, PartialEq, PartialOrd)]
|
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd)]
|
||||||
pub struct PciBdf(u32);
|
pub struct PciBdf(u32);
|
||||||
|
|
||||||
struct PciBdfVisitor;
|
struct PciBdfVisitor;
|
||||||
|
@ -91,7 +91,7 @@ pub enum BucketReduction {
|
|||||||
|
|
||||||
/// TokenBucket provides a lower level interface to rate limiting with a
|
/// TokenBucket provides a lower level interface to rate limiting with a
|
||||||
/// configurable capacity, refill-rate and initial burst.
|
/// configurable capacity, refill-rate and initial burst.
|
||||||
#[derive(Clone, Debug, PartialEq)]
|
#[derive(Clone, Debug, PartialEq, Eq)]
|
||||||
pub struct TokenBucket {
|
pub struct TokenBucket {
|
||||||
// Bucket defining traits.
|
// Bucket defining traits.
|
||||||
size: u64,
|
size: u64,
|
||||||
|
@ -1614,7 +1614,7 @@ fn process_rss_kib(pid: u32) -> usize {
|
|||||||
// 10MB is our maximum accepted overhead.
|
// 10MB is our maximum accepted overhead.
|
||||||
const MAXIMUM_VMM_OVERHEAD_KB: u32 = 10 * 1024;
|
const MAXIMUM_VMM_OVERHEAD_KB: u32 = 10 * 1024;
|
||||||
|
|
||||||
#[derive(PartialEq, PartialOrd)]
|
#[derive(PartialEq, Eq, PartialOrd)]
|
||||||
struct Counters {
|
struct Counters {
|
||||||
rx_bytes: u64,
|
rx_bytes: u64,
|
||||||
rx_frames: u64,
|
rx_frames: u64,
|
||||||
|
@ -51,7 +51,7 @@ impl Default for Command {
|
|||||||
|
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
#[repr(u32)]
|
#[repr(u32)]
|
||||||
#[derive(Clone, Copy, Debug, PartialEq)]
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||||
enum HeaderFlags {
|
enum HeaderFlags {
|
||||||
Command = 0,
|
Command = 0,
|
||||||
Reply = 1,
|
Reply = 1,
|
||||||
|
@ -123,14 +123,14 @@ pub enum Error {
|
|||||||
QueueIterator(virtio_queue::Error),
|
QueueIterator(virtio_queue::Error),
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, Default, Deserialize, Serialize, PartialEq)]
|
#[derive(Clone, Copy, Debug, Default, Deserialize, Serialize, PartialEq, Eq)]
|
||||||
pub struct TokenBucketConfig {
|
pub struct TokenBucketConfig {
|
||||||
pub size: u64,
|
pub size: u64,
|
||||||
pub one_time_burst: Option<u64>,
|
pub one_time_burst: Option<u64>,
|
||||||
pub refill_time: u64,
|
pub refill_time: u64,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, Default, Deserialize, Serialize, PartialEq)]
|
#[derive(Clone, Copy, Debug, Default, Deserialize, Serialize, PartialEq, Eq)]
|
||||||
#[serde(deny_unknown_fields)]
|
#[serde(deny_unknown_fields)]
|
||||||
pub struct RateLimiterConfig {
|
pub struct RateLimiterConfig {
|
||||||
pub bandwidth: Option<TokenBucketConfig>,
|
pub bandwidth: Option<TokenBucketConfig>,
|
||||||
|
@ -106,7 +106,7 @@ impl Display for Error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, PartialEq)]
|
#[derive(Debug, PartialEq, Eq)]
|
||||||
enum RequestType {
|
enum RequestType {
|
||||||
Flush,
|
Flush,
|
||||||
}
|
}
|
||||||
|
@ -38,7 +38,7 @@ type Result<T> = std::result::Result<T, Error>;
|
|||||||
|
|
||||||
/// A vsock connection state.
|
/// A vsock connection state.
|
||||||
///
|
///
|
||||||
#[derive(Clone, Copy, Debug, PartialEq)]
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||||
pub enum ConnState {
|
pub enum ConnState {
|
||||||
/// The connection has been initiated by the host end, but is yet to be confirmed by the guest.
|
/// The connection has been initiated by the host end, but is yet to be confirmed by the guest.
|
||||||
LocalInit,
|
LocalInit,
|
||||||
@ -61,7 +61,7 @@ pub enum ConnState {
|
|||||||
/// (via `notify()`), the connection will store a `PendingRx::Rw` to be later inspected by
|
/// (via `notify()`), the connection will store a `PendingRx::Rw` to be later inspected by
|
||||||
/// `recv_pkt()`.
|
/// `recv_pkt()`.
|
||||||
///
|
///
|
||||||
#[derive(Clone, Copy, PartialEq)]
|
#[derive(Clone, Copy, PartialEq, Eq)]
|
||||||
enum PendingRx {
|
enum PendingRx {
|
||||||
/// We need to yield a connection request packet (VSOCK_OP_REQUEST).
|
/// We need to yield a connection request packet (VSOCK_OP_REQUEST).
|
||||||
Request = 0,
|
Request = 0,
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
//! Handles routing to devices in an address space.
|
//! Handles routing to devices in an address space.
|
||||||
|
|
||||||
use std::cmp::{Ord, Ordering, PartialEq, PartialOrd};
|
use std::cmp::{Eq, Ord, Ordering, PartialEq, PartialOrd};
|
||||||
use std::collections::btree_map::BTreeMap;
|
use std::collections::btree_map::BTreeMap;
|
||||||
use std::sync::{Arc, Barrier, Mutex, RwLock, Weak};
|
use std::sync::{Arc, Barrier, Mutex, RwLock, Weak};
|
||||||
use std::{convert, error, fmt, io, result};
|
use std::{convert, error, fmt, io, result};
|
||||||
|
@ -12,7 +12,7 @@ pub mod interrupt;
|
|||||||
pub use self::bus::{Bus, BusDevice, Error as BusError};
|
pub use self::bus::{Bus, BusDevice, Error as BusError};
|
||||||
|
|
||||||
/// Type of Message Signalled Interrupt
|
/// Type of Message Signalled Interrupt
|
||||||
#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
|
#[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
pub enum MsiIrqType {
|
pub enum MsiIrqType {
|
||||||
/// PCI MSI IRQ numbers.
|
/// PCI MSI IRQ numbers.
|
||||||
PciMsi,
|
PciMsi,
|
||||||
@ -22,7 +22,7 @@ pub enum MsiIrqType {
|
|||||||
GenericMsi,
|
GenericMsi,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Copy, Clone, PartialEq, Serialize, Deserialize, Debug)]
|
#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
|
||||||
pub enum PciBarType {
|
pub enum PciBarType {
|
||||||
Io,
|
Io,
|
||||||
Mmio32,
|
Mmio32,
|
||||||
|
@ -139,7 +139,7 @@ impl Request {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[repr(u16)]
|
#[repr(u16)]
|
||||||
#[derive(Copy, Clone, PartialEq)]
|
#[derive(Copy, Clone, PartialEq, Eq)]
|
||||||
pub enum Status {
|
pub enum Status {
|
||||||
Invalid,
|
Invalid,
|
||||||
Ok,
|
Ok,
|
||||||
|
@ -113,7 +113,7 @@ pub enum Error {
|
|||||||
ParseVdpaPathMissing,
|
ParseVdpaPathMissing,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Error)]
|
#[derive(Debug, PartialEq, Eq, Error)]
|
||||||
pub enum ValidationError {
|
pub enum ValidationError {
|
||||||
/// Both console and serial are tty.
|
/// Both console and serial are tty.
|
||||||
DoubleTtyMode,
|
DoubleTtyMode,
|
||||||
@ -430,7 +430,7 @@ impl<'a> VmParams<'a> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq, Deserialize, Serialize)]
|
#[derive(Clone, Copy, Debug, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub enum HotplugMethod {
|
pub enum HotplugMethod {
|
||||||
Acpi,
|
Acpi,
|
||||||
VirtioMem,
|
VirtioMem,
|
||||||
@ -459,13 +459,13 @@ impl FromStr for HotplugMethod {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub struct CpuAffinity {
|
pub struct CpuAffinity {
|
||||||
pub vcpu: u8,
|
pub vcpu: u8,
|
||||||
pub host_cpus: Vec<u8>,
|
pub host_cpus: Vec<u8>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, Default, PartialEq, Deserialize, Serialize)]
|
#[derive(Clone, Debug, Default, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub struct CpuFeatures {
|
pub struct CpuFeatures {
|
||||||
#[cfg(all(feature = "amx", target_arch = "x86_64"))]
|
#[cfg(all(feature = "amx", target_arch = "x86_64"))]
|
||||||
pub amx: bool,
|
pub amx: bool,
|
||||||
@ -475,7 +475,7 @@ pub enum CpuTopologyParseError {
|
|||||||
InvalidValue(String),
|
InvalidValue(String),
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub struct CpuTopology {
|
pub struct CpuTopology {
|
||||||
pub threads_per_core: u8,
|
pub threads_per_core: u8,
|
||||||
pub cores_per_die: u8,
|
pub cores_per_die: u8,
|
||||||
@ -516,7 +516,7 @@ fn default_cpuconfig_max_phys_bits() -> u8 {
|
|||||||
DEFAULT_MAX_PHYS_BITS
|
DEFAULT_MAX_PHYS_BITS
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub struct CpusConfig {
|
pub struct CpusConfig {
|
||||||
pub boot_vcpus: u8,
|
pub boot_vcpus: u8,
|
||||||
pub max_vcpus: u8,
|
pub max_vcpus: u8,
|
||||||
@ -626,7 +626,7 @@ fn default_platformconfig_num_pci_segments() -> u16 {
|
|||||||
DEFAULT_NUM_PCI_SEGMENTS
|
DEFAULT_NUM_PCI_SEGMENTS
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub struct PlatformConfig {
|
pub struct PlatformConfig {
|
||||||
#[serde(default = "default_platformconfig_num_pci_segments")]
|
#[serde(default = "default_platformconfig_num_pci_segments")]
|
||||||
pub num_pci_segments: u16,
|
pub num_pci_segments: u16,
|
||||||
@ -691,7 +691,7 @@ impl Default for PlatformConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub struct MemoryZoneConfig {
|
pub struct MemoryZoneConfig {
|
||||||
pub id: String,
|
pub id: String,
|
||||||
pub size: u64,
|
pub size: u64,
|
||||||
@ -713,7 +713,7 @@ pub struct MemoryZoneConfig {
|
|||||||
pub prefault: bool,
|
pub prefault: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub struct MemoryConfig {
|
pub struct MemoryConfig {
|
||||||
pub size: u64,
|
pub size: u64,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
@ -918,17 +918,17 @@ impl Default for MemoryConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub struct KernelConfig {
|
pub struct KernelConfig {
|
||||||
pub path: PathBuf,
|
pub path: PathBuf,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub struct InitramfsConfig {
|
pub struct InitramfsConfig {
|
||||||
pub path: PathBuf,
|
pub path: PathBuf,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, Default, PartialEq, Deserialize, Serialize)]
|
#[derive(Clone, Debug, Default, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub struct CmdlineConfig {
|
pub struct CmdlineConfig {
|
||||||
pub args: String,
|
pub args: String,
|
||||||
}
|
}
|
||||||
@ -943,7 +943,7 @@ impl CmdlineConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub struct DiskConfig {
|
pub struct DiskConfig {
|
||||||
pub path: Option<PathBuf>,
|
pub path: Option<PathBuf>,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
@ -1178,7 +1178,7 @@ impl DiskConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub enum VhostMode {
|
pub enum VhostMode {
|
||||||
Client,
|
Client,
|
||||||
Server,
|
Server,
|
||||||
@ -1207,7 +1207,7 @@ impl FromStr for VhostMode {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub struct NetConfig {
|
pub struct NetConfig {
|
||||||
#[serde(default = "default_netconfig_tap")]
|
#[serde(default = "default_netconfig_tap")]
|
||||||
pub tap: Option<String>,
|
pub tap: Option<String>,
|
||||||
@ -1478,7 +1478,7 @@ impl NetConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub struct RngConfig {
|
pub struct RngConfig {
|
||||||
pub src: PathBuf,
|
pub src: PathBuf,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
@ -1515,7 +1515,7 @@ impl Default for RngConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub struct BalloonConfig {
|
pub struct BalloonConfig {
|
||||||
pub size: u64,
|
pub size: u64,
|
||||||
/// Option to deflate the balloon in case the guest is out of memory.
|
/// Option to deflate the balloon in case the guest is out of memory.
|
||||||
@ -1564,7 +1564,7 @@ impl BalloonConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub struct FsConfig {
|
pub struct FsConfig {
|
||||||
pub tag: String,
|
pub tag: String,
|
||||||
pub socket: PathBuf,
|
pub socket: PathBuf,
|
||||||
@ -1667,7 +1667,7 @@ impl FsConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, Default)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)]
|
||||||
pub struct PmemConfig {
|
pub struct PmemConfig {
|
||||||
pub file: PathBuf,
|
pub file: PathBuf,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
@ -1745,7 +1745,7 @@ impl PmemConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub enum ConsoleOutputMode {
|
pub enum ConsoleOutputMode {
|
||||||
Off,
|
Off,
|
||||||
Pty,
|
Pty,
|
||||||
@ -1754,7 +1754,7 @@ pub enum ConsoleOutputMode {
|
|||||||
Null,
|
Null,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub struct ConsoleConfig {
|
pub struct ConsoleConfig {
|
||||||
#[serde(default = "default_consoleconfig_file")]
|
#[serde(default = "default_consoleconfig_file")]
|
||||||
pub file: Option<PathBuf>,
|
pub file: Option<PathBuf>,
|
||||||
@ -1824,7 +1824,7 @@ impl ConsoleConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, Default)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)]
|
||||||
pub struct DeviceConfig {
|
pub struct DeviceConfig {
|
||||||
pub path: PathBuf,
|
pub path: PathBuf,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
@ -1883,7 +1883,7 @@ impl DeviceConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, Default)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)]
|
||||||
pub struct UserDeviceConfig {
|
pub struct UserDeviceConfig {
|
||||||
pub socket: PathBuf,
|
pub socket: PathBuf,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
@ -1936,7 +1936,7 @@ impl UserDeviceConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, Default)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)]
|
||||||
pub struct VdpaConfig {
|
pub struct VdpaConfig {
|
||||||
pub path: PathBuf,
|
pub path: PathBuf,
|
||||||
#[serde(default = "default_vdpaconfig_num_queues")]
|
#[serde(default = "default_vdpaconfig_num_queues")]
|
||||||
@ -2012,7 +2012,7 @@ impl VdpaConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, Default)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)]
|
||||||
pub struct VsockConfig {
|
pub struct VsockConfig {
|
||||||
pub cid: u64,
|
pub cid: u64,
|
||||||
pub socket: PathBuf,
|
pub socket: PathBuf,
|
||||||
@ -2083,7 +2083,7 @@ impl VsockConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(feature = "tdx")]
|
#[cfg(feature = "tdx")]
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, Default)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)]
|
||||||
pub struct TdxConfig {
|
pub struct TdxConfig {
|
||||||
pub firmware: PathBuf,
|
pub firmware: PathBuf,
|
||||||
}
|
}
|
||||||
@ -2103,7 +2103,7 @@ impl TdxConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(target_arch = "x86_64")]
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, Default)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)]
|
||||||
pub struct SgxEpcConfig {
|
pub struct SgxEpcConfig {
|
||||||
pub id: String,
|
pub id: String,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
@ -2137,7 +2137,7 @@ impl SgxEpcConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, Default)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)]
|
||||||
pub struct NumaDistance {
|
pub struct NumaDistance {
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub destination: u32,
|
pub destination: u32,
|
||||||
@ -2145,7 +2145,7 @@ pub struct NumaDistance {
|
|||||||
pub distance: u8,
|
pub distance: u8,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, Default)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)]
|
||||||
pub struct NumaConfig {
|
pub struct NumaConfig {
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub guest_numa_id: u32,
|
pub guest_numa_id: u32,
|
||||||
@ -2214,7 +2214,7 @@ impl NumaConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, Default)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)]
|
||||||
pub struct RestoreConfig {
|
pub struct RestoreConfig {
|
||||||
pub source_url: PathBuf,
|
pub source_url: PathBuf,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
@ -2248,7 +2248,7 @@ impl RestoreConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub struct VmConfig {
|
pub struct VmConfig {
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub cpus: CpusConfig,
|
pub cpus: CpusConfig,
|
||||||
|
@ -164,7 +164,7 @@ pub enum Error {
|
|||||||
}
|
}
|
||||||
pub type Result<T> = result::Result<T, Error>;
|
pub type Result<T> = result::Result<T, Error>;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
#[repr(u64)]
|
#[repr(u64)]
|
||||||
pub enum EpollDispatch {
|
pub enum EpollDispatch {
|
||||||
Exit = 0,
|
Exit = 0,
|
||||||
|
@ -56,7 +56,7 @@ pub enum Error {
|
|||||||
}
|
}
|
||||||
pub type Result<T> = result::Result<T, Error>;
|
pub type Result<T> = result::Result<T, Error>;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
#[repr(u64)]
|
#[repr(u64)]
|
||||||
pub enum EpollDispatch {
|
pub enum EpollDispatch {
|
||||||
File = 0,
|
File = 0,
|
||||||
|
@ -309,7 +309,7 @@ pub enum Error {
|
|||||||
}
|
}
|
||||||
pub type Result<T> = result::Result<T, Error>;
|
pub type Result<T> = result::Result<T, Error>;
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, Deserialize, Serialize, PartialEq)]
|
#[derive(Clone, Copy, Debug, Deserialize, Serialize, PartialEq, Eq)]
|
||||||
pub enum VmState {
|
pub enum VmState {
|
||||||
Created,
|
Created,
|
||||||
Running,
|
Running,
|
||||||
|
Loading…
Reference in New Issue
Block a user