]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: capabilities: Add accessor to qemu caps machine types presence
authorPeter Krempa <pkrempa@redhat.com>
Thu, 23 Jan 2020 12:21:47 +0000 (13:21 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Mon, 27 Jan 2020 13:55:03 +0000 (14:55 +0100)
Test code will need to know whether the virQEMUCaps object contains any
machine types already. Add a helper and expose it via 'qemu_capspriv.h'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/qemu/qemu_capabilities.c
src/qemu/qemu_capspriv.h

index e42af8487b8a7894c46596e842b80d4dcd933a4a..5ff232608c2593deaa658f46d005217d34915edf 100644 (file)
@@ -2641,6 +2641,22 @@ virQEMUCapsAddMachine(virQEMUCapsPtr qemuCaps,
     mach->qemuDefault = isDefault;
 }
 
+/**
+ * virQEMUCapsHasMachines:
+ * @qemuCaps: qemu capabilities object
+ *
+ * Returns true if @qemuCaps has at least one machine type defined. This is
+ * called by the test suite to figure out whether to populate fake machine types
+ * into the list.
+ */
+bool
+virQEMUCapsHasMachines(virQEMUCapsPtr qemuCaps)
+{
+
+    return !!qemuCaps->kvm.nmachineTypes || !!qemuCaps->tcg.nmachineTypes;
+}
+
+
 static int
 virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps,
                                 virDomainVirtType virtType,
index a7492fffd21b8897eb1759c6a0bbfc828c4626c7..9c2be24ada5cf5b8046fc287c854c013af38ee04 100644 (file)
@@ -108,6 +108,9 @@ virQEMUCapsSetMicrocodeVersion(virQEMUCapsPtr qemuCaps,
 void
 virQEMUCapsStripMachineAliases(virQEMUCapsPtr qemuCaps);
 
+bool
+virQEMUCapsHasMachines(virQEMUCapsPtr qemuCaps);
+
 void
 virQEMUCapsAddMachine(virQEMUCapsPtr qemuCaps,
                       virDomainVirtType virtType,