openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Ján Tomko 2018-05-03 12:12:29 +02:00
parent 941c8b0d00
commit 5dbdd401e8
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_capabilities.h
View File

@ -97,7 +97,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
X_QEMU_CAPS_NO_KVM_PIT, /* -no-kvm-pit-reinjection supported */ X_QEMU_CAPS_NO_KVM_PIT, /* -no-kvm-pit-reinjection supported */
/* 35 */ /* 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 */ QEMU_CAPS_PCI_CONFIGFD, /* pci-assign.configfd */
X_QEMU_CAPS_NODEFCONFIG, /* -nodefconfig */ X_QEMU_CAPS_NODEFCONFIG, /* -nodefconfig */
X_QEMU_CAPS_BOOT_MENU, /* -boot menu=on support */ X_QEMU_CAPS_BOOT_MENU, /* -boot menu=on support */

5
src/qemu/qemu_command.c
View File

@ -6147,11 +6147,8 @@ qemuBuildClockCommandLine(virCommandPtr cmd,
case VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP: case VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP:
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM_PIT_TICK_POLICY)) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM_PIT_TICK_POLICY)) {
/* do nothing - this is default for kvm-pit */ /* 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 { } 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, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unsupported pit tickpolicy '%s'"), _("unsupported pit tickpolicy '%s'"),
virDomainTimerTickpolicyTypeToString(def->clock.timers[i]->tickpolicy)); virDomainTimerTickpolicyTypeToString(def->clock.timers[i]->tickpolicy));