7bb77ea74f
- Introduce the SM4 cipher algorithms (OSCCA GB/T 32907-2016).
- intel_iommu: Add missed sanity check for 256-bit invalidation queue
- linux-user: use 'max' instead of 'qemu32' / 'qemu64' by default
- chardev/baum: Use definitions to avoid dynamic stack allocation
- ui/console: Get tab completion working again in the SDL monitor vc
- s390x/tcg: Fix opcode for lzrf
- virtiofsd: use g_date_time_get_microsecond to get subsecond
- ui/curses: Avoid dynamic stack allocation
- target/m68k: always call gen_exit_tb() after writes to SR
- target/m68k: Perform writback before modifying SR
- target/m68k: Fix MACSR to CCR
- target/m68k: Implement atomic test-and-set
- block/nvme: nvme_process_completion() fix bound for cid
- hw/pci-host: pnv_phb{3, 4}: Fix heap out-of-bound access failure
- target/ppc: Zero second doubleword of VSR registers for FPR insns
- target/ppc: Set OV32 when OV is set
- target/ppc: Zero second doubleword for VSX madd instructions
- target/ppc: Set result to QNaN for DENBCD when VXCVI occurs
- hw/pci: Add parenthesis to PCI_BUILD_BDF macro
- intel_iommu: Send IQE event when setting reserved bit in IQT_TAIL
- acpi: cpuhp: fix guest-visible maximum access size to the legacy reg block
- acpi: ged: Add macro for acpi sleep control register
- hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge
- ui/vnc: fix handling of VNC_FEATURE_XVP
- s390/sclp: fix SCLP facility map
- docs/tools/qemu-img.rst: fix typo (sumarizes)
- chardev/char: fix qemu_chr_is_busy() check
- edu: fix DMA range upper bound check
- platform-bus: fix refcount leak
- hw/net/virtio-net: fix qemu set used ring flag even vhost started
- hw/net/can/sja1000: fix bug for single acceptance filter and standard frame
- tests/avocado: fix typo in replay_linux
- util/userfaultfd: Remove unused uffd_poll_events
- hw/core/ptimer: fix timer zero period condition for freq > 1GHz
- hcd-ohci: Drop ohci_service_iso_td() if ed->head & OHCI_DPTR_MASK is zero
- tests/unit/test-vmstate: Avoid dynamic stack allocation
- hw/usb/hcd-ohci: Use definition to avoid dynamic stack allocation
- hw/i386/multiboot: Avoid dynamic stack allocation
- hw/ppc/spapr: Fix code style problems reported by checkpatch
- chardev/baum: Replace magic values by X_MAX / Y_MAX definitions
- hw/intc/xics: Avoid dynamic stack allocation
- hw/net/e1000e_core: Use definition to avoid dynamic stack allocation
- intel_iommu: Fix invalidation descriptor type field
- configs: Fix typo in the sh4-softmmu devices config file
Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
(cherry picked from commit 9813ed21ec2499c50cb58ac5fb114a1641708eb2)
54 lines
2.3 KiB
Diff
54 lines
2.3 KiB
Diff
From f6952f558b09aeafc6fd51e6b319f0e69c83981f Mon Sep 17 00:00:00 2001
|
|
From: Liu Jing <liujing_yewu@cmss.chinamobile.com>
|
|
Date: Tue, 22 Oct 2024 04:06:30 +0800
|
|
Subject: [PATCH] virtiofsd: use g_date_time_get_microsecond to get subsecond
|
|
|
|
The "%f" specifier in g_date_time_format() is only available in glib
|
|
2.65.2 or later. If combined with older glib, the function returns null
|
|
and the timestamp displayed as "(null)".
|
|
|
|
For backward compatibility, g_date_time_get_microsecond should be used
|
|
to retrieve subsecond.
|
|
|
|
In this patch the g_date_time_format() leaves subsecond field as "%06d"
|
|
and let next snprintf to format with g_date_time_get_microsecond.
|
|
|
|
Signed-off-by: Yusuke Okada <okada.yusuke@jp.fujitsu.com>
|
|
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
Message-id: 20220818184618.2205172-1-yokada.996@gmail.com
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Signed-off-by: Liu Jing <liujing_yewu@cmss.chinamobile.com>
|
|
---
|
|
tools/virtiofsd/passthrough_ll.c | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
|
|
index b3d0674f6d..523d8fbe1e 100644
|
|
--- a/tools/virtiofsd/passthrough_ll.c
|
|
+++ b/tools/virtiofsd/passthrough_ll.c
|
|
@@ -3791,6 +3791,7 @@ static void setup_nofile_rlimit(unsigned long rlimit_nofile)
|
|
static void log_func(enum fuse_log_level level, const char *fmt, va_list ap)
|
|
{
|
|
g_autofree char *localfmt = NULL;
|
|
+ char buf[64];
|
|
|
|
if (current_log_level < level) {
|
|
return;
|
|
@@ -3803,9 +3804,11 @@ static void log_func(enum fuse_log_level level, const char *fmt, va_list ap)
|
|
fmt);
|
|
} else {
|
|
g_autoptr(GDateTime) now = g_date_time_new_now_utc();
|
|
- g_autofree char *nowstr = g_date_time_format(now, "%Y-%m-%d %H:%M:%S.%f%z");
|
|
+ g_autofree char *nowstr = g_date_time_format(now,
|
|
+ "%Y-%m-%d %H:%M:%S.%%06d%z");
|
|
+ snprintf(buf, 64, nowstr, g_date_time_get_microsecond(now));
|
|
localfmt = g_strdup_printf("[%s] [ID: %08ld] %s",
|
|
- nowstr, syscall(__NR_gettid), fmt);
|
|
+ buf, syscall(__NR_gettid), fmt);
|
|
}
|
|
fmt = localfmt;
|
|
}
|
|
--
|
|
2.41.0.windows.1
|
|
|