Dario Faggioli
3206ea7c01
- Revert to revision 715. We're fixing bug 1199924, before moving to QEMU 7.0 OBS-URL: https://build.opensuse.org/request/show/979479 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=718
42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
From: Bruce Rogers <brogers@suse.com>
|
|
Date: Thu, 3 Dec 2020 16:48:13 -0700
|
|
Subject: usb: Help compiler out to avoid a warning on x86 compilation
|
|
|
|
Include-If: %ifarch %arm %ix86 ppc
|
|
|
|
There is an assert present which already should give the compiler
|
|
enough information about the value of i as used in the snprintf,
|
|
but if I remember right, for x86, because memory is tighter some of
|
|
the compiler smarts are turned off, so we get the uninformed warning
|
|
there and not on other archs. So on x86 only we'll add some code to
|
|
help the compiler out, so we can again compile qemu with
|
|
--enable-werror.
|
|
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
hw/usb/hcd-xhci.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
|
|
index e01700039b13d1404d3dc66eb3d3..395f0923f7633c03f2359d503fbd 100644
|
|
--- a/hw/usb/hcd-xhci.c
|
|
+++ b/hw/usb/hcd-xhci.c
|
|
@@ -3310,7 +3310,7 @@ static void usb_xhci_init(XHCIState *xhci)
|
|
USB_SPEED_MASK_FULL |
|
|
USB_SPEED_MASK_HIGH;
|
|
assert(i < XHCI_MAXPORTS);
|
|
- snprintf(port->name, sizeof(port->name), "usb2 port #%d", i+1);
|
|
+ snprintf(port->name, sizeof(port->name), "usb2 port #%d", i+1 < XHCI_MAXPORTS ? i+1 : 0);
|
|
speedmask |= port->speedmask;
|
|
}
|
|
if (i < xhci->numports_3) {
|
|
@@ -3324,7 +3324,7 @@ static void usb_xhci_init(XHCIState *xhci)
|
|
port->uport = &xhci->uports[i];
|
|
port->speedmask = USB_SPEED_MASK_SUPER;
|
|
assert(i < XHCI_MAXPORTS);
|
|
- snprintf(port->name, sizeof(port->name), "usb3 port #%d", i+1);
|
|
+ snprintf(port->name, sizeof(port->name), "usb3 port #%d", i+1 < XHCI_MAXPORTS ? i+1 : 0);
|
|
speedmask |= port->speedmask;
|
|
}
|
|
usb_register_port(&xhci->bus, &xhci->uports[i], xhci, i,
|