[PATCHv1 04/12] qemu_monitor: Indicate when CPUModelInfo props report migratablity

[Chris Venteicher <cventeic@xxxxxxxxxx>]

Renamed variable in CPUModelInfo such that
props_migratable_valid is true when properties in CPUModelInfo
indicate if property is / isn't migratable.

Property migratability is not part of QMP messages but rather is
sometimes calculated within Libvirt and stored in CPUModelInfo
properties.
---
 src/qemu/qemu_capabilities.c | 10 +++++-----
 src/qemu/qemu_monitor.c      |  2 +-
 src/qemu/qemu_monitor.h      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 419208ad5c..0c5e4bb766 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -2400,7 +2400,7 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps,
             }
         }
 
-        modelInfo->migratability = true;
+        modelInfo->props_migratable_valid = true;
     }
 
     VIR_STEAL_PTR(cpuData->info, modelInfo);
@@ -2455,7 +2455,7 @@ virQEMUCapsGetCPUFeatures(virQEMUCapsPtr qemuCaps,
     }
 
     VIR_STEAL_PTR(*features, list);
-    if (migratable && !data->info->migratability)
+    if (migratable && !data->info->props_migratable_valid)
         ret = 1;
     else
         ret = 0;
@@ -2854,7 +2854,7 @@ virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps,
     virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type);
     int ret = 1;
 
-    if (migratable && cpuData->info && !cpuData->info->migratability)
+    if (migratable && cpuData->info && !cpuData->info->props_migratable_valid)
         return 1;
 
     if (ARCH_IS_S390(qemuCaps->arch)) {
@@ -3037,7 +3037,7 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsPtr qemuCaps,
                        _("invalid migratability value for host CPU model"));
         goto cleanup;
     }
-    hostCPU->migratability = val == VIR_TRISTATE_BOOL_YES;
+    hostCPU->props_migratable_valid = val == VIR_TRISTATE_BOOL_YES;
     VIR_FREE(str);
 
     ctxt->node = hostCPUNode;
@@ -3530,7 +3530,7 @@ virQEMUCapsFormatHostCPUModelInfo(virQEMUCapsPtr qemuCaps,
     virBufferAsprintf(buf,
                       "<hostCPU type='%s' model='%s' migratability='%s'>\n",
                       typeStr, model->name,
-                      model->migratability ? "yes" : "no");
+                      model->props_migratable_valid ? "yes" : "no");
     virBufferAdjustIndent(buf, 2);
 
     for (i = 0; i < model->nprops; i++) {
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index c5c640b0d8..3fd73e2cd1 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3702,7 +3702,7 @@ qemuMonitorCPUModelInfoCopy(const qemuMonitorCPUModelInfo *orig)
     if (VIR_STRDUP(copy->name, orig->name) < 0)
         goto error;
 
-    copy->migratability = orig->migratability;
+    copy->props_migratable_valid = orig->props_migratable_valid;
     copy->nprops = orig->nprops;
 
     for (i = 0; i < orig->nprops; i++) {
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 15bebb2aaf..08b787e28c 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1005,7 +1005,7 @@ struct _qemuMonitorCPUModelInfo {
     char *name;
     size_t nprops;
     qemuMonitorCPUPropertyPtr props;
-    bool migratability;
+    bool props_migratable_valid;
 };
 
 typedef enum {
-- 
2.17.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list