Skip to content

Commit b2a9387

Browse files
tjones60tjones60
committed
remove unnecessary async
1 parent 0efdadf commit b2a9387

File tree

4 files changed

+33
-44
lines changed

4 files changed

+33
-44
lines changed

‎openhcl/underhill_core/src/worker.rs

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2064,19 +2064,16 @@ async fn new_underhill_vm(
20642064
logger: Box::new(UnderhillLogger {
20652065
get: get_client.clone(),
20662066
}),
2067-
nvram_storage: Box::new(
2068-
HclCompatNvram::new(
2069-
VmgsStorageBackendAdapter(
2070-
vmgs_client
2071-
.as_non_volatile_store(vmgs::FileId::BIOS_NVRAM, true)
2072-
.context("failed to instantiate UEFI NVRAM store")?,
2073-
),
2074-
Some(HclCompatNvramQuirks {
2075-
skip_corrupt_vars_with_missing_null_term: true,
2076-
}),
2077-
)
2078-
.await?,
2079-
),
2067+
nvram_storage: Box::new(HclCompatNvram::new(
2068+
VmgsStorageBackendAdapter(
2069+
vmgs_client
2070+
.as_non_volatile_store(vmgs::FileId::BIOS_NVRAM, true)
2071+
.context("failed to instantiate UEFI NVRAM store")?,
2072+
),
2073+
Some(HclCompatNvramQuirks {
2074+
skip_corrupt_vars_with_missing_null_term: true,
2075+
}),
2076+
)),
20802077
generation_id_recv: get_client
20812078
.take_generation_id_recv()
20822079
.await

‎openvmm/hvlite_core/src/worker/dispatch.rs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,16 +1067,13 @@ impl InitializedVm {
10671067
use vmm_core::emuplat::hcl_compat_uefi_nvram_storage::VmgsStorageBackendAdapter;
10681068

10691069
match vmgs_client {
1070-
Some(vmgs) => Box::new(
1071-
HclCompatNvram::new(
1072-
VmgsStorageBackendAdapter(
1073-
vmgs.as_non_volatile_store(vmgs::FileId::BIOS_NVRAM, true)
1074-
.context("failed to instantiate UEFI NVRAM store")?,
1075-
),
1076-
None,
1077-
)
1078-
.await?,
1079-
),
1070+
Some(vmgs) => Box::new(HclCompatNvram::new(
1071+
VmgsStorageBackendAdapter(
1072+
vmgs.as_non_volatile_store(vmgs::FileId::BIOS_NVRAM, true)
1073+
.context("failed to instantiate UEFI NVRAM store")?,
1074+
),
1075+
None,
1076+
)),
10801077
None => Box::new(InMemoryNvram::new()),
10811078
}
10821079
},

‎vm/devices/firmware/hcl_compat_uefi_nvram_storage/src/lib.rs

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,8 @@ pub struct HclCompatNvramQuirks {
121121

122122
impl<S: StorageBackend> HclCompatNvram<S> {
123123
/// Create a new [`HclCompatNvram`]
124-
pub async fn new(
125-
storage: S,
126-
quirks: Option<HclCompatNvramQuirks>,
127-
) -> Result<Self, NvramStorageError> {
128-
let nvram = Self {
124+
pub fn new(storage: S, quirks: Option<HclCompatNvramQuirks>) -> Self {
125+
Self {
129126
quirks: quirks.unwrap_or(HclCompatNvramQuirks {
130127
skip_corrupt_vars_with_missing_null_term: false,
131128
}),
@@ -137,8 +134,7 @@ impl<S: StorageBackend> HclCompatNvram<S> {
137134
nvram_buf: Vec::new(),
138135

139136
loaded: false,
140-
};
141-
Ok(nvram)
137+
}
142138
}
143139

144140
async fn lazy_load_from_storage(&mut self) -> Result<(), NvramStorageError> {
@@ -418,6 +414,7 @@ impl<S: StorageBackend> NvramStorage for HclCompatNvram<S> {
418414

419415
Ok(())
420416
}
417+
421418
async fn append_variable(
422419
&mut self,
423420
name: &Ucs2LeSlice,
@@ -539,28 +536,28 @@ mod test {
539536
#[async_test]
540537
async fn test_single_variable() {
541538
let mut storage = EphemeralStorageBackend::default();
542-
let mut nvram = HclCompatNvram::new(&mut storage, None).await.unwrap();
539+
let mut nvram = HclCompatNvram::new(&mut storage, None);
543540
impl_agnostic_tests::test_single_variable(&mut nvram).await;
544541
}
545542

546543
#[async_test]
547544
async fn test_multiple_variable() {
548545
let mut storage = EphemeralStorageBackend::default();
549-
let mut nvram = HclCompatNvram::new(&mut storage, None).await.unwrap();
546+
let mut nvram = HclCompatNvram::new(&mut storage, None);
550547
impl_agnostic_tests::test_multiple_variable(&mut nvram).await;
551548
}
552549

553550
#[async_test]
554551
async fn test_next() {
555552
let mut storage = EphemeralStorageBackend::default();
556-
let mut nvram = HclCompatNvram::new(&mut storage, None).await.unwrap();
553+
let mut nvram = HclCompatNvram::new(&mut storage, None);
557554
impl_agnostic_tests::test_next(&mut nvram).await;
558555
}
559556

560557
#[async_test]
561558
async fn boundary_conditions() {
562559
let mut storage = EphemeralStorageBackend::default();
563-
let mut nvram = HclCompatNvram::new(&mut storage, None).await.unwrap();
560+
let mut nvram = HclCompatNvram::new(&mut storage, None);
564561

565562
let vendor = Guid::new_random();
566563
let attr = 0x1234;
@@ -648,7 +645,7 @@ mod test {
648645
let data = vec![0x1, 0x2, 0x3, 0x4, 0x5];
649646
let timestamp = EFI_TIME::default();
650647

651-
let mut nvram = HclCompatNvram::new(&mut storage, None).await.unwrap();
648+
let mut nvram = HclCompatNvram::new(&mut storage, None);
652649
nvram
653650
.set_variable(name1, vendor1, attr, data.clone(), timestamp)
654651
.await
@@ -665,7 +662,7 @@ mod test {
665662
drop(nvram);
666663

667664
// reload
668-
let mut nvram = HclCompatNvram::new(&mut storage, None).await.unwrap();
665+
let mut nvram = HclCompatNvram::new(&mut storage, None);
669666

670667
let (result_attr, result_data, result_timestamp) =
671668
nvram.get_variable(name1, vendor1).await.unwrap().unwrap();

‎vm/vmgs/vmgstool/src/uefi_nvram.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -343,19 +343,17 @@ async fn vmgs_file_open_nvram(
343343
let vmgs = vmgs_file_open(file_path, key_path, open_mode, false).await?;
344344
let encrypted = vmgs.is_encrypted();
345345

346-
open_nvram(vmgs, encrypted).await
346+
open_nvram(vmgs, encrypted)
347347
}
348348

349-
async fn open_nvram(
350-
vmgs: Vmgs,
351-
encrypted: bool,
352-
) -> Result<HclCompatNvram<VmgsStorageBackend>, Error> {
353-
Ok(HclCompatNvram::new(
349+
fn open_nvram(vmgs: Vmgs, encrypted: bool) -> Result<HclCompatNvram<VmgsStorageBackend>, Error> {
350+
let nvram_storage = HclCompatNvram::new(
354351
VmgsStorageBackend::new(vmgs, vmgs::FileId::BIOS_NVRAM, encrypted)
355352
.map_err(Error::VmgsStorageBackend)?,
356353
None,
357-
)
358-
.await?)
354+
);
355+
356+
Ok(nvram_storage)
359357
}
360358

361359
/// Delete all boot entries in the BIOS NVRAM VMGS file in an attempt to repair a VM that is failing to boot.

0 commit comments

Comments
 (0)