Update needed for Rust v1.73.0 am: e031edca53 am: 57947f066e am: b0a7904463
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2791539
Change-Id: I3cde9d9b00b22ab4094d5e39912dc1dbd72a4103
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/virtualizationservice/vfio_handler/src/aidl.rs b/virtualizationservice/vfio_handler/src/aidl.rs
index 618c165..2968ff9 100644
--- a/virtualizationservice/vfio_handler/src/aidl.rs
+++ b/virtualizationservice/vfio_handler/src/aidl.rs
@@ -239,7 +239,7 @@
if dt_table_header.magic.get() != DT_TABLE_MAGIC
|| dt_table_header.header_size.get() as usize != size_of::<DtTableHeader>()
{
- return Err(anyhow!("DtTableHeader is invalid")).or_service_specific_exception(-1)?;
+ return Err(anyhow!("DtTableHeader is invalid")).or_service_specific_exception(-1);
}
Ok(dt_table_header)
}
@@ -250,7 +250,7 @@
index: u32,
) -> binder::Result<DtTableEntry> {
if index >= header.dt_entry_count.get() {
- return Err(anyhow!("Invalid dtbo index {index}")).or_service_specific_exception(-1)?;
+ return Err(anyhow!("Invalid dtbo index {index}")).or_service_specific_exception(-1);
}
let Some(prev_dt_entry_total_size) = header.dt_entry_size.get().checked_mul(index) else {
return Err(anyhow!("Unexpected arithmetic result"))