From: Jiri Denemark <jdenemar@redhat.com>
Date: Fri, 24 Mar 2017 08:27:16 +0000 (+0100)
Subject: qemu: Use virCPUCheckFeature in qemuMigrationIsAllowed
X-Git-Tag: v3.2.0-rc1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cb8bf6ab9a126977e4470a666aa5da0752196be;p=thirdparty%2Flibvirt.git

qemu: Use virCPUCheckFeature in qemuMigrationIsAllowed

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

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 3e789a7a7e..86a66b5ef0 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -2473,19 +2473,12 @@ qemuMigrationIsAllowed(virQEMUDriverPtr driver,
             return false;
 
         if (vm->def->cpu) {
-            for (i = 0; i < vm->def->cpu->nfeatures; i++) {
-                virCPUFeatureDefPtr feature = &vm->def->cpu->features[i];
-
-                if (feature->policy != VIR_CPU_FEATURE_REQUIRE)
-                    continue;
-
-                /* QEMU blocks migration and save with invariant TSC enabled */
-                if (STREQ(feature->name, "invtsc")) {
-                    virReportError(VIR_ERR_OPERATION_INVALID,
-                                   _("domain has CPU feature: %s"),
-                                   feature->name);
-                    return false;
-                }
+            /* QEMU blocks migration and save with invariant TSC enabled */
+            if (virCPUCheckFeature(vm->def->os.arch, vm->def->cpu,
+                                   "invtsc") == 1) {
+                virReportError(VIR_ERR_OPERATION_INVALID, "%s",
+                               _("domain has 'invtsc' CPU feature"));
+                return false;
             }
         }