f7e6c9d33c
- qga-win: Fix guest-get-fsinfo multi-disks collection - hw/timer: fix systick trace message - virtio-net: correctly copy vnet header when flushing TX (CVE-2023-6693) - ui/clipboard: mark type as not available when there is no data (CVE-2023-6683) - esp: restrict non-DMA transfer length to that of available data (CVE-2024-24474) - hw/scsi/lsi53c895a: add missing decrement of reentrancy counter - hw/scsi/lsi53c895a: Fix reentrancy issues in the LSI controller (CVE-2023-0330) - net: Update MemReentrancyGuard for NIC (CVE-2023-3019) - net: Provide MemReentrancyGuard * to qemu_new_nic() Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 18db08e0e64d982b88ad7f29ccd49b19e8c656f0)
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From 81e188ec0547708416c0cfc426ba9ffcd56fcfc2 Mon Sep 17 00:00:00 2001
|
|
From: qihao <qihao_yewu@cmss.chinamobile.com>
|
|
Date: Thu, 8 Feb 2024 11:31:02 +0800
|
|
Subject: [PATCH] hw/timer: fix systick trace message
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
cheery-pick from 7c8faaf2a4fa8ad2d291662ac7e7eeea1fe8d47c
|
|
|
|
Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
|
|
Message-id: 20240109184508.3189599-1-sam@rfc1149.net
|
|
Fixes: ff68dacbc786 ("armv7m: Split systick out from NVIC")
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Signed-off-by: qihao_yewu <qihao_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/timer/trace-events | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/timer/trace-events b/hw/timer/trace-events
|
|
index 3eccef8385..8145e18e3d 100644
|
|
--- a/hw/timer/trace-events
|
|
+++ b/hw/timer/trace-events
|
|
@@ -35,7 +35,7 @@ aspeed_timer_read(uint64_t offset, unsigned size, uint64_t value) "From 0x%" PRI
|
|
|
|
# armv7m_systick.c
|
|
systick_reload(void) "systick reload"
|
|
-systick_timer_tick(void) "systick reload"
|
|
+systick_timer_tick(void) "systick tick"
|
|
systick_read(uint64_t addr, uint32_t value, unsigned size) "systick read addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u"
|
|
systick_write(uint64_t addr, uint32_t value, unsigned size) "systick write addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u"
|
|
|
|
--
|
|
2.27.0
|
|
|