Skip to content
This repository was archived by the owner on Nov 6, 2024. It is now read-only.

Commit e8932c5

Browse files
RuoqingHerbradford
RuoqingHe
authored and
rbradford
committed
x86: Drop x86 architecture support
As @roypat pointed out: The x86 32-bit is not supported in other rust-vmm crates, dropping the `target_arch = "x86"` predicates to stop supporting x86 32-bit. Signed-off-by: Ruoqing He <heruoqing@iscas.ac.cn>
1 parent b26d74c commit e8932c5

File tree

7 files changed

+165
-243
lines changed

7 files changed

+165
-243
lines changed

‎src/cap.rs

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -42,39 +42,33 @@ pub enum Cap {
4242
DestroyMemoryRegionWorks = KVM_CAP_DESTROY_MEMORY_REGION_WORKS,
4343
UserNmi = KVM_CAP_USER_NMI,
4444
#[cfg(any(
45-
target_arch = "x86",
4645
target_arch = "x86_64",
4746
target_arch = "arm",
4847
target_arch = "aarch64",
4948
target_arch = "s390x"
5049
))]
5150
SetGuestDebug = KVM_CAP_SET_GUEST_DEBUG,
52-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
51+
#[cfg(target_arch = "x86_64")]
5352
ReinjectControl = KVM_CAP_REINJECT_CONTROL,
5453
IrqRouting = KVM_CAP_IRQ_ROUTING,
5554
IrqInjectStatus = KVM_CAP_IRQ_INJECT_STATUS,
5655
AssignDevIrq = KVM_CAP_ASSIGN_DEV_IRQ,
5756
JoinMemoryRegionsWorks = KVM_CAP_JOIN_MEMORY_REGIONS_WORKS,
58-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
57+
#[cfg(target_arch = "x86_64")]
5958
Mce = KVM_CAP_MCE,
6059
Irqfd = KVM_CAP_IRQFD,
61-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
60+
#[cfg(target_arch = "x86_64")]
6261
Pit2 = KVM_CAP_PIT2,
6362
SetBootCpuId = KVM_CAP_SET_BOOT_CPU_ID,
64-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
63+
#[cfg(target_arch = "x86_64")]
6564
PitState2 = KVM_CAP_PIT_STATE2,
6665
Ioeventfd = KVM_CAP_IOEVENTFD,
6766
SetIdentityMapAddr = KVM_CAP_SET_IDENTITY_MAP_ADDR,
68-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
67+
#[cfg(target_arch = "x86_64")]
6968
XenHvm = KVM_CAP_XEN_HVM,
7069
AdjustClock = KVM_CAP_ADJUST_CLOCK,
7170
InternalErrorData = KVM_CAP_INTERNAL_ERROR_DATA,
72-
#[cfg(any(
73-
target_arch = "x86",
74-
target_arch = "x86_64",
75-
target_arch = "arm",
76-
target_arch = "aarch64"
77-
))]
71+
#[cfg(any(target_arch = "x86_64", target_arch = "arm", target_arch = "aarch64"))]
7872
VcpuEvents = KVM_CAP_VCPU_EVENTS,
7973
S390Psw = KVM_CAP_S390_PSW,
8074
PpcSegstate = KVM_CAP_PPC_SEGSTATE,
@@ -84,15 +78,15 @@ pub enum Cap {
8478
PciSegment = KVM_CAP_PCI_SEGMENT,
8579
PpcPairedSingles = KVM_CAP_PPC_PAIRED_SINGLES,
8680
IntrShadow = KVM_CAP_INTR_SHADOW,
87-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
81+
#[cfg(target_arch = "x86_64")]
8882
Debugregs = KVM_CAP_DEBUGREGS,
8983
X86RobustSinglestep = KVM_CAP_X86_ROBUST_SINGLESTEP,
9084
PpcOsi = KVM_CAP_PPC_OSI,
9185
PpcUnsetIrq = KVM_CAP_PPC_UNSET_IRQ,
9286
EnableCap = KVM_CAP_ENABLE_CAP,
93-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
87+
#[cfg(target_arch = "x86_64")]
9488
Xsave = KVM_CAP_XSAVE,
95-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
89+
#[cfg(target_arch = "x86_64")]
9690
Xcrs = KVM_CAP_XCRS,
9791
PpcGetPvinfo = KVM_CAP_PPC_GET_PVINFO,
9892
PpcIrqLevel = KVM_CAP_PPC_IRQ_LEVEL,
@@ -145,9 +139,9 @@ pub enum Cap {
145139
PpcEnableHcall = KVM_CAP_PPC_ENABLE_HCALL,
146140
CheckExtensionVm = KVM_CAP_CHECK_EXTENSION_VM,
147141
S390UserSigp = KVM_CAP_S390_USER_SIGP,
148-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
142+
#[cfg(target_arch = "x86_64")]
149143
X86Smm = KVM_CAP_X86_SMM,
150-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
144+
#[cfg(target_arch = "x86_64")]
151145
SplitIrqchip = KVM_CAP_SPLIT_IRQCHIP,
152146
ArmPmuV3 = KVM_CAP_ARM_PMU_V3,
153147
ImmediateExit = KVM_CAP_IMMEDIATE_EXIT,
@@ -165,10 +159,10 @@ pub enum Cap {
165159
ArmPtrAuthAddress = KVM_CAP_ARM_PTRAUTH_ADDRESS,
166160
#[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
167161
ArmPtrAuthGeneric = KVM_CAP_ARM_PTRAUTH_GENERIC,
168-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
162+
#[cfg(target_arch = "x86_64")]
169163
X86UserSpaceMsr = KVM_CAP_X86_USER_SPACE_MSR,
170-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
164+
#[cfg(target_arch = "x86_64")]
171165
ExitHypercall = KVM_CAP_EXIT_HYPERCALL,
172-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
166+
#[cfg(target_arch = "x86_64")]
173167
MemoryFaultInfo = KVM_CAP_MEMORY_FAULT_INFO,
174168
}

‎src/ioctls/device.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ mod tests {
202202
#![allow(clippy::undocumented_unsafe_blocks)]
203203
use super::*;
204204
use crate::ioctls::system::Kvm;
205-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
205+
#[cfg(target_arch = "x86_64")]
206206
use kvm_bindings::{
207207
kvm_device_type_KVM_DEV_TYPE_ARM_VGIC_V3, kvm_device_type_KVM_DEV_TYPE_VFIO,
208208
KVM_DEV_VFIO_GROUP, KVM_DEV_VFIO_GROUP_ADD,
@@ -213,7 +213,7 @@ mod tests {
213213
use kvm_bindings::KVM_CREATE_DEVICE_TEST;
214214

215215
#[test]
216-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
216+
#[cfg(target_arch = "x86_64")]
217217
fn test_create_device() {
218218
let kvm = Kvm::new().unwrap();
219219
let vm = kvm.create_vm().unwrap();

‎src/ioctls/system.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ use crate::ioctls::Result;
1616
use crate::kvm_ioctls::*;
1717
#[cfg(target_arch = "aarch64")]
1818
use kvm_bindings::KVM_VM_TYPE_ARM_IPA_SIZE_MASK;
19-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
19+
#[cfg(target_arch = "x86_64")]
2020
use kvm_bindings::{CpuId, MsrList, Msrs, KVM_MAX_CPUID_ENTRIES, KVM_MAX_MSR_ENTRIES};
2121
use vmm_sys_util::errno;
22-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
22+
#[cfg(target_arch = "x86_64")]
2323
use vmm_sys_util::ioctl::ioctl_with_mut_ptr;
2424
use vmm_sys_util::ioctl::{ioctl, ioctl_with_val};
2525

@@ -352,7 +352,7 @@ impl Kvm {
352352
}
353353
}
354354

355-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
355+
#[cfg(target_arch = "x86_64")]
356356
fn get_cpuid(&self, kind: u64, num_entries: usize) -> Result<CpuId> {
357357
if num_entries > KVM_MAX_CPUID_ENTRIES {
358358
// Returns the same error the underlying `ioctl` would have sent.
@@ -395,7 +395,7 @@ impl Kvm {
395395
/// let cpuid_entries = cpuid.as_mut_slice();
396396
/// assert!(cpuid_entries.len() <= KVM_MAX_CPUID_ENTRIES);
397397
/// ```
398-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
398+
#[cfg(target_arch = "x86_64")]
399399
pub fn get_emulated_cpuid(&self, num_entries: usize) -> Result<CpuId> {
400400
self.get_cpuid(KVM_GET_EMULATED_CPUID(), num_entries)
401401
}
@@ -424,7 +424,7 @@ impl Kvm {
424424
/// let cpuid_entries = cpuid.as_mut_slice();
425425
/// assert!(cpuid_entries.len() <= KVM_MAX_CPUID_ENTRIES);
426426
/// ```
427-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
427+
#[cfg(target_arch = "x86_64")]
428428
pub fn get_supported_cpuid(&self, num_entries: usize) -> Result<CpuId> {
429429
self.get_cpuid(KVM_GET_SUPPORTED_CPUID(), num_entries)
430430
}
@@ -441,7 +441,7 @@ impl Kvm {
441441
/// let kvm = Kvm::new().unwrap();
442442
/// let msr_index_list = kvm.get_msr_index_list().unwrap();
443443
/// ```
444-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
444+
#[cfg(target_arch = "x86_64")]
445445
pub fn get_msr_index_list(&self) -> Result<MsrList> {
446446
let mut msr_list =
447447
MsrList::new(KVM_MAX_MSR_ENTRIES).map_err(|_| errno::Error::new(libc::ENOMEM))?;
@@ -477,7 +477,7 @@ impl Kvm {
477477
/// let kvm = Kvm::new().unwrap();
478478
/// let msr_feature_index_list = kvm.get_msr_feature_index_list().unwrap();
479479
/// ```
480-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
480+
#[cfg(target_arch = "x86_64")]
481481
pub fn get_msr_feature_index_list(&self) -> Result<MsrList> {
482482
let mut msr_list =
483483
MsrList::new(KVM_MAX_MSR_ENTRIES).map_err(|_| errno::Error::new(libc::ENOMEM))?;
@@ -531,7 +531,7 @@ impl Kvm {
531531
/// .unwrap();
532532
/// let ret = kvm.get_msrs(&mut msrs).unwrap();
533533
/// ```
534-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
534+
#[cfg(target_arch = "x86_64")]
535535
pub fn get_msrs(&self, msrs: &mut Msrs) -> Result<usize> {
536536
// SAFETY: Here we trust the kernel not to read past the end of the kvm_msrs struct.
537537
let ret = unsafe { ioctl_with_mut_ptr(self, KVM_GET_MSRS(), msrs.as_mut_fam_struct_ptr()) };
@@ -731,7 +731,7 @@ mod tests {
731731
use super::*;
732732
use libc::{fcntl, FD_CLOEXEC, F_GETFD};
733733
use std::os::fd::IntoRawFd;
734-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
734+
#[cfg(target_arch = "x86_64")]
735735
use vmm_sys_util::fam::FamStruct;
736736

737737
#[test]
@@ -867,7 +867,7 @@ mod tests {
867867
}
868868
}
869869

870-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
870+
#[cfg(target_arch = "x86_64")]
871871
#[test]
872872
fn test_get_supported_cpuid() {
873873
let kvm = Kvm::new().unwrap();
@@ -882,7 +882,7 @@ mod tests {
882882
}
883883

884884
#[test]
885-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
885+
#[cfg(target_arch = "x86_64")]
886886
fn test_get_emulated_cpuid() {
887887
let kvm = Kvm::new().unwrap();
888888
let mut cpuid = kvm.get_emulated_cpuid(KVM_MAX_CPUID_ENTRIES).unwrap();
@@ -895,7 +895,7 @@ mod tests {
895895
cpuid_err.unwrap_err();
896896
}
897897

898-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
898+
#[cfg(target_arch = "x86_64")]
899899
#[test]
900900
fn test_cpuid_clone() {
901901
let kvm = Kvm::new().unwrap();
@@ -910,23 +910,23 @@ mod tests {
910910
}
911911

912912
#[test]
913-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
913+
#[cfg(target_arch = "x86_64")]
914914
fn get_msr_index_list() {
915915
let kvm = Kvm::new().unwrap();
916916
let msr_list = kvm.get_msr_index_list().unwrap();
917917
assert!(msr_list.as_slice().len() >= 2);
918918
}
919919

920920
#[test]
921-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
921+
#[cfg(target_arch = "x86_64")]
922922
fn get_msr_feature_index_list() {
923923
let kvm = Kvm::new().unwrap();
924924
let msr_feature_index_list = kvm.get_msr_feature_index_list().unwrap();
925925
assert!(!msr_feature_index_list.as_slice().is_empty());
926926
}
927927

928928
#[test]
929-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
929+
#[cfg(target_arch = "x86_64")]
930930
fn get_msrs() {
931931
use kvm_bindings::kvm_msr_entry;
932932

@@ -961,7 +961,7 @@ mod tests {
961961
);
962962
assert_eq!(faulty_kvm.get_nr_vcpus(), 4);
963963
assert_eq!(faulty_kvm.get_nr_memslots(), 32);
964-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
964+
#[cfg(target_arch = "x86_64")]
965965
{
966966
assert_eq!(
967967
faulty_kvm.get_emulated_cpuid(4).err().unwrap().errno(),

0 commit comments

Comments
 (0)