refactor: simplify virtio cfgs

Author: mkroening

src/config.rs

@@ -4,18 +4,7 @@ pub const DEFAULT_STACK_SIZE: usize = 0x0001_0000;
 
 pub(crate) const USER_STACK_SIZE: usize = 0x0010_0000;
 
-#[cfg(any(
-	all(
-		not(any(
-			all(target_arch = "riscv64", feature = "gem-net", not(feature = "pci")),
-			feature = "rtl8139",
-		)),
-		feature = "virtio-net",
-	),
-	feature = "fuse",
-	feature = "vsock",
-	feature = "console",
-))]
+#[cfg(feature = "virtio")]
 pub(crate) const VIRTIO_MAX_QUEUE_SIZE: u16 = if cfg!(feature = "pci") { 2048 } else { 1024 };
 
 /// Default keep alive interval in milliseconds

src/drivers/mod.rs

@@ -10,16 +10,7 @@ pub mod mmio;
 pub mod net;
 #[cfg(feature = "pci")]
 pub mod pci;
-#[cfg(any(
-	all(
-		not(all(target_arch = "riscv64", feature = "gem-net", not(feature = "pci"))),
-		not(feature = "rtl8139"),
-		feature = "virtio-net",
-	),
-	feature = "fuse",
-	feature = "vsock",
-	feature = "console",
-))]
+#[cfg(feature = "virtio")]
 pub mod virtio;
 #[cfg(feature = "vsock")]
 pub mod vsock;
@@ -38,51 +29,27 @@ pub(crate) type InterruptHandlerQueue = VecDeque<fn()>;
 /// passed on to higher layers.
 pub mod error {
 	#[cfg(any(
+		feature = "virtio",
 		all(target_arch = "riscv64", feature = "gem-net", not(feature = "pci")),
 		feature = "rtl8139",
-		feature = "virtio-net",
-		feature = "fuse",
-		feature = "vsock",
-		feature = "console",
 	))]
 	use thiserror::Error;
 
 	#[cfg(all(target_arch = "riscv64", feature = "gem-net", not(feature = "pci")))]
 	use crate::drivers::net::gem::GEMError;
 	#[cfg(feature = "rtl8139")]
 	use crate::drivers::net::rtl8139::RTL8139Error;
-	#[cfg(any(
-		all(
-			not(all(target_arch = "riscv64", feature = "gem-net", not(feature = "pci"))),
-			not(feature = "rtl8139"),
-			feature = "virtio-net",
-		),
-		feature = "fuse",
-		feature = "vsock",
-		feature = "console",
-	))]
+	#[cfg(feature = "virtio")]
 	use crate::drivers::virtio::error::VirtioError;
 
 	#[cfg(any(
+		feature = "virtio",
 		all(target_arch = "riscv64", feature = "gem-net", not(feature = "pci")),
 		feature = "rtl8139",
-		feature = "virtio-net",
-		feature = "fuse",
-		feature = "vsock",
-		feature = "console",
 	))]
 	#[derive(Error, Debug)]
 	pub enum DriverError {
-		#[cfg(any(
-			all(
-				not(all(target_arch = "riscv64", feature = "gem-net", not(feature = "pci"))),
-				not(feature = "rtl8139"),
-				feature = "virtio-net",
-			),
-			feature = "fuse",
-			feature = "vsock",
-			feature = "console",
-		))]
+		#[cfg(feature = "virtio")]
 		#[error("Virtio driver failed: {0:?}")]
 		InitVirtioDevFail(#[from] VirtioError),
 

src/drivers/pci.rs

@@ -27,19 +27,9 @@ use crate::drivers::fs::virtio_fs::VirtioFsDriver;
 use crate::drivers::net::rtl8139::{self, RTL8139Driver};
 #[cfg(all(not(feature = "rtl8139"), feature = "virtio-net"))]
 use crate::drivers::net::virtio::VirtioNetDriver;
-#[cfg(any(
-	all(feature = "virtio-net", not(feature = "rtl8139")),
-	feature = "fuse",
-	feature = "vsock",
-	feature = "console",
-))]
+#[cfg(feature = "virtio")]
 use crate::drivers::virtio::transport::pci as pci_virtio;
-#[cfg(any(
-	all(feature = "virtio-net", not(feature = "rtl8139")),
-	feature = "fuse",
-	feature = "vsock",
-	feature = "console",
-))]
+#[cfg(feature = "virtio")]
 use crate::drivers::virtio::transport::pci::VirtioDriver;
 #[cfg(feature = "vsock")]
 use crate::drivers::vsock::VirtioVsockDriver;
@@ -502,12 +492,7 @@ pub(crate) fn init() {
 				adapter.device_id()
 			);
 
-			#[cfg(any(
-				all(feature = "virtio-net", not(feature = "rtl8139")),
-				feature = "fuse",
-				feature = "vsock",
-				feature = "console",
-			))]
+			#[cfg(feature = "virtio")]
 			match pci_virtio::init_device(adapter) {
 				#[cfg(all(not(feature = "rtl8139"), feature = "virtio-net"))]
 				Ok(VirtioDriver::Network(drv)) => *crate::executor::device::NETWORK_DEVICE.lock() = Some(drv),