Skip to content

Commit 5c8866b

Browse files
ShadowCurseManciukic
authored andcommitted
refactor: remove get_max_size from Queue
The `max_size` field is public, so no need for a getter. Signed-off-by: Egor Lazarchuk <[email protected]>
1 parent d5f3513 commit 5c8866b

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed

src/vmm/src/devices/virtio/mmio.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ impl MmioTransport {
157157
// eventfds, but nothing will happen other than supurious wakeups.
158158
// . Do not reset config_generation and keep it monotonically increasing
159159
for queue in self.locked_device().queues_mut() {
160-
*queue = Queue::new(queue.get_max_size());
160+
*queue = Queue::new(queue.max_size);
161161
}
162162
}
163163

@@ -253,7 +253,7 @@ impl MmioTransport {
253253
}
254254
features
255255
}
256-
0x34 => self.with_queue(0, |q| u32::from(q.get_max_size())),
256+
0x34 => self.with_queue(0, |q| u32::from(q.max_size)),
257257
0x44 => self.with_queue(0, |q| u32::from(q.ready)),
258258
0x60 => {
259259
// For vhost-user backed devices we need some additional
@@ -489,17 +489,17 @@ pub(crate) mod tests {
489489
assert!(!d.are_queues_valid());
490490

491491
d.queue_select = 0;
492-
assert_eq!(d.with_queue(0, Queue::get_max_size), 16);
492+
assert_eq!(d.with_queue(0, |q| q.max_size), 16);
493493
assert!(d.with_queue_mut(|q| q.size = 16));
494494
assert_eq!(d.locked_device().queues()[d.queue_select as usize].size, 16);
495495

496496
d.queue_select = 1;
497-
assert_eq!(d.with_queue(0, Queue::get_max_size), 32);
497+
assert_eq!(d.with_queue(0, |q| q.max_size), 32);
498498
assert!(d.with_queue_mut(|q| q.size = 16));
499499
assert_eq!(d.locked_device().queues()[d.queue_select as usize].size, 16);
500500

501501
d.queue_select = 2;
502-
assert_eq!(d.with_queue(0, Queue::get_max_size), 0);
502+
assert_eq!(d.with_queue(0, |q| q.max_size), 0);
503503
assert!(!d.with_queue_mut(|q| q.size = 16));
504504

505505
assert!(!d.are_queues_valid());

src/vmm/src/devices/virtio/queue.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -462,11 +462,6 @@ impl Queue {
462462
}
463463
}
464464

465-
/// Maximum size of the queue.
466-
pub fn get_max_size(&self) -> u16 {
467-
self.max_size
468-
}
469-
470465
/// Return the actual size of the queue, as the driver may not set up a
471466
/// queue as big as the device allows.
472467
pub fn actual_size(&self) -> u16 {
@@ -1131,7 +1126,7 @@ mod verification {
11311126
fn verify_actual_size() {
11321127
let ProofContext(queue, _) = kani::any();
11331128

1134-
assert!(queue.actual_size() <= queue.get_max_size());
1129+
assert!(queue.actual_size() <= queue.max_size);
11351130
assert!(queue.actual_size() <= queue.size);
11361131
}
11371132

src/vmm/src/devices/virtio/vhost_user.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ impl<T: VhostUserHandleBackend> VhostUserHandleImpl<T> {
416416

417417
for (queue_index, queue, queue_evt) in queues.iter() {
418418
let config_data = VringConfigData {
419-
queue_max_size: queue.get_max_size(),
419+
queue_max_size: queue.max_size,
420420
queue_size: queue.actual_size(),
421421
flags: 0u32,
422422
desc_table_addr: mem

0 commit comments

Comments
 (0)