diff --git a/staging/vhost-device-video/src/vhu_video.rs b/staging/vhost-device-video/src/vhu_video.rs index 15123e5..f98f8d2 100644 --- a/staging/vhost-device-video/src/vhu_video.rs +++ b/staging/vhost-device-video/src/vhu_video.rs @@ -127,8 +127,8 @@ unsafe impl ByteValued for VirtioVideoConfig {} pub(crate) struct VuVideoBackend { config: VirtioVideoConfig, pub threads: Vec>, - pub exit_consumer: EventConsumer, - pub exit_notifier: EventNotifier, + exit_consumer: EventConsumer, + exit_notifier: EventNotifier, } impl VuVideoBackend { diff --git a/vhost-device-console/src/vhu_console.rs b/vhost-device-console/src/vhu_console.rs index 3fb311b..9ad3c73 100644 --- a/vhost-device-console/src/vhu_console.rs +++ b/vhost-device-console/src/vhu_console.rs @@ -141,8 +141,8 @@ pub struct VhostUserConsoleBackend { pub stream: Option>, pub rx_event: EventFd, pub rx_ctrl_event: EventFd, - pub exit_consumer: EventConsumer, - pub exit_notifier: EventNotifier, + exit_consumer: EventConsumer, + exit_notifier: EventNotifier, mem: Option>, } diff --git a/vhost-device-gpio/src/vhu_gpio.rs b/vhost-device-gpio/src/vhu_gpio.rs index dc40e6f..f115098 100644 --- a/vhost-device-gpio/src/vhu_gpio.rs +++ b/vhost-device-gpio/src/vhu_gpio.rs @@ -160,8 +160,8 @@ pub(crate) struct VhostUserGpioBackend { controller: Arc>, handles: Arc>>>>, event_idx: bool, - pub(crate) exit_consumer: EventConsumer, - pub(crate) exit_notifier: EventNotifier, + exit_consumer: EventConsumer, + exit_notifier: EventNotifier, mem: Option>, } diff --git a/vhost-device-gpu/src/device.rs b/vhost-device-gpu/src/device.rs index c870e8f..fd67fed 100644 --- a/vhost-device-gpu/src/device.rs +++ b/vhost-device-gpu/src/device.rs @@ -141,8 +141,8 @@ struct VhostUserGpuBackendInner { virtio_cfg: VirtioGpuConfig, event_idx_enabled: bool, gpu_backend: Option, - pub exit_consumer: EventConsumer, - pub exit_notifier: EventNotifier, + exit_consumer: EventConsumer, + exit_notifier: EventNotifier, mem: Option>, gpu_config: GpuConfig, } diff --git a/vhost-device-i2c/src/vhu_i2c.rs b/vhost-device-i2c/src/vhu_i2c.rs index 4089ace..df04462 100644 --- a/vhost-device-i2c/src/vhu_i2c.rs +++ b/vhost-device-i2c/src/vhu_i2c.rs @@ -105,8 +105,8 @@ unsafe impl ByteValued for VirtioI2cInHdr {} pub(crate) struct VhostUserI2cBackend { i2c_map: Arc>, event_idx: bool, - pub exit_consumer: EventConsumer, - pub exit_notifier: EventNotifier, + exit_consumer: EventConsumer, + exit_notifier: EventNotifier, mem: Option>, } diff --git a/vhost-device-input/src/vhu_input.rs b/vhost-device-input/src/vhu_input.rs index 115acbf..981f58f 100644 --- a/vhost-device-input/src/vhu_input.rs +++ b/vhost-device-input/src/vhu_input.rs @@ -124,8 +124,8 @@ impl From for io::Error { pub(crate) struct VuInputBackend { event_idx: bool, ev_dev: T, - pub exit_consumer: EventConsumer, - pub exit_notifier: EventNotifier, + exit_consumer: EventConsumer, + exit_notifier: EventNotifier, select: u8, subsel: u8, mem: Option>, diff --git a/vhost-device-rng/src/vhu_rng.rs b/vhost-device-rng/src/vhu_rng.rs index 63b87c4..dd40df7 100644 --- a/vhost-device-rng/src/vhu_rng.rs +++ b/vhost-device-rng/src/vhu_rng.rs @@ -90,8 +90,8 @@ pub(crate) struct VuRngBackend { event_idx: bool, timer: VuRngTimerConfig, rng_source: Arc>, - pub exit_consumer: EventConsumer, - pub exit_notifier: EventNotifier, + exit_consumer: EventConsumer, + exit_notifier: EventNotifier, mem: Option>, } diff --git a/vhost-device-scmi/src/vhu_scmi.rs b/vhost-device-scmi/src/vhu_scmi.rs index 97cf539..8bf0764 100644 --- a/vhost-device-scmi/src/vhu_scmi.rs +++ b/vhost-device-scmi/src/vhu_scmi.rs @@ -96,8 +96,8 @@ type ScmiDescriptorChain = DescriptorChain>, /// Event vring and descriptors serve for asynchronous responses and /// notifications. They are obtained from the driver and we store them diff --git a/vhost-device-scsi/src/vhu_scsi.rs b/vhost-device-scsi/src/vhu_scsi.rs index 57a8baf..fd24387 100644 --- a/vhost-device-scsi/src/vhu_scsi.rs +++ b/vhost-device-scsi/src/vhu_scsi.rs @@ -39,8 +39,8 @@ pub struct VhostUserScsiBackend { event_idx: bool, mem: Option>, targets: Vec>, - pub exit_consumer: EventConsumer, - pub exit_notifier: EventNotifier, + exit_consumer: EventConsumer, + exit_notifier: EventNotifier, } impl Default for VhostUserScsiBackend { diff --git a/vhost-device-sound/src/device.rs b/vhost-device-sound/src/device.rs index 0ee7adf..8d06c93 100644 --- a/vhost-device-sound/src/device.rs +++ b/vhost-device-sound/src/device.rs @@ -486,8 +486,8 @@ impl VhostUserSoundThread { pub struct VhostUserSoundBackend { pub threads: Vec>, virtio_cfg: VirtioSoundConfig, - pub exit_consumer: EventConsumer, - pub exit_notifier: EventNotifier, + exit_consumer: EventConsumer, + exit_notifier: EventNotifier, audio_backend: RwLock>, } diff --git a/vhost-device-spi/src/vhu_spi.rs b/vhost-device-spi/src/vhu_spi.rs index fc14dc8..e855de4 100644 --- a/vhost-device-spi/src/vhu_spi.rs +++ b/vhost-device-spi/src/vhu_spi.rs @@ -137,8 +137,8 @@ unsafe impl ByteValued for VirtioSpiConfig {} pub(crate) struct VhostUserSpiBackend { spi_ctrl: Arc>, event_idx: bool, - pub exit_consumer: EventConsumer, - pub exit_notifier: EventNotifier, + exit_consumer: EventConsumer, + exit_notifier: EventNotifier, mem: Option>, } diff --git a/vhost-device-template/src/backend.rs b/vhost-device-template/src/backend.rs index a6ea331..2947b42 100644 --- a/vhost-device-template/src/backend.rs +++ b/vhost-device-template/src/backend.rs @@ -53,8 +53,8 @@ impl From for std::io::Error { pub struct VhostUserFooBackend { info: FooInfo, event_idx: bool, - pub exit_consumer: EventConsumer, - pub exit_notifier: EventNotifier, + exit_consumer: EventConsumer, + exit_notifier: EventNotifier, mem: Option>, } diff --git a/vhost-device-vsock/src/vhu_vsock.rs b/vhost-device-vsock/src/vhu_vsock.rs index abe651b..d5d236d 100644 --- a/vhost-device-vsock/src/vhu_vsock.rs +++ b/vhost-device-vsock/src/vhu_vsock.rs @@ -259,8 +259,8 @@ pub(crate) struct VhostUserVsockBackend { queue_size: usize, pub threads: Vec>, queues_per_thread: Vec, - pub exit_consumer: EventConsumer, - pub exit_notifier: EventNotifier, + exit_consumer: EventConsumer, + exit_notifier: EventNotifier, } impl VhostUserVsockBackend {