- vfio/migration: Add support for manual clear vfio dirty log - vfio: Maintain DMA mapping range for the container - linux-headers: update against 5.10 and manual clear vfio dirty log series - arm/acpi: Fix when make qemu-system-aarch64 at x86_64 host bios_tables_test fail reason: __aarch64__ macro let build_pptt at x86_64 and aarch64 host build different function that let bios_tables_test fail. - pl031: support rtc-timer property for pl031 - feature: Add logs for vm start and destroy - feature: Add log for each modules - log: Add log at boot & cpu init for aarch64 - bugfix: irq: Avoid covering object refcount of qemu_irq - i386: cache passthrough: Update AMD 8000_001D.EAX[25:14] based on vCPU topo - freeclock: set rtc_date_diff for X86 - freeclock: set rtc_date_diff for arm - freeclock: add qmp command to get time offset of vm in seconds - tests: Disable filemonitor testcase - shadow_dev: introduce shadow dev for virtio-net device - pl011: reset read FIFO when UARTTIMSC=0 & UARTICR=0xffff - tests: virt: Update expected ACPI tables for virt test(update BinDir) - arm64: Add the cpufreq device to show cpufreq info to guest - hw/arm64: add vcpu cache info support - tests: virt: Allow changes to PPTT test table - cpu: add Cortex-A72 processor kvm target support - cpu: add Kunpeng-920 cpu support - net: eepro100: validate various address valuesi(CVE-2021-20255) - ide: ahci: add check to avoid null dereference (CVE-2019-12067) - vdpa: set vring enable only if the vring address has already been set - docs: Add generic vhost-vdpa device documentation - vdpa: don't suspend/resume device when vdpa device not started - vdpa: correct param passed in when unregister save - vdpa: suspend function return 0 when the vdpa device is stopped - vdpa: support vdpa device suspend/resume - vdpa: move memory listener to the realize stage - vdpa: implement vdpa device migration - vhost: implement migration state notifier for vdpa device - vhost: implement post resume bh - vhost: implement savevm_handler for vdpa device - vhost: implement vhost_vdpa_device_suspend/resume - vhost: implement vhost-vdpa suspend/resume - vhost: add vhost_dev_suspend/resume_op - vhost: introduce bytemap for vhost backend logging - vhost-vdpa: add migration log ops for VhostOps - vhost-vdpa: add VHOST_BACKEND_F_BYTEMAPLOG - hw/usb: reduce the vpcu cost of UHCI when VNC disconnect - virtio-net: update the default and max of rx/tx_queue_size - virtio-net: set the max of queue size to 4096 - virtio-net: fix max vring buf size when set ring num - virtio-net: bugfix: do not delete netdev before virtio net - monitor: Discard BLOCK_IO_ERROR event when VM rebooted - vhost-user: add unregister_savevm when vhost-user cleanup - vhost-user: add vhost_set_mem_table when vm load_setup at destination - vhost-user: quit infinite loop while used memslots is more than the backend limit - fix qemu-core when vhost-user-net config with server mode - vhost-user: Add support reconnect vhost-user socket - vhost-user: Set the acked_features to vm's featrue - i6300esb watchdog: bugfix: Add a runstate transition - hw/net/rocker_of_dpa: fix double free bug of rocker device - net/dump.c: Suppress spurious compiler warning - pcie: Add pcie-root-port fast plug/unplug feature - pcie: Compat with devices which do not support Link Width, such as ioh3420 - qdev/monitors: Fix reundant error_setg of qdev_add_device - qemu-nbd: set timeout to qemu-nbd socket - qemu-nbd: make native as the default aio mode - nbd/server.c: fix invalid read after client was already free - virtio-scsi: bugfix: fix qemu crash for hotplug scsi disk with dataplane - virtio: bugfix: check the value of caches before accessing it - virtio: print the guest virtio_net features that host does not support - virtio: bugfix: add rcu_read_lock when vring_avail_idx is called - virtio: check descriptor numbers - migration: report multiFd related thread pid to libvirt - migration: report migration related thread pid to libvirt - cpu/features: fix bug for memory leakage - doc: Update multi-thread compression doc - migration: Add compress_level sanity check - migration: Add zstd support in multi-thread compression - migration: Add multi-thread compress ops - migration: Refactoring multi-thread compress migration - migration: Add multi-thread compress method - migration: skip cache_drop for bios bootloader and nvram template - oslib-posix: optimise vm startup time for 1G hugepage - monitor/qmp: drop inflight rsp if qmp client broken - ps2: fix oob in ps2 kbd - Currently, while kvm and qemu can not handle some kvm exit, qemu will do vm_stop, which will make vm in pause state. This action make vm unrecoverable, so send guest panic to libvirt instead. - vhost: cancel migration when vhost-user restarted during migraiton Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
130 lines
3.8 KiB
Diff
130 lines
3.8 KiB
Diff
From 0a6baf4799dd6e70d7959002ea6ddb998eddbc6d Mon Sep 17 00:00:00 2001
|
|
From: "shenghualong@huawei.com" <shenghualong@huawei.com>
|
|
Date: Mon, 18 Mar 2024 15:53:43 +0800
|
|
Subject: [PATCH] freeclock: add qmp command to get time offset of vm in
|
|
seconds
|
|
|
|
When setting the system time in VM, a RTC_CHANGE event will be reported.
|
|
However, if libvirt is restarted while the event is be reporting, the
|
|
event will be lost and we will get the old time (not the time we set in
|
|
VM) after rebooting the VM.
|
|
|
|
We save the delta time in QEMU and add a rtc-date-diff qmp to get the
|
|
delta time so that libvirt can get the latest time in VM according to
|
|
the qmp after libvirt is restarted.
|
|
|
|
Signed-off-by: Peng Liang <liangpeng10@huawei.com>
|
|
Signed-off-by: zhangxinhao <zhangxinhao1@huawei.com>
|
|
Signed-off-by: Yuan Zhang <zhangyuan162@huawei.com>
|
|
---
|
|
hw/core/machine-qmp-cmds.c | 6 ++++++
|
|
include/sysemu/rtc.h | 4 +++-
|
|
qapi/misc.json | 9 +++++++++
|
|
qapi/pragma.json | 3 ++-
|
|
system/rtc.c | 11 +++++++++++
|
|
5 files changed, 31 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c
|
|
index 3860a50c3b..f1389ef644 100644
|
|
--- a/hw/core/machine-qmp-cmds.c
|
|
+++ b/hw/core/machine-qmp-cmds.c
|
|
@@ -8,6 +8,7 @@
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
+#include "sysemu/rtc.h"
|
|
#include "hw/acpi/vmgenid.h"
|
|
#include "hw/boards.h"
|
|
#include "hw/intc/intc.h"
|
|
@@ -373,6 +374,11 @@ HumanReadableText *qmp_x_query_irq(Error **errp)
|
|
return human_readable_text_from_str(buf);
|
|
}
|
|
|
|
+int64_t qmp_query_rtc_date_diff(Error **errp)
|
|
+{
|
|
+ return get_rtc_date_diff();
|
|
+}
|
|
+
|
|
GuidInfo *qmp_query_vm_generation_id(Error **errp)
|
|
{
|
|
GuidInfo *info;
|
|
diff --git a/include/sysemu/rtc.h b/include/sysemu/rtc.h
|
|
index 0fc8ad6fdf..3edae762d4 100644
|
|
--- a/include/sysemu/rtc.h
|
|
+++ b/include/sysemu/rtc.h
|
|
@@ -54,5 +54,7 @@ void qemu_get_timedate(struct tm *tm, time_t offset);
|
|
* then this function will return 3600.
|
|
*/
|
|
time_t qemu_timedate_diff(struct tm *tm);
|
|
-
|
|
+time_t get_rtc_date_diff(void);
|
|
+void set_rtc_date_diff(time_t diff);
|
|
+int64_t qmp_query_rtc_date_diff(Error **errp);
|
|
#endif
|
|
diff --git a/qapi/misc.json b/qapi/misc.json
|
|
index cda2effa81..1832d5f460 100644
|
|
--- a/qapi/misc.json
|
|
+++ b/qapi/misc.json
|
|
@@ -550,6 +550,15 @@
|
|
'returns': ['CommandLineOptionInfo'],
|
|
'allow-preconfig': true}
|
|
|
|
+##
|
|
+# @query-rtc-date-diff:
|
|
+#
|
|
+# get vm's time offset
|
|
+#
|
|
+# Since: 2.8
|
|
+##
|
|
+{ 'command': 'query-rtc-date-diff', 'returns': 'int64' }
|
|
+
|
|
##
|
|
# @RTC_CHANGE:
|
|
#
|
|
diff --git a/qapi/pragma.json b/qapi/pragma.json
|
|
index 0aa4eeddd3..7a07b44bb1 100644
|
|
--- a/qapi/pragma.json
|
|
+++ b/qapi/pragma.json
|
|
@@ -30,7 +30,8 @@
|
|
'qom-get',
|
|
'query-tpm-models',
|
|
'query-tpm-types',
|
|
- 'ringbuf-read' ],
|
|
+ 'ringbuf-read',
|
|
+ 'query-rtc-date-diff'],
|
|
# Externally visible types whose member names may use uppercase
|
|
'member-name-exceptions': [ # visible in:
|
|
'ACPISlotType', # query-acpi-ospm-status
|
|
diff --git a/system/rtc.c b/system/rtc.c
|
|
index 4904581abe..e16b5fffc5 100644
|
|
--- a/system/rtc.c
|
|
+++ b/system/rtc.c
|
|
@@ -44,6 +44,7 @@ static time_t rtc_ref_start_datetime;
|
|
static int rtc_realtime_clock_offset; /* used only with QEMU_CLOCK_REALTIME */
|
|
static int rtc_host_datetime_offset = -1; /* valid & used only with
|
|
RTC_BASE_DATETIME */
|
|
+static time_t rtc_date_diff = 0;
|
|
QEMUClockType rtc_clock;
|
|
/***********************************************************/
|
|
/* RTC reference time/date access */
|
|
@@ -108,6 +109,16 @@ time_t qemu_timedate_diff(struct tm *tm)
|
|
return seconds - qemu_ref_timedate(QEMU_CLOCK_HOST);
|
|
}
|
|
|
|
+time_t get_rtc_date_diff(void)
|
|
+{
|
|
+ return rtc_date_diff;
|
|
+}
|
|
+
|
|
+void set_rtc_date_diff(time_t diff)
|
|
+{
|
|
+ rtc_date_diff = diff;
|
|
+}
|
|
+
|
|
static void configure_rtc_base_datetime(const char *startdate)
|
|
{
|
|
time_t rtc_start_datetime;
|
|
--
|
|
2.27.0
|
|
|