External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: capabilities: Fix testing of 'TCG' capabilities probing

Browse Source 
The logic in 'virQEMUCapsInitQMP' invokes a second probe of qemu in case
when acceleration is used and TCG is supported to specifically probe the
CPU and features of non-accelerated guests.

The same logic must then be used in 'qemucapabilitiestest' when
replaying the data for testing otherwise the test would fail.

Export 'virQEMUCapsHaveAccel' for test usage and use the same logic
in 'testQemuCaps'.

Fix the comment in 'virQEMUCapsInitQMP' to outline what's happening.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-03-08 18:58:51 +01:00
parent 738c5bae88
commit 111cfc5532
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_capabilities.c
View File

@ -883,7 +883,7 @@ virQEMUCapsTypeIsAccelerated(virDomainVirtType type)
} }
static bool bool
virQEMUCapsHaveAccel(virQEMUCaps *qemuCaps) virQEMUCapsHaveAccel(virQEMUCaps *qemuCaps)
{ {
return virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM) || return virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM) ||
@ -5748,8 +5748,8 @@ virQEMUCapsInitQMP(virQEMUCaps *qemuCaps,
return -1; return -1;
/* /*
* If KVM was enabled during the first probe, we need to explicitly probe * If acceleration was enabled during the first probe, we need to explicitly
* for TCG capabilities by asking the same binary again and turning KVM * probe for TCG capabilities by asking the same binary again and turning KVM
* off. * off.
*/ */
if (virQEMUCapsHaveAccel(qemuCaps) && if (virQEMUCapsHaveAccel(qemuCaps) &&

3
src/qemu/qemu_capspriv.h
View File

@ -116,3 +116,6 @@ virQEMUCapsAddMachine(virQEMUCaps *qemuCaps,
const char *defaultRAMid, const char *defaultRAMid,
bool deprecated, bool deprecated,
virTristateBool acpi); virTristateBool acpi);
bool
virQEMUCapsHaveAccel(virQEMUCaps *qemuCaps);

3
tests/qemucapabilitiestest.c
View File

@ -101,7 +101,8 @@ testQemuCaps(const void *opaque)
if (virQEMUCapsInitQMPMonitor(capsActual, qemuMonitorTestGetMonitor(mon)) < 0) if (virQEMUCapsInitQMPMonitor(capsActual, qemuMonitorTestGetMonitor(mon)) < 0)
return -1; return -1;
if (virQEMUCapsGet(capsActual, QEMU_CAPS_KVM)) { if (virQEMUCapsHaveAccel(capsActual) &&
virQEMUCapsGet(capsActual, QEMU_CAPS_TCG)) {
qemuMonitorResetCommandID(qemuMonitorTestGetMonitor(mon)); qemuMonitorResetCommandID(qemuMonitorTestGetMonitor(mon));
if (qemuProcessQMPInitMonitor(qemuMonitorTestGetMonitor(mon)) < 0) if (qemuProcessQMPInitMonitor(qemuMonitorTestGetMonitor(mon)) < 0)