Add Hyper-V IDE controller support to chipset resources

Cargo.lock

@@ -681,6 +681,7 @@ name = "chipset_resources"
 version = "0.0.0"
 dependencies = [
  "arbitrary",
+ "ide_resources",
  "inspect",
  "mesh",
  "vm_resource",
@@ -3466,8 +3467,11 @@ dependencies = [
 name = "ide"
 version = "0.0.0"
 dependencies = [
+ "async-trait",
  "bitfield-struct 0.11.0",
  "chipset_device",
+ "chipset_device_resources",
+ "chipset_resources",
  "disk_backend",
  "disk_file",
  "guestmem",
@@ -3489,6 +3493,7 @@ dependencies = [
  "tracelimit",
  "tracing",
  "tracing_helpers",
+ "vm_resource",
  "vmcore",
  "zerocopy",
 ]
@@ -5253,8 +5258,6 @@ dependencies = [
  "hcl_compat_uefi_nvram_storage",
  "hvdef",
  "hypervisor_resources",
- "ide",
- "ide_resources",
  "igvm",
  "igvm_defs",
  "input_core",
@@ -5275,8 +5278,6 @@ dependencies = [
  "pci_resources",
  "pcie",
  "range_map_vec",
- "scsi_core",
- "scsidisk",
  "serial_16550_resources",
  "sparse_mmap",
  "state_unit",
@@ -5450,6 +5451,7 @@ dependencies = [
  "debug_worker",
  "disk_striped",
  "hyperv_ic",
+ "ide",
  "mesh_worker",
  "missing_dev",
  "nvme",
@@ -5539,6 +5541,7 @@ dependencies = [
  "guest_emulation_device",
  "guest_emulation_log",
  "hyperv_ic",
+ "ide",
  "mesh_worker",
  "missing_dev",
  "net_backend",
@@ -8303,6 +8306,7 @@ dependencies = [
  "chipset_device_worker",
  "chipset_device_worker_defs",
  "chipset_legacy",
+ "chipset_resources",
  "closeable_mutex",
  "crypto",
  "cvm_tracing",
@@ -8336,7 +8340,6 @@ dependencies = [
  "hyperv_ic_resources",
  "hyperv_secure_boot_templates",
  "hyperv_uefi_custom_vars_json",
- "ide",
  "ide_resources",
  "igvm",
  "igvm_defs",
@@ -8375,8 +8378,6 @@ dependencies = [
  "profiler_worker",
  "safe_intrinsics",
  "scsi_buffers",
- "scsi_core",
- "scsidisk",
  "scsidisk_resources",
  "serde",
  "serde_helpers",
@@ -8386,7 +8387,6 @@ dependencies = [
  "sparse_mmap",
  "state_unit",
  "storage_string",
- "storvsp",
  "storvsp_resources",
  "string_page_buf",
  "tee_call",
@@ -10076,7 +10076,6 @@ dependencies = [
  "generation_id",
  "guest_watchdog",
  "guestmem",
- "ide",
  "inspect",
  "inspect_counters",
  "local_clock",

openhcl/openvmm_hcl_resources/Cargo.toml

@@ -30,6 +30,7 @@ uidevices = { workspace = true, optional = true }
 
 chipset.workspace = true
 chipset_legacy.workspace = true
+ide.workspace = true
 hyperv_ic.workspace = true
 missing_dev.workspace = true
 serial_16550.workspace = true

openhcl/openvmm_hcl_resources/src/lib.rs

@@ -19,6 +19,8 @@ vm_resource::register_static_resolvers! {
     #[cfg(guest_arch = "x86_64")]
     chipset_legacy::piix4_pci_isa_bridge::resolver::Piix4PciIsaBridgeResolver,
     #[cfg(guest_arch = "x86_64")]
+    ide::resolver::HyperVIdeResolver,
+    #[cfg(guest_arch = "x86_64")]
     chipset::pit::resolver::PitResolver,
     #[cfg(guest_arch = "x86_64")]
     chipset::pic::resolver::PicResolver,
@@ -51,6 +53,7 @@ vm_resource::register_static_resolvers! {
     // Vmbus devices
     hyperv_ic::resolver::ShutdownIcResolver,
     storvsp::resolver::StorvspResolver,
+    storvsp::resolver::StorvspIdeResolver,
     #[cfg(feature = "uidevices")]
     uidevices::resolver::VmbusUiResolver,
 

openhcl/underhill_core/Cargo.toml

@@ -26,6 +26,7 @@ vmotherboard = { workspace = true, features = [
     "dev_underhill_vga_proxy",
     "dev_winbond_super_io_and_floppy_stub",
 ] }
+chipset_resources.workspace = true
 build_info.workspace = true
 cvm_tracing.workspace = true
 mem_profile_tracing = { workspace = true, optional = true }
@@ -63,7 +64,6 @@ hcl_compat_uefi_nvram_storage = { workspace = true, features = ["inspect", "save
 get_helpers.workspace = true
 get_protocol.workspace = true
 guest_emulation_transport.workspace = true
-ide.workspace = true
 ide_resources.workspace = true
 input_core.workspace = true
 kmsg_defs.workspace = true
@@ -78,12 +78,9 @@ netvsp.workspace = true
 nvme_driver.workspace = true
 nvme_resources.workspace = true
 openhcl_dma_manager.workspace = true
-scsi_core.workspace = true
-scsidisk.workspace = true
 scsidisk_resources.workspace = true
 serial_16550_resources.workspace = true
 storage_string.workspace = true
-storvsp.workspace = true
 storvsp_resources.workspace = true
 tpm_protocol.workspace = true
 tpm_resources.workspace = true

openhcl/underhill_core/src/dispatch/mod.rs

@@ -169,7 +169,6 @@ pub(crate) struct LoadedVm {
     pub host_vmbus_relay: Option<VmbusRelayHandle>,
     // channels are revoked when dropped, so make sure to keep them alive
     pub _vmbus_devices: Vec<SpawnedUnit<ChannelUnit<dyn VmbusDevice>>>,
-    pub _ide_accel_devices: Vec<SpawnedUnit<ChannelUnit<storvsp::StorageDevice>>>,
     pub network_settings: Option<Box<dyn LoadedVmNetworkSettings>>,
     pub shutdown_relay: Option<(
         mesh::Receiver<Rpc<ShutdownParams, ShutdownResult>>,