aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2020-11-05 14:41:08 +0100
committerGerd Hoffmann <kraxel@redhat.com>2020-11-16 09:11:21 +0100
commit51d4e4228d14927679b0b8c210156c04cb9dd6c7 (patch)
treeccf990318511691b0a0897411df9bb6bd00269dd
parentd0ccb3922d952063655f653c932e737fed902b16 (diff)
usb-storage: add commandlog property
Add property so scsi command logging can be switched at runtime instead of compile time. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-id: 20201105134112.25119-3-kraxel@redhat.com
-rw-r--r--hw/usb/dev-storage.c10
1 files 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(),
};