diff options
| author | David Tolnay <dtolnay@chromium.org> | 2019-03-12 12:10:03 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-16 01:53:41 -0700 |
| commit | c249a9fb84a600ebb4f8adace86952307b55ea58 (patch) | |
| tree | 4b3eb09800ad9aa2b3a5c81b57cb4bd24795ed9e /devices | |
| parent | 608938818be555b51695972a78fc3bbe9c64c850 (diff) | |
| download | crosvm-c249a9fb84a600ebb4f8adace86952307b55ea58.tar crosvm-c249a9fb84a600ebb4f8adace86952307b55ea58.tar.gz crosvm-c249a9fb84a600ebb4f8adace86952307b55ea58.tar.bz2 crosvm-c249a9fb84a600ebb4f8adace86952307b55ea58.tar.lz crosvm-c249a9fb84a600ebb4f8adace86952307b55ea58.tar.xz crosvm-c249a9fb84a600ebb4f8adace86952307b55ea58.tar.zst crosvm-c249a9fb84a600ebb4f8adace86952307b55ea58.zip | |
usb: Verify usb_debug args even when not logging
Implementing this macro by ignoring the args and expanding to nothing
makes it possible to pass invalid args like `usb_debug!("{}")`. Use `if
false` instead to ensure that the args are valid formatter args.
As part of this, fix a call to a non-existent function inside one of the
usb_debug invocations.
TEST=cargo check devices
Change-Id: Id82dad7b021060dce7b4d3b828bbd21aaa6ef410
Reviewed-on: https://chromium-review.googlesource.com/1518730
Commit-Ready: David Tolnay <dtolnay@chromium.org>
Tested-by: David Tolnay <dtolnay@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jingkui Wang <jkwang@google.com>
Diffstat (limited to 'devices')
| -rw-r--r-- | devices/src/usb/log.rs | 6 | ||||
| -rw-r--r-- | devices/src/usb/xhci/event_ring.rs | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/devices/src/usb/log.rs b/devices/src/usb/log.rs index 080457c..b8fea64 100644 --- a/devices/src/usb/log.rs +++ b/devices/src/usb/log.rs @@ -6,7 +6,9 @@ #[macro_export] macro_rules! usb_debug { ($($args:tt)+) => { - // Uncomment the following line to enable logging. - // debug!($($args)*) + // Set true to enable logging. + if false { + debug!($($args)*); + } }; } diff --git a/devices/src/usb/xhci/event_ring.rs b/devices/src/usb/xhci/event_ring.rs index 836650f..b2c51d1 100644 --- a/devices/src/usb/xhci/event_ring.rs +++ b/devices/src/usb/xhci/event_ring.rs @@ -108,7 +108,7 @@ impl EventRing { "event write to pointer {:#x}, trb_count {}, {}", self.enqueue_pointer.0, self.trb_count, - trb.debug_str() + trb ); self.enqueue_pointer = match self.enqueue_pointer.checked_add(size_of::<Trb>() as u64) { Some(addr) => addr, |