Skip to content

Commit 996a9ea

Browse files
andreeaflorescuacatangiu
authored andcommitted
devices: code cleanup
* Removed unused functions * Moved test code to `tests` module * Removed unnecessary pub Signed-off-by: Andreea Florescu <[email protected]>
1 parent ae72b01 commit 996a9ea

File tree

1 file changed

+15
-16
lines changed

1 file changed

+15
-16
lines changed

devices/src/virtio/block.rs

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ impl Request {
237237
}
238238
}
239239

240-
pub struct BlockEpollHandler {
240+
struct BlockEpollHandler {
241241
queues: Vec<Queue>,
242242
mem: GuestMemory,
243243
disk_image: File,
@@ -333,21 +333,6 @@ impl BlockEpollHandler {
333333
}
334334
}
335335

336-
#[cfg(test)]
337-
fn set_queue(&mut self, idx: usize, q: Queue) {
338-
self.queues[idx] = q;
339-
}
340-
341-
#[cfg(test)]
342-
fn get_rate_limiter(&self) -> &RateLimiter {
343-
&self.rate_limiter
344-
}
345-
346-
#[cfg(test)]
347-
fn set_rate_limiter(&mut self, rate_limiter: RateLimiter) {
348-
self.rate_limiter = rate_limiter;
349-
}
350-
351336
fn update_disk_image(&mut self, disk_image: File) {
352337
self.disk_image = disk_image;
353338
self.disk_image_id = build_disk_image_id(&self.disk_image);
@@ -641,6 +626,20 @@ mod tests {
641626
}};
642627
}
643628

629+
impl BlockEpollHandler {
630+
fn set_queue(&mut self, idx: usize, q: Queue) {
631+
self.queues[idx] = q;
632+
}
633+
634+
fn get_rate_limiter(&self) -> &RateLimiter {
635+
&self.rate_limiter
636+
}
637+
638+
fn set_rate_limiter(&mut self, rate_limiter: RateLimiter) {
639+
self.rate_limiter = rate_limiter;
640+
}
641+
}
642+
644643
struct DummyBlock {
645644
block: Block,
646645
epoll_raw_fd: i32,

0 commit comments

Comments
 (0)