Skip to content

Commit 2b4eec5

Browse files
RuoqingHeroypat
RuoqingHe
authored and
roypat
committed
chore: Remove redundant prefixing
Since `use kvm_bindings::*` is in effect, remove redundant prefixing to keep the code clean. Signed-off-by: Ruoqing He <[email protected]>
1 parent 65c754c commit 2b4eec5

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

‎src/ioctls/vcpu.rs

+14-14
Original file line numberDiff line numberDiff line change
@@ -1203,7 +1203,7 @@ impl VcpuFd {
12031203
/// // KVM_GET_REG_LIST on Aarch64 demands that the vcpus be initialized.
12041204
/// #[cfg(target_arch = "aarch64")]
12051205
/// {
1206-
/// let mut kvi: kvm_bindings::kvm_vcpu_init = kvm_bindings::kvm_vcpu_init::default();
1206+
/// let mut kvi = kvm_bindings::kvm_vcpu_init::default();
12071207
/// vm.get_preferred_target(&mut kvi).unwrap();
12081208
/// vcpu.vcpu_init(&kvi).expect("Cannot initialize vcpu");
12091209
///
@@ -2321,7 +2321,7 @@ mod tests {
23212321
}
23222322

23232323
let mut vcpu_fd = vm.create_vcpu(0).unwrap();
2324-
let mut kvi = kvm_bindings::kvm_vcpu_init::default();
2324+
let mut kvi = kvm_vcpu_init::default();
23252325
vm.get_preferred_target(&mut kvi).unwrap();
23262326
kvi.features[0] |= 1 << KVM_ARM_VCPU_PSCI_0_2;
23272327
vcpu_fd.vcpu_init(&kvi).unwrap();
@@ -2784,7 +2784,7 @@ mod tests {
27842784

27852785
// KVM defines valid targets as 0 to KVM_ARM_NUM_TARGETS-1, so pick a big raw number
27862786
// greater than that as target to be invalid
2787-
let kvi: kvm_bindings::kvm_vcpu_init = kvm_bindings::kvm_vcpu_init {
2787+
let kvi = kvm_vcpu_init {
27882788
target: 300,
27892789
..Default::default()
27902790
};
@@ -2808,7 +2808,7 @@ mod tests {
28082808
coalesced_mmio_ring: None,
28092809
};
28102810

2811-
let device_attr = kvm_bindings::kvm_device_attr {
2811+
let device_attr = kvm_device_attr {
28122812
group: KVM_ARM_VCPU_PMU_V3_CTRL,
28132813
attr: u64::from(KVM_ARM_VCPU_PMU_V3_INIT),
28142814
addr: 0x0,
@@ -2926,7 +2926,7 @@ mod tests {
29262926
let vm = kvm.create_vm().unwrap();
29272927
let vcpu = vm.create_vcpu(0).unwrap();
29282928

2929-
let mut kvi: kvm_bindings::kvm_vcpu_init = kvm_bindings::kvm_vcpu_init::default();
2929+
let mut kvi = kvm_vcpu_init::default();
29302930

29312931
vm.get_preferred_target(&mut kvi)
29322932
.expect("Cannot get preferred target");
@@ -2940,7 +2940,7 @@ mod tests {
29402940
let vm = kvm.create_vm().unwrap();
29412941
let vcpu = vm.create_vcpu(0).unwrap();
29422942

2943-
let mut kvi: kvm_bindings::kvm_vcpu_init = kvm_bindings::kvm_vcpu_init::default();
2943+
let mut kvi = kvm_vcpu_init::default();
29442944
vm.get_preferred_target(&mut kvi)
29452945
.expect("Cannot get preferred target");
29462946
vcpu.vcpu_init(&kvi).expect("Cannot initialize vcpu");
@@ -2966,7 +2966,7 @@ mod tests {
29662966
let vm = kvm.create_vm().unwrap();
29672967
let vcpu = vm.create_vcpu(0).unwrap();
29682968

2969-
let mut kvi: kvm_bindings::kvm_vcpu_init = kvm_bindings::kvm_vcpu_init::default();
2969+
let mut kvi = kvm_vcpu_init::default();
29702970
vm.get_preferred_target(&mut kvi)
29712971
.expect("Cannot get preferred target");
29722972
vcpu.vcpu_init(&kvi).expect("Cannot initialize vcpu");
@@ -3007,7 +3007,7 @@ mod tests {
30073007
let err = vcpu.get_reg_list(&mut reg_list).unwrap_err();
30083008
assert!(err.errno() == libc::ENOEXEC);
30093009

3010-
let mut kvi: kvm_bindings::kvm_vcpu_init = kvm_bindings::kvm_vcpu_init::default();
3010+
let mut kvi = kvm_vcpu_init::default();
30113011
vm.get_preferred_target(&mut kvi)
30123012
.expect("Cannot get preferred target");
30133013
vcpu.vcpu_init(&kvi).expect("Cannot initialize vcpu");
@@ -3321,7 +3321,7 @@ mod tests {
33213321
let vm = kvm.create_vm().unwrap();
33223322
let vcpu = vm.create_vcpu(0).unwrap();
33233323

3324-
let dist_attr = kvm_bindings::kvm_device_attr {
3324+
let dist_attr = kvm_device_attr {
33253325
group: KVM_ARM_VCPU_PMU_V3_CTRL,
33263326
attr: u64::from(KVM_ARM_VCPU_PMU_V3_INIT),
33273327
addr: 0x0,
@@ -3330,10 +3330,10 @@ mod tests {
33303330

33313331
vcpu.has_device_attr(&dist_attr).unwrap_err();
33323332
vcpu.set_device_attr(&dist_attr).unwrap_err();
3333-
let mut kvi: kvm_bindings::kvm_vcpu_init = kvm_bindings::kvm_vcpu_init::default();
3333+
let mut kvi: kvm_vcpu_init = kvm_vcpu_init::default();
33343334
vm.get_preferred_target(&mut kvi)
33353335
.expect("Cannot get preferred target");
3336-
kvi.features[0] |= 1 << kvm_bindings::KVM_ARM_VCPU_PSCI_0_2 | 1 << KVM_ARM_VCPU_PMU_V3;
3336+
kvi.features[0] |= 1 << KVM_ARM_VCPU_PSCI_0_2 | 1 << KVM_ARM_VCPU_PMU_V3;
33373337
vcpu.vcpu_init(&kvi).unwrap();
33383338
vcpu.has_device_attr(&dist_attr).unwrap();
33393339
vcpu.set_device_attr(&dist_attr).unwrap();
@@ -3346,14 +3346,14 @@ mod tests {
33463346
let vm = kvm.create_vm().unwrap();
33473347
let vcpu = vm.create_vcpu(0).unwrap();
33483348

3349-
let mut kvi: kvm_bindings::kvm_vcpu_init = kvm_bindings::kvm_vcpu_init::default();
3349+
let mut kvi = kvm_vcpu_init::default();
33503350
vm.get_preferred_target(&mut kvi)
33513351
.expect("Cannot get preferred target");
33523352
if kvm.check_extension(Cap::ArmPtrAuthAddress) {
3353-
kvi.features[0] |= 1 << kvm_bindings::KVM_ARM_VCPU_PTRAUTH_ADDRESS;
3353+
kvi.features[0] |= 1 << KVM_ARM_VCPU_PTRAUTH_ADDRESS;
33543354
}
33553355
if kvm.check_extension(Cap::ArmPtrAuthGeneric) {
3356-
kvi.features[0] |= 1 << kvm_bindings::KVM_ARM_VCPU_PTRAUTH_GENERIC;
3356+
kvi.features[0] |= 1 << KVM_ARM_VCPU_PTRAUTH_GENERIC;
33573357
}
33583358
vcpu.vcpu_init(&kvi).unwrap();
33593359
}

‎src/ioctls/vm.rs

+15-15
Original file line numberDiff line numberDiff line change
@@ -1916,7 +1916,7 @@ impl AsRawFd for VmFd {
19161916
#[cfg(test)]
19171917
#[cfg(target_arch = "aarch64")]
19181918
pub(crate) fn create_gic_device(vm: &VmFd, flags: u32) -> DeviceFd {
1919-
let mut gic_device = kvm_bindings::kvm_create_device {
1919+
let mut gic_device = kvm_create_device {
19201920
type_: kvm_device_type_KVM_DEV_TYPE_ARM_VGIC_V3,
19211921
fd: 0,
19221922
flags,
@@ -1940,8 +1940,8 @@ pub(crate) fn create_gic_device(vm: &VmFd, flags: u32) -> DeviceFd {
19401940
#[cfg(test)]
19411941
#[cfg(target_arch = "aarch64")]
19421942
pub(crate) fn set_supported_nr_irqs(vgic: &DeviceFd, nr_irqs: u32) {
1943-
let vgic_attr = kvm_bindings::kvm_device_attr {
1944-
group: kvm_bindings::KVM_DEV_ARM_VGIC_GRP_NR_IRQS,
1943+
let vgic_attr = kvm_device_attr {
1944+
group: KVM_DEV_ARM_VGIC_GRP_NR_IRQS,
19451945
attr: 0,
19461946
addr: &nr_irqs as *const u32 as u64,
19471947
flags: 0,
@@ -1958,9 +1958,9 @@ pub(crate) fn set_supported_nr_irqs(vgic: &DeviceFd, nr_irqs: u32) {
19581958
#[cfg(test)]
19591959
#[cfg(target_arch = "aarch64")]
19601960
pub(crate) fn request_gic_init(vgic: &DeviceFd) {
1961-
let vgic_attr = kvm_bindings::kvm_device_attr {
1962-
group: kvm_bindings::KVM_DEV_ARM_VGIC_GRP_CTRL,
1963-
attr: u64::from(kvm_bindings::KVM_DEV_ARM_VGIC_CTRL_INIT),
1961+
let vgic_attr = kvm_device_attr {
1962+
group: KVM_DEV_ARM_VGIC_GRP_CTRL,
1963+
attr: u64::from(KVM_DEV_ARM_VGIC_CTRL_INIT),
19641964
addr: 0,
19651965
flags: 0,
19661966
};
@@ -1977,7 +1977,7 @@ pub(crate) fn request_gic_init(vgic: &DeviceFd) {
19771977
#[cfg(test)]
19781978
#[cfg(target_arch = "riscv64")]
19791979
pub(crate) fn create_aia_device(vm: &VmFd, flags: u32) -> DeviceFd {
1980-
let mut aia_device = kvm_bindings::kvm_create_device {
1980+
let mut aia_device = kvm_create_device {
19811981
type_: kvm_device_type_KVM_DEV_TYPE_RISCV_AIA,
19821982
fd: 0,
19831983
flags,
@@ -1995,9 +1995,9 @@ pub(crate) fn create_aia_device(vm: &VmFd, flags: u32) -> DeviceFd {
19951995
#[cfg(test)]
19961996
#[cfg(target_arch = "riscv64")]
19971997
pub(crate) fn set_supported_nr_irqs(vaia: &DeviceFd, nr_irqs: u32) {
1998-
let vaia_attr = kvm_bindings::kvm_device_attr {
1999-
group: kvm_bindings::KVM_DEV_RISCV_AIA_GRP_CONFIG,
2000-
attr: u64::from(kvm_bindings::KVM_DEV_RISCV_AIA_CONFIG_SRCS),
1998+
let vaia_attr = kvm_device_attr {
1999+
group: KVM_DEV_RISCV_AIA_GRP_CONFIG,
2000+
attr: u64::from(KVM_DEV_RISCV_AIA_CONFIG_SRCS),
20012001
addr: &nr_irqs as *const u32 as u64,
20022002
flags: 0,
20032003
};
@@ -2013,9 +2013,9 @@ pub(crate) fn set_supported_nr_irqs(vaia: &DeviceFd, nr_irqs: u32) {
20132013
#[cfg(test)]
20142014
#[cfg(target_arch = "riscv64")]
20152015
pub(crate) fn request_aia_init(vaia: &DeviceFd) {
2016-
let vaia_attr = kvm_bindings::kvm_device_attr {
2017-
group: kvm_bindings::KVM_DEV_RISCV_AIA_GRP_CTRL,
2018-
attr: u64::from(kvm_bindings::KVM_DEV_RISCV_AIA_CTRL_INIT),
2016+
let vaia_attr = kvm_device_attr {
2017+
group: KVM_DEV_RISCV_AIA_GRP_CTRL,
2018+
attr: u64::from(KVM_DEV_RISCV_AIA_CTRL_INIT),
20192019
addr: 0,
20202020
flags: 0,
20212021
};
@@ -2129,7 +2129,7 @@ mod tests {
21292129

21302130
// On ARM/arm64, a GICv2 is created. It's better to check ahead whether GICv2
21312131
// can be emulated or not.
2132-
let mut gic_device = kvm_bindings::kvm_create_device {
2132+
let mut gic_device = kvm_create_device {
21332133
type_: kvm_device_type_KVM_DEV_TYPE_ARM_VGIC_V2,
21342134
fd: 0,
21352135
flags: KVM_CREATE_DEVICE_TEST,
@@ -2588,7 +2588,7 @@ mod tests {
25882588
fn test_get_preferred_target() {
25892589
let kvm = Kvm::new().unwrap();
25902590
let vm = kvm.create_vm().unwrap();
2591-
let mut kvi: kvm_bindings::kvm_vcpu_init = kvm_bindings::kvm_vcpu_init::default();
2591+
let mut kvi = kvm_vcpu_init::default();
25922592
vm.get_preferred_target(&mut kvi).unwrap();
25932593
}
25942594

0 commit comments

Comments
 (0)