diff options
| author | Peter Maydell | 2021-01-23 15:40:45 +0100 |
|---|---|---|
| committer | Peter Maydell | 2021-01-23 15:40:45 +0100 |
| commit | e93c65a6c64fa18b0c61fb9338d364cbea32b6ef (patch) | |
| tree | 5f1c30bca7461c74fdb80ae941adae550aea8d1b /include | |
| parent | Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-6.0-pull-re... (diff) | |
| parent | usb-host: map LIBUSB_SPEED_SUPER_PLUS to USB_SPEED_SUPER (diff) | |
| download | qemu-e93c65a6c64fa18b0c61fb9338d364cbea32b6ef.tar.gz qemu-e93c65a6c64fa18b0c61fb9338d364cbea32b6ef.tar.xz qemu-e93c65a6c64fa18b0c61fb9338d364cbea32b6ef.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/usb-20210122-pull-request' into staging
usb: cleanups and fixes.
usb: add pcap support.
# gpg: Signature made Fri 22 Jan 2021 17:48:35 GMT
# gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/usb-20210122-pull-request:
usb-host: map LIBUSB_SPEED_SUPER_PLUS to USB_SPEED_SUPER
usb: add pcap support.
hw/usb/dev-uas: Report command additional adb length as unsupported
scsi/utils: Add INVALID_PARAM_VALUE sense code definition
hw/usb/hcd-xhci: Fix extraneous format-truncation error on 32-bit hosts
hw/usb: Convert to qdev_realize()
hw/usb: Fix bad printf format specifiers
hw/usb/host-libusb.c: fix build with kernel < 5.0
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/usb.h | 8 | ||||
| -rw-r--r-- | include/scsi/utils.h | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/hw/usb.h b/include/hw/usb.h index a70a72e917..abfbfc5284 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -231,6 +231,9 @@ struct USBDevice { void *opaque; uint32_t flags; + char *pcap_filename; + FILE *pcap; + /* Actual connected speed */ int speed; /* Supported speeds, not in info because it may be variable (hostdevs) */ @@ -570,4 +573,9 @@ int usb_get_quirks(uint16_t vendor_id, uint16_t product_id, uint8_t interface_class, uint8_t interface_subclass, uint8_t interface_protocol); +/* pcap.c */ +void usb_pcap_init(FILE *fp); +void usb_pcap_ctrl(USBPacket *p, bool setup); +void usb_pcap_data(USBPacket *p, bool setup); + #endif diff --git a/include/scsi/utils.h b/include/scsi/utils.h index fbc5588279..096489c6cd 100644 --- a/include/scsi/utils.h +++ b/include/scsi/utils.h @@ -57,6 +57,8 @@ extern const struct SCSISense sense_code_LBA_OUT_OF_RANGE; extern const struct SCSISense sense_code_INVALID_FIELD; /* Illegal request, Invalid field in parameter list */ extern const struct SCSISense sense_code_INVALID_PARAM; +/* Illegal request, Invalid value in parameter list */ +extern const struct SCSISense sense_code_INVALID_PARAM_VALUE; /* Illegal request, Parameter list length error */ extern const struct SCSISense sense_code_INVALID_PARAM_LEN; /* Illegal request, LUN not supported */ |