[libvirt] [PATCH v4 36/37] qemu_driver: Remove unsupported props in expanded hypervisor baseline output

[Chris Venteicher]

Hypervisor baseline has an expansion mode where the cpu property /
feature list is fully expanded to list all supported (true) features.

The output (expanded) cpu model should not list properties that are
false (unsupported.)

QEMU expansion output enumerates both true (supported) and false
(unsupported) properties.  This patch removes the false (unsupported)
entries from the output cpu property list.

This change makes the expanded output consistent when both the internal
libvirt utility functions and QEMU QMP commands are used to expand the
property list.

qemu_monitor: Introduce removal of true/false CPUModelInfo props

A utility function is created to squash CPU properties list in
qemuMonitorCPUmodelInfo structure by removing boolean properties
of matching value.

Signed-off-by: Chris Venteicher <cventeic at redhat.com>
---
 src/qemu/qemu_driver.c  |  4 ++++
 src/qemu/qemu_monitor.c | 30 ++++++++++++++++++++++++++++++
 src/qemu/qemu_monitor.h |  4 ++++
 3 files changed, 38 insertions(+)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 73707cce46..604c21d311 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -13632,6 +13632,10 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn,
                                                 migratable, modelInfo, &expansion) < 0)
                 goto cleanup;
 
+            /* Expansion enumerates all features
+             * Baselines output enumerates only in-model (true) features */
+            qemuMonitorCPUModelInfoRemovePropByBoolValue(expansion, false);
+
             if (!(cpu = virQEMUCapsCPUModelInfoToCPUDef(migratable, expansion)))
                 goto cleanup;
 
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index edbaee1a53..12feb034fd 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3785,6 +3785,36 @@ qemuMonitorCPUModelInfoCopy(const qemuMonitorCPUModelInfo *orig)
 }
 
 
+/* Squash CPU Model Info property list
+ * removing props of type boolean matching value */
+void
+qemuMonitorCPUModelInfoRemovePropByBoolValue(qemuMonitorCPUModelInfoPtr model,
+                                             bool value)
+{
+    qemuMonitorCPUPropertyPtr src;
+    qemuMonitorCPUPropertyPtr dst;
+    size_t i;
+    size_t dst_nprops = 0;
+
+    for (i = 0; i < model->nprops; i++) {
+        src = &(model->props[i]);
+        dst = &(model->props[dst_nprops]);
+
+        if (src->type == QEMU_MONITOR_CPU_PROPERTY_BOOLEAN &&
+            src->value.boolean == value)
+            continue;
+
+        *dst = *src;
+
+        dst_nprops++;
+    }
+
+    model->nprops = dst_nprops;
+
+    ignore_value(VIR_REALLOC_N_QUIET(model->props, dst_nprops));
+}
+
+
 int
 qemuMonitorCPUModelInfoBoolPropAdd(qemuMonitorCPUModelInfoPtr model,
                                    const char *prop_name,
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index d46e9378ea..f6052ab852 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1053,6 +1053,10 @@ int qemuMonitorCPUModelInfoBoolPropAdd(qemuMonitorCPUModelInfoPtr model,
                                        bool prop_value)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
+void qemuMonitorCPUModelInfoRemovePropByBoolValue(qemuMonitorCPUModelInfoPtr model,
+                                                  bool value)
+    ATTRIBUTE_NONNULL(1);
+
 int qemuMonitorGetCommands(qemuMonitorPtr mon,
                            char ***commands);
 int qemuMonitorGetEvents(qemuMonitorPtr mon,
-- 
2.17.1