qemu: deprecate QEMU_CAPS_RTC_TD_HACK

Implied by QEMU >= 0.12.0.

Deprecated by QEMU commit 1ed2fc1 included in 0.12.0.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Ján Tomko 2018-03-29 12:51:55 +02:00
parent 470c3827cf
commit 0a45b3643f
2 changed files with 2 additions and 21 deletions

View File

@ -92,7 +92,7 @@ typedef enum {
/* 30 */
X_QEMU_CAPS_RTC, /* The -rtc flag for clock options */
QEMU_CAPS_VHOST_NET, /* vhost-net support available */
QEMU_CAPS_RTC_TD_HACK, /* -rtc-td-hack available */
X_QEMU_CAPS_RTC_TD_HACK, /* -rtc-td-hack available */
QEMU_CAPS_NO_HPET, /* -no-hpet flag is supported */
QEMU_CAPS_NO_KVM_PIT, /* -no-kvm-pit-reinjection supported */

View File

@ -6181,26 +6181,7 @@ qemuBuildClockCommandLine(virCommandPtr cmd,
break;
case VIR_DOMAIN_TIMER_NAME_RTC:
/* This has already been taken care of (in qemuBuildClockArgStr)
if QEMU_CAPS_RTC is set (mutually exclusive with
QEMUD_FLAG_RTC_TD_HACK) */
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_RTC_TD_HACK)) {
switch (def->clock.timers[i]->tickpolicy) {
case -1:
case VIR_DOMAIN_TIMER_TICKPOLICY_DELAY:
/* the default - do nothing */
break;
case VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP:
virCommandAddArg(cmd, "-rtc-td-hack");
break;
case VIR_DOMAIN_TIMER_TICKPOLICY_MERGE:
case VIR_DOMAIN_TIMER_TICKPOLICY_DISCARD:
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unsupported rtc tickpolicy '%s'"),
virDomainTimerTickpolicyTypeToString(def->clock.timers[i]->tickpolicy));
return -1;
}
}
/* Already handled in qemuBuildClockArgStr */
break;
case VIR_DOMAIN_TIMER_NAME_PIT: