59 lines
1.9 KiB
Diff
59 lines
1.9 KiB
Diff
|
From eb7f58bd9b45b2e113a66a3694661977541cd266 Mon Sep 17 00:00:00 2001
|
||
|
|
From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Sat, 12 Oct 2024 09:21:03 +0000
|
||
|
|
Subject: [PATCH] hw/usb/hcd-ohci: Use definition to avoid dynamic stack
|
||
|
|
allocation mainline inclusion commit 29d81e429d16fe8f0f1cd99e63507ca53ca1945c
|
||
|
|
category: bugfix
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
---------------------------------------------------------------
|
||
|
|
|
||
|
|
The compiler isn't clever enough to figure 'width' is a constant,
|
||
|
|
so help it by using a definitions instead.
|
||
|
|
|
||
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
||
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
||
|
|
Message-id: 20220819153931.3147384-10-peter.maydell@linaro.org
|
||
|
|
|
||
|
|
Signed-off-by: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
hw/usb/hcd-ohci.c | 7 ++++---
|
||
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c
|
||
|
|
index a93d6b2e98..5e67eb4089 100644
|
||
|
|
--- a/hw/usb/hcd-ohci.c
|
||
|
|
+++ b/hw/usb/hcd-ohci.c
|
||
|
|
@@ -900,13 +900,14 @@ static int ohci_service_iso_td(OHCIState *ohci, struct ohci_ed *ed,
|
||
|
|
return 1;
|
||
|
|
}
|
||
|
|
|
||
|
|
+#define HEX_CHAR_PER_LINE 16
|
||
|
|
+
|
||
|
|
static void ohci_td_pkt(const char *msg, const uint8_t *buf, size_t len)
|
||
|
|
{
|
||
|
|
bool print16;
|
||
|
|
bool printall;
|
||
|
|
- const int width = 16;
|
||
|
|
int i;
|
||
|
|
- char tmp[3 * width + 1];
|
||
|
|
+ char tmp[3 * HEX_CHAR_PER_LINE + 1];
|
||
|
|
char *p = tmp;
|
||
|
|
|
||
|
|
print16 = !!trace_event_get_state_backends(TRACE_USB_OHCI_TD_PKT_SHORT);
|
||
|
|
@@ -917,7 +918,7 @@ static void ohci_td_pkt(const char *msg, const uint8_t *buf, size_t len)
|
||
|
|
}
|
||
|
|
|
||
|
|
for (i = 0; ; i++) {
|
||
|
|
- if (i && (!(i % width) || (i == len))) {
|
||
|
|
+ if (i && (!(i % HEX_CHAR_PER_LINE) || (i == len))) {
|
||
|
|
if (!printall) {
|
||
|
|
trace_usb_ohci_td_pkt_short(msg, tmp);
|
||
|
|
break;
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|