Include HypPciTransport in SomeTransport too.

rcore-os · Nov 26, 2024 · 15d42ce · 15d42ce
1 parent 8b9f116
commit 15d42ce
Showing 1 changed file with 33 additions and 0 deletions.
diff --git a/src/transport/some.rs b/src/transport/some.rs
@@ -10,6 +10,9 @@ pub enum SomeTransport {
     Mmio(MmioTransport),
     /// A PCI transport.
     Pci(PciTransport),
+    /// An x86-64 pKVM PCI transport.
+    #[cfg(target_arch = "x86_64")]
+    HypPci(super::x86_64::HypPciTransport),
 }
 
 impl From<MmioTransport> for SomeTransport {
@@ -29,62 +32,80 @@ impl Transport for SomeTransport {
         match self {
             Self::Mmio(mmio) => mmio.device_type(),
             Self::Pci(pci) => pci.device_type(),
+            #[cfg(target_arch = "x86_64")]
+            Self::HypPci(pci) => pci.device_type(),
         }
     }
 
     fn read_device_features(&mut self) -> u64 {
         match self {
             Self::Mmio(mmio) => mmio.read_device_features(),
             Self::Pci(pci) => pci.read_device_features(),
+            #[cfg(target_arch = "x86_64")]
+            Self::HypPci(pci) => pci.read_device_features(),
         }
     }
 
     fn write_driver_features(&mut self, driver_features: u64) {
         match self {
             Self::Mmio(mmio) => mmio.write_driver_features(driver_features),
             Self::Pci(pci) => pci.write_driver_features(driver_features),
+            #[cfg(target_arch = "x86_64")]
+            Self::HypPci(pci) => pci.write_driver_features(driver_features),
         }
     }
 
     fn max_queue_size(&mut self, queue: u16) -> u32 {
         match self {
             Self::Mmio(mmio) => mmio.max_queue_size(queue),
             Self::Pci(pci) => pci.max_queue_size(queue),
+            #[cfg(target_arch = "x86_64")]
+            Self::HypPci(pci) => pci.max_queue_size(queue),
         }
     }
 
     fn notify(&mut self, queue: u16) {
         match self {
             Self::Mmio(mmio) => mmio.notify(queue),
             Self::Pci(pci) => pci.notify(queue),
+            #[cfg(target_arch = "x86_64")]
+            Self::HypPci(pci) => pci.notify(queue),
         }
     }
 
     fn get_status(&self) -> DeviceStatus {
         match self {
             Self::Mmio(mmio) => mmio.get_status(),
             Self::Pci(pci) => pci.get_status(),
+            #[cfg(target_arch = "x86_64")]
+            Self::HypPci(pci) => pci.get_status(),
         }
     }
 
     fn set_status(&mut self, status: DeviceStatus) {
         match self {
             Self::Mmio(mmio) => mmio.set_status(status),
             Self::Pci(pci) => pci.set_status(status),
+            #[cfg(target_arch = "x86_64")]
+            Self::HypPci(pci) => pci.set_status(status),
         }
     }
 
     fn set_guest_page_size(&mut self, guest_page_size: u32) {
         match self {
             Self::Mmio(mmio) => mmio.set_guest_page_size(guest_page_size),
             Self::Pci(pci) => pci.set_guest_page_size(guest_page_size),
+            #[cfg(target_arch = "x86_64")]
+            Self::HypPci(pci) => pci.set_guest_page_size(guest_page_size),
         }
     }
 
     fn requires_legacy_layout(&self) -> bool {
         match self {
             Self::Mmio(mmio) => mmio.requires_legacy_layout(),
             Self::Pci(pci) => pci.requires_legacy_layout(),
+            #[cfg(target_arch = "x86_64")]
+            Self::HypPci(pci) => pci.requires_legacy_layout(),
         }
     }
 
@@ -99,34 +120,44 @@ impl Transport for SomeTransport {
         match self {
             Self::Mmio(mmio) => mmio.queue_set(queue, size, descriptors, driver_area, device_area),
             Self::Pci(pci) => pci.queue_set(queue, size, descriptors, driver_area, device_area),
+            #[cfg(target_arch = "x86_64")]
+            Self::HypPci(pci) => pci.queue_set(queue, size, descriptors, driver_area, device_area),
         }
     }
 
     fn queue_unset(&mut self, queue: u16) {
         match self {
             Self::Mmio(mmio) => mmio.queue_unset(queue),
             Self::Pci(pci) => pci.queue_unset(queue),
+            #[cfg(target_arch = "x86_64")]
+            Self::HypPci(pci) => pci.queue_unset(queue),
         }
     }
 
     fn queue_used(&mut self, queue: u16) -> bool {
         match self {
             Self::Mmio(mmio) => mmio.queue_used(queue),
             Self::Pci(pci) => pci.queue_used(queue),
+            #[cfg(target_arch = "x86_64")]
+            Self::HypPci(pci) => pci.queue_used(queue),
         }
     }
 
     fn ack_interrupt(&mut self) -> bool {
         match self {
             Self::Mmio(mmio) => mmio.ack_interrupt(),
             Self::Pci(pci) => pci.ack_interrupt(),
+            #[cfg(target_arch = "x86_64")]
+            Self::HypPci(pci) => pci.ack_interrupt(),
         }
     }
 
     fn read_config_space<T: FromBytes>(&self, offset: usize) -> Result<T> {
         match self {
             Self::Mmio(mmio) => mmio.read_config_space(offset),
             Self::Pci(pci) => pci.read_config_space(offset),
+            #[cfg(target_arch = "x86_64")]
+            Self::HypPci(pci) => pci.read_config_space(offset),
         }
     }
 
@@ -138,6 +169,8 @@ impl Transport for SomeTransport {
         match self {
             Self::Mmio(mmio) => mmio.write_config_space(offset, value),
             Self::Pci(pci) => pci.write_config_space(offset, value),
+            #[cfg(target_arch = "x86_64")]
+            Self::HypPci(pci) => pci.write_config_space(offset, value),
         }
     }
 }