Skip to content

Commit cd94201

Browse files
committed
chore(virtio): better queue panic messages
Add info about queue len and actual size to the message. Signed-off-by: Egor Lazarchuk <[email protected]>
1 parent cb3b00e commit cd94201

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,10 @@ impl Queue {
333333
// We are choosing to interrupt execution since this could be a potential malicious
334334
// driver scenario. This way we also eliminate the risk of repeatedly
335335
// logging and potentially clogging the microVM through the log system.
336-
panic!("The number of available virtio descriptors is greater than queue size!");
336+
panic!(
337+
"The number of available virtio descriptors {len} is greater than queue size: {}!",
338+
self.actual_size()
339+
);
337340
}
338341

339342
if len == 0 {
@@ -514,7 +517,11 @@ impl Queue {
514517
// driver scenario. This way we also eliminate the risk of
515518
// repeatedly logging and potentially clogging the microVM through
516519
// the log system.
517-
panic!("The number of available virtio descriptors is greater than queue size!");
520+
panic!(
521+
"The number of available virtio descriptors {len} is greater than queue size: \
522+
{}!",
523+
self.actual_size()
524+
);
518525
}
519526
return false;
520527
}
@@ -1292,7 +1299,7 @@ mod tests {
12921299

12931300
#[test]
12941301
#[should_panic(
1295-
expected = "The number of available virtio descriptors is greater than queue size!"
1302+
expected = "The number of available virtio descriptors 5 is greater than queue size: 4!"
12961303
)]
12971304
fn test_invalid_avail_idx_no_notification() {
12981305
// This test ensures constructing a descriptor chain succeeds
@@ -1337,7 +1344,7 @@ mod tests {
13371344

13381345
#[test]
13391346
#[should_panic(
1340-
expected = "The number of available virtio descriptors is greater than queue size!"
1347+
expected = "The number of available virtio descriptors 6 is greater than queue size: 4!"
13411348
)]
13421349
fn test_invalid_avail_idx_with_notification() {
13431350
// This test ensures constructing a descriptor chain succeeds

0 commit comments

Comments
 (0)