diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2020-03-05 13:45:22 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-03-16 23:02:25 +0100 |
| commit | 092b6d1e885c27222a3ff929c56cb71d3f5df8ab (patch) | |
| tree | 90edc87e085f5498203a1c1adf5becf94ce6561e /hw/usb/quirks.c | |
| parent | a9d8ba2be58e067bdfbff830eb9ff438d8db7f10 (diff) | |
| download | focaccia-qemu-092b6d1e885c27222a3ff929c56cb71d3f5df8ab.tar.gz focaccia-qemu-092b6d1e885c27222a3ff929c56cb71d3f5df8ab.zip | |
hw/usb/quirks: Use smaller types to reduce .rodata by 10KiB
The USB descriptor sizes are specified as 16-bit for idVendor / idProduct, and 8-bit for bInterfaceClass / bInterfaceSubClass / bInterfaceProtocol. Doing so we reduce the usbredir_raw_serial_ids[] and usbredir_ftdi_serial_ids[] arrays from 16KiB to 6KiB (size reported on x86_64 host, building with --extra-cflags=-Os). Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/usb/quirks.c')
| -rw-r--r-- | hw/usb/quirks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/usb/quirks.c b/hw/usb/quirks.c index 38a9c5634a..23ea7a23ea 100644 --- a/hw/usb/quirks.c +++ b/hw/usb/quirks.c @@ -22,10 +22,10 @@ static bool usb_id_match(const struct usb_device_id *ids, uint8_t interface_protocol) { int i; - for (i = 0; ids[i].vendor_id != -1; i++) { + for (i = 0; ids[i].terminating_entry == 0; i++) { if (ids[i].vendor_id == vendor_id && ids[i].product_id == product_id && - (ids[i].interface_class == -1 || + (ids[i].interface_protocol_used == 0 || (ids[i].interface_class == interface_class && ids[i].interface_subclass == interface_subclass && ids[i].interface_protocol == interface_protocol))) { |