Implied by QEMU >= 1.2.0.
Signed-off-by: Ján Tomko
---
src/qemu/qemu_capabilities.c | 1 -
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c| 41 --
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml| 1 -
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml| 1 -
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml| 1 -
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml| 1 -
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml| 1 -
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 -
.../aarch64-aavmf-virtio-mmio.args | 1 +
tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 1 +
[ ... etc ... ]
tests/qemuxml2argvdata/watchdog.args | 1 +
tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 1 +
tests/qemuxml2argvtest.c | 13 ---
tests/qemuxml2xmltest.c| 1 -
630 files changed, 613 insertions(+), 71 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 63eb1a5768..8ac6b7008a 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3635,7 +3635,6 @@ static qemuMonitorCallbacks callbacks = {
static void
virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
{
-virQEMUCapsSet(qemuCaps, QEMU_CAPS_RTC);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOST_NET);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NODEFCONFIG);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_BOOT_MENU);
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 71bea5a623..231ff306e4 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -90,7 +90,7 @@ typedef enum {
X_QEMU_CAPS_NETDEV, /* -netdev flag & netdev_add/remove */
/* 30 */
-QEMU_CAPS_RTC, /* The -rtc flag for clock options */
+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 */
QEMU_CAPS_NO_HPET, /* -no-hpet flag is supported */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 6851bd7bcf..c0851d296d 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6151,32 +6151,13 @@ qemuBuildClockCommandLine(virCommandPtr cmd,
virQEMUCapsPtr qemuCaps)
{
size_t i;
+char *rtcopt;
-if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_RTC)) {
-char *rtcopt;
-virCommandAddArg(cmd, "-rtc");
-if (!(rtcopt = qemuBuildClockArgStr(&def->clock)))
-return -1;
-virCommandAddArg(cmd, rtcopt);
-VIR_FREE(rtcopt);
-} else {
-switch (def->clock.offset) {
-case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME:
-case VIR_DOMAIN_CLOCK_OFFSET_TIMEZONE:
-virCommandAddArg(cmd, "-localtime");
-break;
-
-case VIR_DOMAIN_CLOCK_OFFSET_UTC:
-/* Nothing, its the default */
-break;
-
-default:
-virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("unsupported clock offset '%s'"),
-
virDomainClockOffsetTypeToString(def->clock.offset));
-return -1;
-}
-}
+virCommandAddArg(cmd, "-rtc");
+if (!(rtcopt = qemuBuildClockArgStr(&def->clock)))
+return -1;
+virCommandAddArg(cmd, rtcopt);
+VIR_FREE(rtcopt);
if (def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_TIMEZONE &&
def->clock.data.timezone) {
@@ -6218,16 +6199,6 @@ qemuBuildClockCommandLine(virCommandPtr cmd,
virDomainTimerTickpolicyTypeToString(def->clock.timers[i]->tickpolicy));
return -1;
}
-} else if (!virQEMUCapsGet(qemuCaps, QEMU_