From 60165bbcfaf49ae2c57481ca0f7b142d1a4a1b34 Mon Sep 17 00:00:00 2001
From: Rob Bradford <rbradford@rivosinc.com>
Date: Fri, 20 Sep 2024 11:09:01 +0100
Subject: [PATCH] pci: Fix #[cfg(target_arch)] guards for port I/O

Port I/O is only supported on x86_64 - use inverted conditional logic to
match the other architectures rather than calling them out specifically.
This will be relevant when RISC-V support is added.

Signed-off-by: Rob Bradford <rbradford@rivosinc.com>
---
 pci/src/bus.rs  | 2 +-
 pci/src/vfio.rs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pci/src/bus.rs b/pci/src/bus.rs
index 8166d9b39..03fbaadf8 100644
--- a/pci/src/bus.rs
+++ b/pci/src/bus.rs
@@ -134,7 +134,7 @@ impl PciBus {
                     io_bus
                         .insert(dev.clone(), bar.addr(), bar.size())
                         .map_err(PciRootError::PioInsert)?;
-                    #[cfg(target_arch = "aarch64")]
+                    #[cfg(not(target_arch = "x86_64"))]
                     error!("I/O region is not supported");
                 }
                 PciBarRegionType::Memory32BitRegion | PciBarRegionType::Memory64BitRegion => {
diff --git a/pci/src/vfio.rs b/pci/src/vfio.rs
index c688e7da3..07011cc02 100644
--- a/pci/src/vfio.rs
+++ b/pci/src/vfio.rs
@@ -711,11 +711,11 @@ impl VfioCommon {
 
             let bar_addr = match region_type {
                 PciBarRegionType::IoRegion => {
-                    #[cfg(target_arch = "aarch64")]
+                    #[cfg(not(target_arch = "x86_64"))]
                     unimplemented!();
 
                     // The address needs to be 4 bytes aligned.
-                    #[cfg(not(target_arch = "aarch64"))]
+                    #[cfg(target_arch = "x86_64")]
                     allocator
                         .lock()
                         .unwrap()
@@ -795,7 +795,7 @@ impl VfioCommon {
                 PciBarRegionType::IoRegion => {
                     #[cfg(target_arch = "x86_64")]
                     allocator.free_io_addresses(region.start, region.length);
-                    #[cfg(target_arch = "aarch64")]
+                    #[cfg(not(target_arch = "x86_64"))]
                     error!("I/O region is not supported");
                 }
                 PciBarRegionType::Memory32BitRegion => {