mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-25 01:34:11 +03:00
qemu: Move SEV capability handling into virQEMUCapsProbeQMPSEVCapabilities
Move the code out of virQEMUCapsInitQMPMonitor similarly to other functions. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
parent
c31b9159e6
commit
43a8527762
@ -2752,7 +2752,6 @@ virQEMUCapsProbeQMPGICCapabilities(virQEMUCapsPtr qemuCaps,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* Returns -1 on error, 0 if SEV is not supported, 1 if SEV is supported */
|
|
||||||
static int
|
static int
|
||||||
virQEMUCapsProbeQMPSEVCapabilities(virQEMUCapsPtr qemuCaps,
|
virQEMUCapsProbeQMPSEVCapabilities(virQEMUCapsPtr qemuCaps,
|
||||||
qemuMonitorPtr mon)
|
qemuMonitorPtr mon)
|
||||||
@ -2760,12 +2759,21 @@ virQEMUCapsProbeQMPSEVCapabilities(virQEMUCapsPtr qemuCaps,
|
|||||||
int rc = -1;
|
int rc = -1;
|
||||||
virSEVCapability *caps = NULL;
|
virSEVCapability *caps = NULL;
|
||||||
|
|
||||||
if ((rc = qemuMonitorGetSEVCapabilities(mon, &caps)) <= 0)
|
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEV_GUEST))
|
||||||
return rc;
|
return 0;
|
||||||
|
|
||||||
|
if ((rc = qemuMonitorGetSEVCapabilities(mon, &caps)) < 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
/* SEV isn't actually supported */
|
||||||
|
if (rc == 0) {
|
||||||
|
virQEMUCapsClear(qemuCaps, QEMU_CAPS_SEV_GUEST);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
virSEVCapabilitiesFree(qemuCaps->sevCapabilities);
|
virSEVCapabilitiesFree(qemuCaps->sevCapabilities);
|
||||||
qemuCaps->sevCapabilities = caps;
|
qemuCaps->sevCapabilities = caps;
|
||||||
return rc;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -4375,17 +4383,8 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
|
|||||||
goto cleanup;
|
goto cleanup;
|
||||||
if (virQEMUCapsProbeQMPGICCapabilities(qemuCaps, mon) < 0)
|
if (virQEMUCapsProbeQMPGICCapabilities(qemuCaps, mon) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
if (virQEMUCapsProbeQMPSEVCapabilities(qemuCaps, mon) < 0)
|
||||||
/* Probe for SEV capabilities */
|
goto cleanup;
|
||||||
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEV_GUEST)) {
|
|
||||||
int rc = virQEMUCapsProbeQMPSEVCapabilities(qemuCaps, mon);
|
|
||||||
|
|
||||||
if (rc < 0)
|
|
||||||
goto cleanup;
|
|
||||||
|
|
||||||
if (rc == 0)
|
|
||||||
virQEMUCapsClear(qemuCaps, QEMU_CAPS_SEV_GUEST);
|
|
||||||
}
|
|
||||||
|
|
||||||
virQEMUCapsInitProcessCaps(qemuCaps);
|
virQEMUCapsInitProcessCaps(qemuCaps);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user