uefi: Convert the firmware_uefi device to new resourcing model

Cargo.lock

@@ -2030,9 +2030,12 @@ dependencies = [
  "async-trait",
  "bitfield-struct 0.11.0",
  "chipset_device",
+ "chipset_device_resources",
+ "chipset_resources",
  "crypto",
  "der",
  "firmware_uefi_custom_vars",
+ "firmware_uefi_resources",
  "generation_id",
  "getrandom 0.4.2",
  "guestmem",
@@ -2051,6 +2054,7 @@ dependencies = [
  "uefi_nvram_specvars",
  "uefi_nvram_storage",
  "uefi_specs",
+ "vm_resource",
  "vmcore",
  "watchdog_core",
  "wchar",
@@ -2067,6 +2071,21 @@ dependencies = [
  "uefi_specs",
 ]
 
+[[package]]
+name = "firmware_uefi_resources"
+version = "0.0.0"
+dependencies = [
+ "chipset_resources",
+ "firmware_uefi_custom_vars",
+ "inspect",
+ "mesh",
+ "mesh_protobuf",
+ "uefi_nvram_storage",
+ "uefi_specs",
+ "vm_resource",
+ "watchdog_core",
+]
+
 [[package]]
 name = "fixedbitset"
 version = "0.4.2"
@@ -2476,11 +2495,13 @@ dependencies = [
  "arbitrary",
  "crypto",
  "firmware_uefi",
+ "firmware_uefi_resources",
  "guestmem",
  "guid",
  "libfuzzer-sys",
  "ucs2 0.0.0",
  "uefi_nvram_specvars",
+ "uefi_specs",
  "xtask_fuzz",
  "zerocopy",
 ]
@@ -5352,8 +5373,8 @@ dependencies = [
  "disk_backend",
  "fdt",
  "firmware_pcat",
- "firmware_uefi",
  "firmware_uefi_custom_vars",
+ "firmware_uefi_resources",
  "floppy",
  "floppy_resources",
  "framebuffer",
@@ -5373,7 +5394,6 @@ dependencies = [
  "input_core",
  "inspect",
  "loader",
- "local_clock",
  "membacking",
  "memory_range",
  "mesh",
@@ -5469,6 +5489,7 @@ dependencies = [
  "disk_backend_resources",
  "disk_crypt_resources",
  "firmware_uefi_custom_vars",
+ "firmware_uefi_resources",
  "floppy_resources",
  "framebuffer",
  "fs-err",
@@ -5562,6 +5583,7 @@ dependencies = [
  "chipset_resources",
  "debug_worker",
  "disk_striped",
+ "firmware_uefi",
  "guest_watchdog",
  "hyperv_ic",
  "mesh_worker",
@@ -5646,6 +5668,7 @@ dependencies = [
  "disk_vhdmp",
  "disklayer_ram",
  "disklayer_sqlite",
+ "firmware_uefi",
  "gdma",
  "guest_crash_device",
  "guest_emulation_device",
@@ -6060,6 +6083,7 @@ dependencies = [
  "disk_vhd1",
  "disk_vhdmp",
  "fatfs",
+ "firmware_uefi_resources",
  "flate2",
  "framebuffer",
  "fs-err",
@@ -8467,8 +8491,8 @@ dependencies = [
  "disk_get_vmgs",
  "disk_nvme",
  "firmware_pcat",
- "firmware_uefi",
  "firmware_uefi_custom_vars",
+ "firmware_uefi_resources",
  "framebuffer",
  "fs-err",
  "futures",
@@ -9566,6 +9590,9 @@ name = "vm_manifest_builder"
 version = "0.0.0"
 dependencies = [
  "chipset_resources",
+ "firmware_uefi_custom_vars",
+ "firmware_uefi_resources",
+ "getrandom 0.4.2",
  "input_core",
  "mesh",
  "missing_dev_resources",
@@ -10234,7 +10261,6 @@ dependencies = [
  "closeable_mutex",
  "cvm_tracing",
  "firmware_pcat",
- "firmware_uefi",
  "floppy",
  "floppy_pcat_stub",
  "framebuffer",
@@ -10244,7 +10270,6 @@ dependencies = [
  "ide",
  "inspect",
  "inspect_counters",
- "local_clock",
  "mesh",
  "missing_dev",
  "pal_async",
@@ -10257,12 +10282,10 @@ dependencies = [
  "thiserror 2.0.16",
  "tracelimit",
  "tracing",
- "uefi_nvram_storage",
  "vga",
  "vga_proxy",
  "vm_resource",
  "vmcore",
- "watchdog_core",
 ]
 
 [[package]]

Cargo.toml

@@ -232,6 +232,7 @@ chipset_resources = { path = "vm/devices/chipset_resources" }
 firmware_pcat = { path = "vm/devices/firmware/firmware_pcat" }
 firmware_uefi = { path = "vm/devices/firmware/firmware_uefi" }
 firmware_uefi_custom_vars = { path = "vm/devices/firmware/firmware_uefi_custom_vars" }
+firmware_uefi_resources = { path = "vm/devices/firmware/firmware_uefi_resources" }
 uefi_nvram_storage = { path = "vm/devices/firmware/uefi_nvram_storage" }
 uefi_specs = { path = "vm/devices/firmware/uefi_specs" }
 uefi_nvram_specvars = { path = "vm/devices/firmware/uefi_nvram_specvars" }

openhcl/openvmm_hcl_resources/Cargo.toml

@@ -31,6 +31,7 @@ uidevices = { workspace = true, optional = true }
 chipset.workspace = true
 chipset_legacy.workspace = true
 chipset_resources.workspace = true
+firmware_uefi.workspace = true
 hyperv_ic.workspace = true
 missing_dev.workspace = true
 serial_16550.workspace = true

openhcl/openvmm_hcl_resources/src/lib.rs

@@ -29,6 +29,7 @@ vm_resource::register_static_resolvers! {
     #[cfg(guest_arch = "x86_64")]
     chipset::pm::resolver::HyperVPowerManagementResolver,
     chipset_resources::cmos_rtc_time_source::SystemTimeClockResolver,
+    firmware_uefi::resolver::UefiDeviceResolver,
     missing_dev::resolver::MissingDevResolver,
     #[cfg(feature = "tpm")]
     tpm_device::resolver::TpmDeviceResolver,

openhcl/underhill_core/Cargo.toml

@@ -54,8 +54,8 @@ disk_backend_resources.workspace = true
 disk_blockdevice.workspace = true
 disk_get_vmgs.workspace = true
 disk_nvme.workspace = true
-firmware_uefi.workspace = true
 firmware_uefi_custom_vars.workspace = true
+firmware_uefi_resources.workspace = true
 gdma_defs.workspace = true
 hyperv_ic_guest.workspace = true
 hyperv_ic_resources.workspace = true

openhcl/underhill_core/src/emuplat/firmware.rs

@@ -2,8 +2,8 @@
 // Licensed under the MIT License.
 
 use cvm_tracing::CVM_ALLOWED;
-use firmware_uefi::platform::logger::UefiEvent;
-use firmware_uefi::platform::logger::UefiLogger;
+use firmware_uefi_resources::platform::UefiEvent;
+use firmware_uefi_resources::platform::UefiLogger;
 use guest_emulation_transport::GuestEmulationTransportClient;
 use guest_emulation_transport::api::EventLogId;
 use std::sync::Weak;
@@ -54,7 +54,7 @@ pub struct UnderhillVsmConfig {
     pub partition: Weak<UhPartition>,
 }
 
-impl firmware_uefi::platform::nvram::VsmConfig for UnderhillVsmConfig {
+impl firmware_uefi_resources::platform::VsmConfig for UnderhillVsmConfig {
     fn revoke_guest_vsm(&self) {
         if let Some(partition) = self.partition.upgrade() {
             if let Err(err) = partition.revoke_guest_vsm() {

openhcl/underhill_core/src/emuplat/mod.rs

@@ -10,6 +10,7 @@ pub mod netvsp;
 pub mod non_volatile_store;
 pub mod pm_timer_assist;
 pub mod tpm;
+pub mod uefi;
 pub mod vga_proxy;
 pub mod watchdog;