From 51d4e4228d14927679b0b8c210156c04cb9dd6c7 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 5 Nov 2020 14:41:08 +0100 Subject: [PATCH] usb-storage: add commandlog property MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Add property so scsi command logging can be switched at runtime instead of compile time. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daudé Message-id: 20201105134112.25119-3-kraxel@redhat.com --- hw/usb/dev-storage.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index e317cde8fd..d5cc613744 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -25,8 +25,6 @@ #include "qom/object.h" #include "trace.h" -//#define DEBUG_MSD - /* USB requests. */ #define MassStorageReset 0xff #define GetMaxLun 0xfe @@ -59,6 +57,7 @@ struct MSDState { /* usb-storage only */ BlockConf conf; uint32_t removable; + bool commandlog; SCSIDevice *scsi_dev; }; typedef struct MSDState MSDState; @@ -451,9 +450,9 @@ static void usb_msd_handle_data(USBDevice *dev, USBPacket *p) assert(le32_to_cpu(s->csw.residue) == 0); s->scsi_len = 0; s->req = scsi_req_new(scsi_dev, tag, cbw.lun, cbw.cmd, NULL); -#ifdef DEBUG_MSD - scsi_req_print(s->req); -#endif + if (s->commandlog) { + scsi_req_print(s->req); + } len = scsi_req_enqueue(s->req); if (len) { scsi_req_continue(s->req); @@ -684,6 +683,7 @@ static Property msd_properties[] = { DEFINE_BLOCK_PROPERTIES(MSDState, conf), DEFINE_BLOCK_ERROR_PROPERTIES(MSDState, conf), DEFINE_PROP_BIT("removable", MSDState, removable, 0, false), + DEFINE_PROP_BOOL("commandlog", MSDState, commandlog, false), DEFINE_PROP_END_OF_LIST(), }; -- 2.11.0