[libvirt] [PATCH 4/5] Depreacte QEMU_CAPS_TDF

Ján Tomko jtomko at redhat.com
Thu May 3 10:35:05 UTC 2018


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

Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 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 f31e946723..0cf7f12230 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 575a8a64b4..099265da17 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));
-- 
2.16.1




More information about the libvir-list mailing list