@@ -53,7 +53,7 @@ const MAX_IMAGE_MAPPING_PER_VM: usize = 16;
53
53
///
54
54
/// This method must be called before calling 'virtual_machines'
55
55
pub unsafe fn init_virtual_machines (
56
- machines : impl Iterator < Item = VirtualMachine > ,
56
+ machines : impl Iterator < Item = VirtualMachine > ,
57
57
) -> Result < ( ) > {
58
58
for machine in machines {
59
59
VIRTUAL_MACHINE_SET . insert ( machine) ?;
@@ -114,7 +114,8 @@ impl VirtualMachineSet {
114
114
/// Create a new VirtualMachineSet
115
115
const fn new ( ) -> Self {
116
116
Self {
117
- contexts : ArrayVec :: < [ VirtualMachineContext ; MAX_VCPU_COUNT ] > :: new ( ) ,
117
+ contexts : ArrayVec :: < [ VirtualMachineContext ; MAX_VCPU_COUNT ] > :: new (
118
+ ) ,
118
119
vms : ArrayVec :: < [ VirtualMachine ; MAX_VM_COUNT ] > :: new ( ) ,
119
120
}
120
121
}
@@ -278,7 +279,7 @@ impl VirtualMachineSet {
278
279
}
279
280
280
281
/// Receive all pending messages for the current core
281
- pub fn recv_all_msgs ( & self ) -> impl Iterator < Item = VirtualMachineMsg > {
282
+ pub fn recv_all_msgs ( & self ) -> impl Iterator < Item = VirtualMachineMsg > {
282
283
let context = self
283
284
. context_by_core_id ( percore:: read_core_id ( ) )
284
285
. expect ( "No VirtualMachineContext for apic id" ) ;
@@ -318,7 +319,7 @@ impl StaticVirtualDevices {
318
319
319
320
fn devices (
320
321
& self ,
321
- ) -> impl Iterator < Item = & RwLock < dyn virtdev:: EmulatedDevice > > {
322
+ ) -> impl Iterator < Item = & RwLock < dyn virtdev:: EmulatedDevice > > {
322
323
core:: array:: IntoIter :: new ( [
323
324
& self . acpi_runtime as & RwLock < dyn virtdev:: EmulatedDevice > ,
324
325
& self . vga_controller as & RwLock < dyn virtdev:: EmulatedDevice > ,
@@ -436,7 +437,7 @@ pub struct VirtualMachine {
436
437
437
438
/// Portions of the per-core Local APIC state needed for logical addressing
438
439
pub logical_apic_state :
439
- BTreeMap < percore:: CoreId , virtdev:: lapic:: LogicalApicState > ,
440
+ BTreeMap < percore:: CoreId , virtdev:: lapic:: LogicalApicState > ,
440
441
441
442
/// The number of vcpus that are up and waiting to start
442
443
cpus_ready : AtomicU32 ,
@@ -574,7 +575,7 @@ impl VirtualMachine {
574
575
pub fn logical_apic_destination (
575
576
& self ,
576
577
mask : u32 ,
577
- ) -> Result < impl Iterator < Item = & percore:: CoreId > > {
578
+ ) -> Result < impl Iterator < Item = & percore:: CoreId > > {
578
579
// FIXME: currently we only support the 'Flat Model' logical mode
579
580
// (so we just ignore the destination format register). See 10.6.2.2
580
581
// of Volume 3A of the Intel software developer's manual
@@ -736,7 +737,7 @@ mod test {
736
737
32 ,
737
738
host_devices,
738
739
)
739
- . unwrap ( ) ;
740
+ . unwrap ( ) ;
740
741
741
742
VirtualMachine :: new ( 0 , config, & info) . unwrap ( ) ;
742
743
}
0 commit comments