[libvirt] [PATCH 8/8] qemu: domcaps: Simplify adding new domaincaps based on qemu caps

[Ján Tomko]

On Wed, Nov 13, 2019 at 05:05:26PM +0100, Peter Krempa wrote:
>Add a helper which converts qemu emulator capabilities to the domain
>capability XML. This will simplify future additions of new features.
>
>Signed-off-by: Peter Krempa <pkrempa at redhat.com>
>---
> src/qemu/qemu_capabilities.c | 39 ++++++++++++++++++++++++++----------
> 1 file changed, 28 insertions(+), 11 deletions(-)
>
>diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
>index a1fbf0da34..483c3fcf0f 100644
>--- a/src/qemu/qemu_capabilities.c
>+++ b/src/qemu/qemu_capabilities.c
>@@ -5281,12 +5281,35 @@ virQEMUCapsFillDomainCPUCaps(virCapsPtr caps,
> }
>
>
>+struct virQEMUCapsDomainFeatureCapabilityTuple {
>+    virDomainCapsFeature domcap;
>+    virQEMUCapsFlags qemucap;
>+};
>+
>+/**
>+ * This maps the qemu features to the entries in <features> of the domain
>+ * capability XML. Use QEMU_CAPS_LAST as qemucap to always enable the feature.
>+ */
>+static const struct virQEMUCapsDomainFeatureCapabilityTuple domCapsTuples[] = {
>+    { VIR_DOMAIN_CAPS_FEATURE_IOTHREADS, QEMU_CAPS_OBJECT_IOTHREAD },
>+    { VIR_DOMAIN_CAPS_FEATURE_VMCOREINFO, QEMU_CAPS_DEVICE_VMCOREINFO },
>+    { VIR_DOMAIN_CAPS_FEATURE_GENID, QEMU_CAPS_DEVICE_VMGENID },
>+};
>+
>+
> static void
>-virQEMUCapsFillDomainIOThreadCaps(virQEMUCapsPtr qemuCaps,
>-                                  virDomainCapsPtr domCaps)
>+virQEMUCapsFillDomainFeaturesFromQEMUCaps(virQEMUCapsPtr qemuCaps,
>+                                          virDomainCapsPtr domCaps)
> {
>-    domCaps->features[VIR_DOMAIN_CAPS_FEATURE_IOTHREADS] = virTristateBoolFromBool(
>-            virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_IOTHREAD));
>+    size_t i;
>+
>+    virDomainCapsFeaturesInitUnsupported(domCaps);
>+
>+    for (i = 0; i < G_N_ELEMENTS(domCapsTuples); i++) {
>+        if (domCapsTuples[i].qemucap == QEMU_CAPS_LAST ||

Dropping this special value and using a separate array like
domCapsAlwaysOn would be more readable. Especially since you don't
mandate an entry for each existing DOMAIN_CAPS_FEATURE

>+            virQEMUCapsGet(qemuCaps, domCapsTuples[i].qemucap))
>+            domCaps->features[domCapsTuples[i].domcap] = VIR_TRISTATE_BOOL_YES;
>+    }
> }
>
>
>@@ -5572,6 +5595,7 @@ virQEMUCapsFillDomainCaps(virCapsPtr caps,
>     virDomainCapsDeviceRNGPtr rng = &domCaps->rng;
>
>     virDomainCapsFeaturesInitUnsupported(domCaps);
>+    virQEMUCapsFillDomainFeaturesFromQEMUCaps(qemuCaps, domCaps);
>
>     domCaps->maxvcpus = virQEMUCapsGetMachineMaxCpus(qemuCaps,
>                                                      domCaps->machine);
>@@ -5584,12 +5608,6 @@ virQEMUCapsFillDomainCaps(virCapsPtr caps,
>         domCaps->maxvcpus = MIN(domCaps->maxvcpus, hostmaxvcpus);
>     }
>
>-    domCaps->features[VIR_DOMAIN_CAPS_FEATURE_VMCOREINFO] = virTristateBoolFromBool(
>-            virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VMCOREINFO));
>-
>-    domCaps->features[VIR_DOMAIN_CAPS_FEATURE_GENID] = virTristateBoolFromBool(
>-            virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VMGENID));
>-
>     if (virQEMUCapsFillDomainOSCaps(os,
>                                     domCaps->machine,
>                                     domCaps->arch,

Reviewed-by: Ján Tomko <jtomko at redhat.com>

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20191114/8ab8f6ec/attachment-0001.sig>