[libvirt] [PATCH 16/44] 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(a)redhat.com&gt; --- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 21 +-------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 3a18370eb..41342ab4b 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -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 */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7ed179a3c..2b7a871b2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6185,26 +6185,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: -- 2.16.1