Deprecate QEMU_CAPS_TDF

This capability is unused since we stopped parsing -help output.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 66f1ac03bc795a83a3959e1fc8efe22d3f3a2c76..abd6eff14a8870b5d1d94104c38b1b48c5831703 100644 (file)
--- 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 2029bd2bbde0b924af2a7c778d573238cc3a0397..50b0ffcf94726e1bd3e09b94c3f8e1afc93c58fc 100644 (file)
--- 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));