]> xenbits.xensource.com Git - libvirt.git/commitdiff
Trivially implement VIR_CONNECT_BASELINE_CPU_MIGRATABLE for non-x86 cpus
authorJán Tomko <jtomko@redhat.com>
Thu, 5 Feb 2015 14:29:52 +0000 (15:29 +0100)
committerJán Tomko <jtomko@redhat.com>
Mon, 2 Mar 2015 06:59:12 +0000 (07:59 +0100)
Assume no features block migration.

src/cpu/cpu_aarch64.c
src/cpu/cpu_arm.c
src/cpu/cpu_generic.c
src/cpu/cpu_powerpc.c

index 6346f9bd5e5814fc258a237c31e2dc20c9ed71bf..e6d5f53802ece0e6afa4fff671193a2074a7027f 100644 (file)
@@ -94,7 +94,8 @@ AArch64Baseline(virCPUDefPtr *cpus,
 {
     virCPUDefPtr cpu = NULL;
 
-    virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, NULL);
+    virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES |
+                  VIR_CONNECT_BASELINE_CPU_MIGRATABLE, NULL);
 
     if (VIR_ALLOC(cpu) < 0 ||
         VIR_STRDUP(cpu->model, cpus[0]->model) < 0) {
index ec755bd157e56eaef6f9cf56da20d730a5319add..0403a8bd91bbc7ed8f51c0fbca5c64e0de625142 100644 (file)
@@ -97,7 +97,8 @@ ArmBaseline(virCPUDefPtr *cpus,
 {
     virCPUDefPtr cpu = NULL;
 
-    virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, NULL);
+    virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES |
+                  VIR_CONNECT_BASELINE_CPU_MIGRATABLE, NULL);
 
     if (VIR_ALLOC(cpu) < 0 ||
         VIR_STRDUP(cpu->model, cpus[0]->model) < 0) {
index d6890c0be46a25144c1a22f33acdc2267099f09c..a9cde4ca3c612dd5cdaa65b7b445d35d165b1c8c 100644 (file)
@@ -126,7 +126,8 @@ genericBaseline(virCPUDefPtr *cpus,
     unsigned int count;
     size_t i, j;
 
-    virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, NULL);
+    virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES |
+                  VIR_CONNECT_BASELINE_CPU_MIGRATABLE, NULL);
 
     if (!cpuModelIsAllowed(cpus[0]->model, models, nmodels)) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
index 1cd6874c0508ebce750c2ebb21a850d453652edb..c77374cead55c0447b18f68fc5f1ae1069ea1a9f 100644 (file)
@@ -580,7 +580,8 @@ ppcBaseline(virCPUDefPtr *cpus,
     virCPUDefPtr cpu = NULL;
     size_t i;
 
-    virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, NULL);
+    virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES |
+                  VIR_CONNECT_BASELINE_CPU_MIGRATABLE, NULL);
 
     if (!(map = ppcLoadMap()))
         goto error;