diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-03-12 19:40:43 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-03-12 19:40:44 +0000 |
| commit | 1396156f50ddcfffc0e3127a005b3cdcf6fcee60 (patch) | |
| tree | 4c81243662cc0872c67e689c4e05a456770f8f66 | |
| parent | fb5fff15881ba7a002924b967eb211c002897983 (diff) | |
| parent | c7ac1ab0201d47d12b75e1c98d79869bcdad5732 (diff) | |
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: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/usb/redirect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index ec174309db..65a9196c1a 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -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; |