From: Jiri Denemark <jdenemar@redhat.com>
Date: Fri, 24 Mar 2017 08:27:26 +0000 (+0100)
Subject: qemu: Allow migration with invtsc if tsc frequency is set
X-Git-Tag: v3.2.0-rc1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03eeb84fed50074198486ffe4fa3e43df44bd236;p=thirdparty%2Flibvirt.git

qemu: Allow migration with invtsc if tsc frequency is set

Migration with invtsc is allowed by QEMU as long as TSC frequency is
explicitly specified.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 86a66b5ef0..2aa73e263f 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -2473,12 +2473,29 @@ qemuMigrationIsAllowed(virQEMUDriverPtr driver,
             return false;
 
         if (vm->def->cpu) {
-            /* QEMU blocks migration and save with invariant TSC enabled */
+            /* QEMU blocks migration and save with invariant TSC enabled
+             * unless TSC frequency is explicitly set.
+             */
             if (virCPUCheckFeature(vm->def->os.arch, vm->def->cpu,
                                    "invtsc") == 1) {
-                virReportError(VIR_ERR_OPERATION_INVALID, "%s",
-                               _("domain has 'invtsc' CPU feature"));
-                return false;
+                bool block = true;
+
+                for (i = 0; i < vm->def->clock.ntimers; i++) {
+                    virDomainTimerDefPtr timer = vm->def->clock.timers[i];
+
+                    if (timer->name == VIR_DOMAIN_TIMER_NAME_TSC &&
+                        timer->frequency > 0) {
+                        block = false;
+                        break;
+                    }
+                }
+
+                if (block) {
+                    virReportError(VIR_ERR_OPERATION_INVALID, "%s",
+                                   _("domain has 'invtsc' CPU feature but "
+                                     "TSC frequency is not specified"));
+                    return false;
+                }
             }
         }