ab7fc8ee5b
- target/i386: Introduce SapphireRapids-v3 to add missing features - qtest/fuzz-lsi53c895a-test: set guest RAM to 2G - hw/net/lan9118: Signal TSFL_INT flag when TX FIFO reaches specified level - target/arm: Fix alignment for VLD4.32 - hw/microblaze: pass random seed to fdt - tests/qtest: npcm7xx-emc-test: Skip checking MAC - tests: mark io-command test as skipped if socat is missing - tests: unit: add NULL-pointer check - tests: test-qga: close socket on failure to connect - vdpa:block device capacity expansion online support vdpa block device update capacity. - virtio-net: Ensure queue index fits with RSS(CVE-2024-6505) - nbd/server: CVE-2024-7409: Avoid use-after-free when closing server - ppc/vof: Fix unaligned FDT property access - vvfat: Fix reading files with non-continuous clusters - vvfat: Fix bug in writing to middle of file - savevm: Fix load_snapshot error path crash - hw/dma/xilinx_axidma: Use semicolon at end of statement, not comma - hw/remote/message.c: Don't directly invoke DeviceClass:reset - crypto/tlscredspsk: Free username on finalize - hw/display/vhost-user-gpu.c: fix vhost_user_gpu_chr_read() - virtio: remove virtio_tswap16s() call in vring_packed_event_read() - char-stdio: Restore blocking mode of stdout on exit - hw/ppc: spapr: Use qemu_vfree() to free spapr->htab - smbios: sanitize type from external type before checking have_fields_bitmap - spapr_pci: fix leak in spapr_phb_vfio_get_loc_code - KVM: use store-release to mark dirty pages as harvested - monitor/hmp: print trace as option in help for log command - tpm_crb: Avoid backend startup just before shutdown under Xen - crypto/block-luks: make range overlap check more readable - spapr: Free stdout path - target/rx: Use target_ulong for address in LI - virtio-pci: Fix the use of an uninitialized irqfd - rtl8139: Fix behaviour for old kernels. - virtio-rng: block max-bytes=0 MIME-Version: 1.0 - hw/audio/es1370: Clean up comment - vhost-user-server: do not set memory fd non-blocking - ui: reject extended clipboard message if not activated - virtio-net: Fix vhost virtqueue notifiers for RSS - hw/misc/applesmc: Fix memory leak in reset() handler Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit db7a5d9a7239db307c8c1454fab5f8a92fd486b8)
61 lines
2.2 KiB
Diff
61 lines
2.2 KiB
Diff
From 0807b94d2cb88f1253d90f649604f0110b33f9b4 Mon Sep 17 00:00:00 2001
|
|
From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
Date: Tue, 3 Sep 2024 02:12:05 +0000
|
|
Subject: [PATCH] monitor/hmp: print trace as option in help for log command
|
|
mainline inclusion commit 3183bb3f441ba5b9da570f7f5f9abdc3313ba311 category:
|
|
bugfix
|
|
|
|
---------------------------------------------------------------
|
|
|
|
The below is printed when printing help information in qemu-system-x86_64
|
|
command line, and when CONFIG_TRACE_LOG is enabled:
|
|
|
|
----------------------------
|
|
$ qemu-system-x86_64 -d help
|
|
... ...
|
|
trace:PATTERN enable trace events
|
|
|
|
Use "-d trace:help" to get a list of trace events.
|
|
----------------------------
|
|
|
|
However, the options of "trace:PATTERN" are only printed by
|
|
"qemu-system-x86_64 -d help", but missing in hmp "help log" command.
|
|
|
|
Fixes: c84ea00dc2 ("log: add "-d trace:PATTERN"")
|
|
Cc: Joe Jin <joe.jin@oracle.com>
|
|
Signed-off-by: Dongli Zhang <dongli.zhang@oracle.com>
|
|
Message-Id: <20220831213943.8155-1-dongli.zhang@oracle.com>
|
|
Reviewed-by: Markus Armbruster <armbru@redhat.com>
|
|
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
|
Signed-off-by: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
---
|
|
monitor/hmp.c | 9 +++++++--
|
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/monitor/hmp.c b/monitor/hmp.c
|
|
index b20737e63c..9cbbe52812 100644
|
|
--- a/monitor/hmp.c
|
|
+++ b/monitor/hmp.c
|
|
@@ -285,10 +285,15 @@ void help_cmd(Monitor *mon, const char *name)
|
|
if (!strcmp(name, "log")) {
|
|
const QEMULogItem *item;
|
|
monitor_printf(mon, "Log items (comma separated):\n");
|
|
- monitor_printf(mon, "%-10s %s\n", "none", "remove all logs");
|
|
+ monitor_printf(mon, "%-15s %s\n", "none", "remove all logs");
|
|
for (item = qemu_log_items; item->mask != 0; item++) {
|
|
- monitor_printf(mon, "%-10s %s\n", item->name, item->help);
|
|
+ monitor_printf(mon, "%-15s %s\n", item->name, item->help);
|
|
}
|
|
+#ifdef CONFIG_TRACE_LOG
|
|
+ monitor_printf(mon, "trace:PATTERN enable trace events\n");
|
|
+ monitor_printf(mon, "\nUse \"log trace:help\" to get a list of "
|
|
+ "trace events.\n\n");
|
|
+#endif
|
|
return;
|
|
}
|
|
|
|
--
|
|
2.41.0.windows.1
|
|
|