Re: [libvirt] [PATCH 11/22] qemu: Implement virConnectCompareHypervisorCPU

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/qemu/qemu_driver.c | 60 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6c086b9ef8..4b48afdad1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13100,6 +13100,65 @@ qemuConnectCompareCPU(virConnectPtr conn, } +static int +qemuConnectCompareHypervisorCPU(virConnectPtr conn, + const char *emulator, + const char *archStr, + const char *machine, + const char *virttypeStr, + const char *xmlCPU, + unsigned int flags) +{ + int ret = VIR_CPU_COMPARE_ERROR; + virQEMUDriverPtr driver = conn->privateData; + virQEMUCapsPtr qemuCaps = NULL; + bool failIncompatible; + virCPUDefPtr hvCPU; + virArch arch; + virDomainVirtType virttype; + + virCheckFlags(VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE, + VIR_CPU_COMPARE_ERROR); + + if (virConnectCompareHypervisorCPUEnsureACL(conn) < 0) + goto cleanup; + + failIncompatible = !!(flags & VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE); + + qemuCaps = virQEMUCapsCacheLookupDefault(driver->qemuCapsCache, + emulator, + archStr, + virttypeStr, + machine, + &arch, &virttype, NULL); + if (!qemuCaps) + goto cleanup; + + hvCPU = virQEMUCapsGetHostModel(qemuCaps, virttype, + VIR_QEMU_CAPS_HOST_CPU_REPORTED);

+ if (!hvCPU || hvCPU->fallback != VIR_CPU_FALLBACK_FORBID) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("QEMU '%s' does not support reporting CPU model for " + "virttype '%s'"), + virQEMUCapsGetBinary(qemuCaps), + virDomainVirtTypeToString(virttype)); + goto cleanup; + } + + if (ARCH_IS_X86(arch)) { + ret = virCPUCompareXML(arch, hvCPU, xmlCPU, failIncompatible); + } else { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("comparing hypervisor CPUs is not supported for " + "arch %s"), virArchToString(arch));

+ } + + cleanup: + virObjectUnref(qemuCaps); + return ret; +} + + static char * qemuConnectBaselineCPU(virConnectPtr conn ATTRIBUTE_UNUSED, const char **xmlCPUs, @@ -21326,6 +21385,7 @@ static virHypervisorDriver qemuHypervisorDriver = { .domainSetVcpu = qemuDomainSetVcpu, /* 3.1.0 */ .domainSetBlockThreshold = qemuDomainSetBlockThreshold, /* 3.2.0 */ .domainSetLifecycleAction = qemuDomainSetLifecycleAction, /* 3.9.0 */ + .connectCompareHypervisorCPU = qemuConnectCompareHypervisorCPU, /* 4.4.0 */ };