ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Gerd Hoffmann 2020-11-05 14:41:08 +01:00
parent d0ccb3922d
commit 51d4e4228d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/usb/dev-storage.c
View File

@ -25,8 +25,6 @@
#include "qom/object.h" #include "qom/object.h"
#include "trace.h" #include "trace.h"
//#define DEBUG_MSD
/* USB requests. */ /* USB requests. */
#define MassStorageReset 0xff #define MassStorageReset 0xff
#define GetMaxLun 0xfe #define GetMaxLun 0xfe
@ -59,6 +57,7 @@ struct MSDState {
/* usb-storage only */ /* usb-storage only */
BlockConf conf; BlockConf conf;
uint32_t removable; uint32_t removable;
bool commandlog;
SCSIDevice *scsi_dev; SCSIDevice *scsi_dev;
}; };
typedef struct MSDState MSDState; 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); assert(le32_to_cpu(s->csw.residue) == 0);
s->scsi_len = 0; s->scsi_len = 0;
s->req = scsi_req_new(scsi_dev, tag, cbw.lun, cbw.cmd, NULL); s->req = scsi_req_new(scsi_dev, tag, cbw.lun, cbw.cmd, NULL);
#ifdef DEBUG_MSD if (s->commandlog) {
scsi_req_print(s->req); scsi_req_print(s->req);
#endif }
len = scsi_req_enqueue(s->req); len = scsi_req_enqueue(s->req);
if (len) { if (len) {
scsi_req_continue(s->req); scsi_req_continue(s->req);
@ -684,6 +683,7 @@ static Property msd_properties[] = {
DEFINE_BLOCK_PROPERTIES(MSDState, conf), DEFINE_BLOCK_PROPERTIES(MSDState, conf),
DEFINE_BLOCK_ERROR_PROPERTIES(MSDState, conf), DEFINE_BLOCK_ERROR_PROPERTIES(MSDState, conf),
DEFINE_PROP_BIT("removable", MSDState, removable, 0, false), DEFINE_PROP_BIT("removable", MSDState, removable, 0, false),
DEFINE_PROP_BOOL("commandlog", MSDState, commandlog, false),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };