b239b0b2d5
- sw_64: Added sw64 architecture related updates - virtio-crypto: verify src&dst buffer length for sym request - vhost-vdpa: do not cleanup the vdpa/vhost-net structures if peer nic is present - qga: Fix suspend on Linux guests without systemd - tests: vhost-user-test: release mutex on protocol violation - qapi: support updating expected test output via make - block: Fix misleading hexadecimal format - block/rbd: fix write zeroes with growing images - block/nbd.c: Fixed IO request coroutine not being wakeup when kill NBD server - block/nfs: Fix 32-bit Windows build - qapi/qdev: Tidy up device_add documentation - hw/xen/xen_pt: fix uninitialized variable - migration/ram: Fix error handling in ram_write_tracking_start() - docs/about/build-platforms: Refine the distro support policy - xen-block: Avoid leaks on new error path - QGA VSS: Add wrapper to send log to debugger and stderr - chardev/char-socket: set s->listener = NULL in char_socket_finalize - qapi/block: Tidy up block-latency-histogram-set documentation - disas/riscv Fix ctzw disassemble - vfio: Fix vfio_get_dev_region() trace event - migration/ram: Fix populate_read_range() - Check and report for incomplete 'global' option format Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
From e2ceb2def76cc917d3165a804025e630c3bedad1 Mon Sep 17 00:00:00 2001
|
|
From: xiaowanghe <xiaowanghe_yewu@cmss.chinamobile.com>
|
|
Date: Wed, 2 Aug 2023 19:08:05 -0700
|
|
Subject: [PATCH] vfio: Fix vfio_get_dev_region() trace event
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
cherry picked from commit 969dae5448eaa2914be5b974f9e0311b3f95ee2c
|
|
|
|
Simply transpose 'x8' to fix the typo and remove the ending '8'
|
|
|
|
Fixes: e61a424f05 ("vfio: Create device specific region info helper")
|
|
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1526
|
|
Signed-off-by: Cédric Le Goater <clg@redhat.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
Link: https://lore.kernel.org/r/20230303074330.2609377-1-clg@kaod.org
|
|
[aw: commit log s/revert/transpose/]
|
|
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
|
|
|
|
Signed-off-by: Wanghe Xiao <xiaowanghe_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/vfio/trace-events | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events
|
|
index 0ef1b5f4a6..f4b74a3e81 100644
|
|
--- a/hw/vfio/trace-events
|
|
+++ b/hw/vfio/trace-events
|
|
@@ -116,7 +116,7 @@ vfio_region_mmaps_set_enabled(const char *name, bool enabled) "Region %s mmaps e
|
|
vfio_region_unmap(const char *name, unsigned long offset, unsigned long end) "Region %s unmap [0x%lx - 0x%lx]"
|
|
vfio_region_sparse_mmap_header(const char *name, int index, int nr_areas) "Device %s region %d: %d sparse mmap entries"
|
|
vfio_region_sparse_mmap_entry(int i, unsigned long start, unsigned long end) "sparse entry %d [0x%lx - 0x%lx]"
|
|
-vfio_get_dev_region(const char *name, int index, uint32_t type, uint32_t subtype) "%s index %d, %08x/%0x8"
|
|
+vfio_get_dev_region(const char *name, int index, uint32_t type, uint32_t subtype) "%s index %d, %08x/%08x"
|
|
vfio_dma_unmap_overflow_workaround(void) ""
|
|
|
|
# platform.c
|
|
--
|
|
2.41.0.windows.1
|
|
|