53 lines
1.9 KiB
Diff
53 lines
1.9 KiB
Diff
From b9acfbcad6181babba50384741e0c30d6d0cc534 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <b9acfbcad6181babba50384741e0c30d6d0cc534@dist-git>
|
|
From: Andrea Bolognani <abologna@redhat.com>
|
|
Date: Fri, 14 Feb 2020 13:12:37 +0100
|
|
Subject: [PATCH] qemu: Format the armvtimer timer on the command line
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Its behavior is controlled by a KVM-specific CPU feature.
|
|
|
|
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
Reviewed-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
(cherry picked from commit 7c4bc108a9bd7bda1543131d232e2ccee92a9e43)
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1762634
|
|
|
|
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
Message-Id: <20200214121237.623948-7-abologna@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
---
|
|
src/qemu/qemu_command.c | 13 +++++++++++++
|
|
1 file changed, 13 insertions(+)
|
|
|
|
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
|
|
index e1e19e0fcc..1a5142d472 100644
|
|
--- a/src/qemu/qemu_command.c
|
|
+++ b/src/qemu/qemu_command.c
|
|
@@ -6633,6 +6633,19 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
|
|
virBufferAsprintf(&buf, ",tsc-frequency=%lu", timer->frequency);
|
|
break;
|
|
case VIR_DOMAIN_TIMER_NAME_ARMVTIMER:
|
|
+ switch (timer->tickpolicy) {
|
|
+ case VIR_DOMAIN_TIMER_TICKPOLICY_DELAY:
|
|
+ virBufferAddLit(&buf, ",kvm-no-adjvtime=off");
|
|
+ break;
|
|
+ case VIR_DOMAIN_TIMER_TICKPOLICY_DISCARD:
|
|
+ virBufferAddLit(&buf, ",kvm-no-adjvtime=on");
|
|
+ break;
|
|
+ case -1:
|
|
+ case VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP:
|
|
+ case VIR_DOMAIN_TIMER_TICKPOLICY_MERGE:
|
|
+ break;
|
|
+ }
|
|
+ break;
|
|
case VIR_DOMAIN_TIMER_NAME_PLATFORM:
|
|
case VIR_DOMAIN_TIMER_NAME_PIT:
|
|
case VIR_DOMAIN_TIMER_NAME_RTC:
|
|
--
|
|
2.25.0
|
|
|