mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-05 22:05:47 +00:00
Introduce virConnectBaselineHypervisorCPU public API
The new API computes the most feature-rich CPU which is compatible with all given CPUs and can be provided by the specified hypervisor. It is a more useful version of virConnectBaselineCPU, which doesn't consider any hypervisor capabilities when computing the best CPU. Signed-off-by: Jiri Denemark <jdenemar@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Collin Walling <walling@linux.ibm.com>
This commit is contained in:
parent
748246f3f5
commit
7d0a1efcd6
@ -667,6 +667,14 @@ char *virConnectBaselineCPU(virConnectPtr conn,
|
|||||||
const char **xmlCPUs,
|
const char **xmlCPUs,
|
||||||
unsigned int ncpus,
|
unsigned int ncpus,
|
||||||
unsigned int flags);
|
unsigned int flags);
|
||||||
|
char *virConnectBaselineHypervisorCPU(virConnectPtr conn,
|
||||||
|
const char *emulator,
|
||||||
|
const char *arch,
|
||||||
|
const char *machine,
|
||||||
|
const char *virttype,
|
||||||
|
const char **xmlCPUs,
|
||||||
|
unsigned int ncpus,
|
||||||
|
unsigned int flags);
|
||||||
|
|
||||||
|
|
||||||
int virNodeGetFreePages(virConnectPtr conn,
|
int virNodeGetFreePages(virConnectPtr conn,
|
||||||
|
@ -692,6 +692,15 @@ typedef char *
|
|||||||
const char **xmlCPUs,
|
const char **xmlCPUs,
|
||||||
unsigned int ncpus,
|
unsigned int ncpus,
|
||||||
unsigned int flags);
|
unsigned int flags);
|
||||||
|
typedef char *
|
||||||
|
(*virDrvConnectBaselineHypervisorCPU)(virConnectPtr conn,
|
||||||
|
const char *emulator,
|
||||||
|
const char *arch,
|
||||||
|
const char *machine,
|
||||||
|
const char *virttype,
|
||||||
|
const char **xmlCPUs,
|
||||||
|
unsigned int ncpus,
|
||||||
|
unsigned int flags);
|
||||||
|
|
||||||
typedef int
|
typedef int
|
||||||
(*virDrvConnectGetCPUModelNames)(virConnectPtr conn,
|
(*virDrvConnectGetCPUModelNames)(virConnectPtr conn,
|
||||||
@ -1548,6 +1557,7 @@ struct _virHypervisorDriver {
|
|||||||
virDrvDomainSetBlockThreshold domainSetBlockThreshold;
|
virDrvDomainSetBlockThreshold domainSetBlockThreshold;
|
||||||
virDrvDomainSetLifecycleAction domainSetLifecycleAction;
|
virDrvDomainSetLifecycleAction domainSetLifecycleAction;
|
||||||
virDrvConnectCompareHypervisorCPU connectCompareHypervisorCPU;
|
virDrvConnectCompareHypervisorCPU connectCompareHypervisorCPU;
|
||||||
|
virDrvConnectBaselineHypervisorCPU connectBaselineHypervisorCPU;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -1127,6 +1127,9 @@ virConnectGetCPUModelNames(virConnectPtr conn, const char *arch, char ***models,
|
|||||||
* Computes the most feature-rich CPU which is compatible with all given
|
* Computes the most feature-rich CPU which is compatible with all given
|
||||||
* host CPUs.
|
* host CPUs.
|
||||||
*
|
*
|
||||||
|
* See virConnectBaselineHypervisorCPU() to get a CPU which can be provided
|
||||||
|
* by the hypervisor.
|
||||||
|
*
|
||||||
* If @flags includes VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES then libvirt
|
* If @flags includes VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES then libvirt
|
||||||
* will explicitly list all CPU features that are part of the host CPU,
|
* will explicitly list all CPU features that are part of the host CPU,
|
||||||
* without this flag features that are part of the CPU model will not be
|
* without this flag features that are part of the CPU model will not be
|
||||||
@ -1174,6 +1177,84 @@ virConnectBaselineCPU(virConnectPtr conn,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* virConnectBaselineHypervisorCPU:
|
||||||
|
*
|
||||||
|
* @conn: pointer to the hypervisor connection
|
||||||
|
* @emulator: path to the emulator binary
|
||||||
|
* @arch: CPU architecture
|
||||||
|
* @machine: machine type
|
||||||
|
* @virttype: virtualization type
|
||||||
|
* @xmlCPUs: array of XML descriptions of CPUs
|
||||||
|
* @ncpus: number of CPUs in xmlCPUs
|
||||||
|
* @flags: bitwise-OR of virConnectBaselineCPUFlags
|
||||||
|
*
|
||||||
|
* Computes the most feature-rich CPU which is compatible with all given CPUs
|
||||||
|
* and can be provided by the specified hypervisor. For best results the
|
||||||
|
* host-model CPUs as advertised by virConnectGetDomainCapabilities() should be
|
||||||
|
* passed in @xmlCPUs. Any of @emulator, @arch, @machine, and @virttype
|
||||||
|
* parameters may be NULL; libvirt will choose sensible defaults tailored to
|
||||||
|
* the host and its current configuration.
|
||||||
|
*
|
||||||
|
* This is different from virConnectBaselineCPU() which doesn't consider any
|
||||||
|
* hypervisor abilities when computing the best CPU.
|
||||||
|
*
|
||||||
|
* If @flags includes VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES then libvirt
|
||||||
|
* will explicitly list all CPU features that are part of the computed CPU,
|
||||||
|
* without this flag features that are part of the CPU model will not be
|
||||||
|
* listed.
|
||||||
|
*
|
||||||
|
* If @flags includes VIR_CONNECT_BASELINE_CPU_MIGRATABLE, the resulting
|
||||||
|
* CPU will not include features that block migration.
|
||||||
|
*
|
||||||
|
* Returns XML description of the computed CPU (caller frees) or NULL on error.
|
||||||
|
*/
|
||||||
|
char *
|
||||||
|
virConnectBaselineHypervisorCPU(virConnectPtr conn,
|
||||||
|
const char *emulator,
|
||||||
|
const char *arch,
|
||||||
|
const char *machine,
|
||||||
|
const char *virttype,
|
||||||
|
const char **xmlCPUs,
|
||||||
|
unsigned int ncpus,
|
||||||
|
unsigned int flags)
|
||||||
|
{
|
||||||
|
size_t i;
|
||||||
|
|
||||||
|
VIR_DEBUG("conn=%p, emulator=%s, arch=%s, machine=%s, "
|
||||||
|
"virttype=%s, xmlCPUs=%p, ncpus=%u, flags=0x%x",
|
||||||
|
conn, NULLSTR(emulator), NULLSTR(arch), NULLSTR(machine),
|
||||||
|
NULLSTR(virttype), xmlCPUs, ncpus, flags);
|
||||||
|
if (xmlCPUs) {
|
||||||
|
for (i = 0; i < ncpus; i++)
|
||||||
|
VIR_DEBUG("xmlCPUs[%zu]=%s", i, NULLSTR(xmlCPUs[i]));
|
||||||
|
}
|
||||||
|
|
||||||
|
virResetLastError();
|
||||||
|
|
||||||
|
virCheckConnectReturn(conn, NULL);
|
||||||
|
virCheckNonNullArgGoto(xmlCPUs, error);
|
||||||
|
|
||||||
|
if (conn->driver->connectBaselineHypervisorCPU) {
|
||||||
|
char *cpu;
|
||||||
|
|
||||||
|
cpu = conn->driver->connectBaselineHypervisorCPU(conn, emulator, arch,
|
||||||
|
machine, virttype,
|
||||||
|
xmlCPUs, ncpus, flags);
|
||||||
|
if (!cpu)
|
||||||
|
goto error;
|
||||||
|
|
||||||
|
return cpu;
|
||||||
|
}
|
||||||
|
|
||||||
|
virReportUnsupportedError();
|
||||||
|
|
||||||
|
error:
|
||||||
|
virDispatchError(conn);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* virConnectSetKeepAlive:
|
* virConnectSetKeepAlive:
|
||||||
* @conn: pointer to a hypervisor connection
|
* @conn: pointer to a hypervisor connection
|
||||||
|
@ -789,6 +789,7 @@ LIBVIRT_4.4.0 {
|
|||||||
global:
|
global:
|
||||||
virDomainDetachDeviceAlias;
|
virDomainDetachDeviceAlias;
|
||||||
virConnectCompareHypervisorCPU;
|
virConnectCompareHypervisorCPU;
|
||||||
|
virConnectBaselineHypervisorCPU;
|
||||||
} LIBVIRT_4.1.0;
|
} LIBVIRT_4.1.0;
|
||||||
|
|
||||||
# .... define new API here using predicted next version number ....
|
# .... define new API here using predicted next version number ....
|
||||||
|
Loading…
Reference in New Issue
Block a user