relicensing: Rewrite PR "uefi: Fix wrong install_configuration_table() signature"

The signature fix itself is trivial, just adding a `&`. The test changes had
already been partially rewritten during the freestanding table function
refactor. Now alter constants and variable names, remove a use of `as`, and free
the memory at the end.

The PR originally included a cleanup commit ("uefi-test-runner: Fix buffer
alignment on ia32") that ended up being cherry-picked and merged in a separate
PR: #844. Rewrite that fix here as
well.

This covers these commits:
d7697c3
9609873

Author: nicholasbishop

uefi-test-runner/src/boot/misc.rs

@@ -184,29 +184,31 @@ fn test_uninstall_protocol_interface() {
 
 fn test_install_configuration_table() {
     // Get the current number of entries.
-    let count = system::with_config_table(|t| t.len());
+    let initial_table_count = system::with_config_table(|t| t.len());
 
     // Create the entry data.
-    let config = boot::allocate_pool(MemoryType::RUNTIME_SERVICES_DATA, 1)
-        .unwrap()
-        .as_ptr();
-    unsafe { config.write(42) };
+    let config: NonNull<u8> = boot::allocate_pool(MemoryType::RUNTIME_SERVICES_DATA, 1).unwrap();
+    unsafe { config.write(123u8) };
 
     // Install the table.
-    const ID: Guid = guid!("4bec53c4-5fc1-48a1-ab12-df214907d29f");
+    const TABLE_GUID: Guid = guid!("4bec53c4-5fc1-48a1-ab12-df214907d29f");
     unsafe {
-        boot::install_configuration_table(&ID, config.cast()).unwrap();
+        boot::install_configuration_table(&TABLE_GUID, config.as_ptr().cast()).unwrap();
     }
 
     // Verify the installation.
-    assert_eq!(count + 1, system::with_config_table(|t| t.len()));
+    assert_eq!(
+        initial_table_count + 1,
+        system::with_config_table(|t| t.len())
+    );
     system::with_config_table(|t| {
-        let config_entry = t.iter().find(|ct| ct.guid == ID).unwrap();
-        assert_eq!(unsafe { *(config_entry.address as *const u8) }, 42);
+        let config_entry = t.iter().find(|ct| ct.guid == TABLE_GUID).unwrap();
+        assert_eq!(unsafe { *config_entry.address.cast::<u8>() }, 123);
     });
 
-    // Uninstall the table.
+    // Uninstall the table and free the memory.
     unsafe {
-        boot::install_configuration_table(&ID, ptr::null()).unwrap();
+        boot::install_configuration_table(&TABLE_GUID, ptr::null()).unwrap();
+        boot::free_pool(config).unwrap();
     }
 }

uefi-test-runner/src/proto/media.rs

@@ -15,6 +15,9 @@ use uefi::proto::media::fs::SimpleFileSystem;
 use uefi::proto::media::partition::{MbrOsType, PartitionInfo};
 use uefi::runtime::{Daylight, Time, TimeParams};
 
+#[repr(align(8))]
+struct AlignedBuf([u8; 256]);
+
 /// Test directory entry iteration.
 fn test_existing_dir(directory: &mut Directory) {
     info!("Testing existing directory");
@@ -31,11 +34,9 @@ fn test_existing_dir(directory: &mut Directory) {
     let dir = RefCell::new(dir);
 
     assert_eq!(FileInfo::alignment(), 8);
-    #[repr(align(8))]
-    struct Buf([u8; 200]);
 
     // Backing memory to read the file info data into.
-    let mut stack_buf = Buf([0; 200]);
+    let mut stack_buf = AlignedBuf([0; 256]);
 
     // The file names that the test read from the directory.
     let entry_names = RefCell::new(vec![]);