From 5dbdd401e81181b77b6d8ed303b772b9297ee6b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Thu, 3 May 2018 12:12:29 +0200 Subject: [PATCH] Deprecate QEMU_CAPS_TDF MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This capability is unused since we stopped parsing -help output. Signed-off-by: Ján Tomko Reviewed-by: John Ferlan --- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 66f1ac03bc..abd6eff14a 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -97,7 +97,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ X_QEMU_CAPS_NO_KVM_PIT, /* -no-kvm-pit-reinjection supported */ /* 35 */ - QEMU_CAPS_TDF, /* -tdf flag (user-mode pit catchup) */ + X_QEMU_CAPS_TDF, /* -tdf flag (user-mode pit catchup) */ QEMU_CAPS_PCI_CONFIGFD, /* pci-assign.configfd */ X_QEMU_CAPS_NODEFCONFIG, /* -nodefconfig */ X_QEMU_CAPS_BOOT_MENU, /* -boot menu=on support */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2029bd2bbd..50b0ffcf94 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6147,11 +6147,8 @@ qemuBuildClockCommandLine(virCommandPtr cmd, case VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP: if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM_PIT_TICK_POLICY)) { /* do nothing - this is default for kvm-pit */ - } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_TDF)) { - /* -tdf switches to 'catchup' with userspace pit. */ - virCommandAddArg(cmd, "-tdf"); } else { - /* can't catchup if we have neither pit mode */ + /* can't catchup if we don't have kvm-pit */ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported pit tickpolicy '%s'"), virDomainTimerTickpolicyTypeToString(def->clock.timers[i]->tickpolicy)); -- GitLab