Commit 1396156f authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180312-pull-request' into staging 



usbredir: reorder fields in USBRedirDevice to reduce padding

# gpg: Signature made Mon 12 Mar 2018 11:05:19 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/usb-20180312-pull-request:
  usbredir: reorder fields in USBRedirDevice to reduce padding

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents fb5fff15 c7ac1ab0

hw/usb/redirect.c

+2 −2
Original line number Diff line number Diff line
@@ -106,10 +106,10 @@ struct USBRedirDevice { 
    USBDevice dev;

    /* Properties */

    CharBackend cs;

    bool enable_streams;

    uint8_t debug;

    char *filter_str;

    int32_t bootindex;

    bool enable_streams;

    char *filter_str;

    /* Data passed from chardev the fd_read cb to the usbredirparser read cb */

    const uint8_t *read_buf;

    int read_buf_size;