uefi: mem: cleanup unnecessary key duplication

Author: phip1611

uefi/src/mem/memory_map/impl_.rs

@@ -96,7 +96,6 @@ impl Index<usize> for MemoryMapRef<'_> {
 #[derive(Debug)]
 pub struct MemoryMapRefMut<'a> {
     buf: &'a mut [u8],
-    key: MemoryMapKey,
     meta: MemoryMapMeta,
     len: usize,
 }
@@ -106,7 +105,6 @@ impl<'a> MemoryMapRefMut<'a> {
     pub fn new(
         buffer: &'a mut [u8],
         meta: MemoryMapMeta,
-        key: Option<MemoryMapKey>,
     ) -> Result<Self, MemoryMapError> {
         if buffer.as_ptr().align_offset(8) != 0 {
             return Err(MemoryMapError::Misaligned);
@@ -116,7 +114,6 @@ impl<'a> MemoryMapRefMut<'a> {
         }
         Ok(Self {
             buf: buffer,
-            key: key.unwrap_or_default(),
             meta,
             len: meta.entry_count(),
         })
@@ -129,7 +126,7 @@ impl<'a> MemoryMap for MemoryMapRefMut<'a> {
     }
 
     fn key(&self) -> MemoryMapKey {
-        self.key
+        self.meta.map_key
     }
 
     fn len(&self) -> usize {
@@ -360,7 +357,6 @@ impl Drop for MemoryMapBackingMemory {
 pub struct MemoryMapOwned {
     /// Backing memory, properly initialized at this point.
     pub(crate) buf: MemoryMapBackingMemory,
-    pub(crate) key: MemoryMapKey,
     pub(crate) meta: MemoryMapMeta,
     pub(crate) len: usize,
 }
@@ -372,7 +368,6 @@ impl MemoryMapOwned {
         assert!(meta.desc_size >= mem::size_of::<MemoryDescriptor>());
         let len = meta.entry_count();
         MemoryMapOwned {
-            key: MemoryMapKey(0),
             buf,
             meta,
             len,
@@ -400,7 +395,7 @@ impl MemoryMap for MemoryMapOwned {
     }
 
     fn key(&self) -> MemoryMapKey {
-        self.key
+        self.meta.map_key
     }
 
     fn len(&self) -> usize {
@@ -423,7 +418,6 @@ impl MemoryMapMut for MemoryMapOwned {
     fn sort(&mut self) {
         let mut reference = MemoryMapRefMut {
             buf: self.buf.as_mut_slice(),
-            key: self.key,
             meta: self.meta,
             len: self.len,
         };
@@ -518,7 +512,7 @@ mod tests {
     fn memory_map_ref_mut() {
         let mut memory = new_mmap_memory();
         let (mmap, meta) = mmap_raw(&mut memory);
-        let mut mmap = MemoryMapRefMut::new(mmap, meta, None).unwrap();
+        let mut mmap = MemoryMapRefMut::new(mmap, meta).unwrap();
 
         assert_eq!(mmap.entries().count(), 3);
         assert_eq!(