From 60b580b949a1196d2ef53cb8edffb642cd281dd9 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 23 Jan 2020 13:21:47 +0100 Subject: [PATCH] qemu: capabilities: Add accessor to qemu caps machine types presence 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 Reviewed-by: Michal Privoznik --- src/qemu/qemu_capabilities.c | 16 ++++++++++++++++ src/qemu/qemu_capspriv.h | 3 +++ 2 files changed, 19 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e42af8487b..5ff232608c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -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, diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h index a7492fffd2..9c2be24ada 100644 --- a/src/qemu/qemu_capspriv.h +++ b/src/qemu/qemu_capspriv.h @@ -108,6 +108,9 @@ virQEMUCapsSetMicrocodeVersion(virQEMUCapsPtr qemuCaps, void virQEMUCapsStripMachineAliases(virQEMUCapsPtr qemuCaps); +bool +virQEMUCapsHasMachines(virQEMUCapsPtr qemuCaps); + void virQEMUCapsAddMachine(virQEMUCapsPtr qemuCaps, virDomainVirtType virtType, -- 2.47.2