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

qemu: Introduce virQEMUCapsIsCPUModeSupported

Browse Source 
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2016-08-03 16:22:30 +02:00
parent 21dead6370
commit 803497a8ac
2 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/qemu/qemu_capabilities.c
View File

@ -2371,6 +2371,32 @@ virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps)
} }
bool
virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qemuCaps,
virCapsPtr caps,
virDomainVirtType type,
virCPUMode mode)
{
switch (mode) {
case VIR_CPU_MODE_HOST_PASSTHROUGH:
return type == VIR_DOMAIN_VIRT_KVM &&
virQEMUCapsGuestIsNative(caps->host.arch, qemuCaps->arch);
case VIR_CPU_MODE_HOST_MODEL:
return !!qemuCaps->hostCPUModel;
case VIR_CPU_MODE_CUSTOM:
return qemuCaps->cpuDefinitions &&
qemuCaps->cpuDefinitions->nmodels > 0;
case VIR_CPU_MODE_LAST:
break;
}
return false;
}
int virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr qemuCaps, int virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr qemuCaps,
size_t *nmachines, size_t *nmachines,
virCapsGuestMachinePtr **machines) virCapsGuestMachinePtr **machines)
@ -4358,22 +4384,26 @@ virQEMUCapsFillDomainCPUCaps(virCapsPtr caps,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
virDomainCapsPtr domCaps) virDomainCapsPtr domCaps)
{ {
virDomainCapsCPUModelsPtr filtered = NULL; if (virQEMUCapsIsCPUModeSupported(qemuCaps, caps, domCaps->virttype,
char **models = NULL; VIR_CPU_MODE_HOST_PASSTHROUGH))
if (domCaps->virttype == VIR_DOMAIN_VIRT_KVM &&
virQEMUCapsGuestIsNative(caps->host.arch, qemuCaps->arch))
domCaps->cpu.hostPassthrough = true; domCaps->cpu.hostPassthrough = true;
domCaps->cpu.hostModel = virCPUDefCopy(qemuCaps->hostCPUModel); if (virQEMUCapsIsCPUModeSupported(qemuCaps, caps, domCaps->virttype,
VIR_CPU_MODE_HOST_MODEL))
domCaps->cpu.hostModel = virCPUDefCopy(qemuCaps->hostCPUModel);
if (qemuCaps->cpuDefinitions && if (virQEMUCapsIsCPUModeSupported(qemuCaps, caps, domCaps->virttype,
cpuGetModels(domCaps->arch, &models) >= 0) { VIR_CPU_MODE_CUSTOM)) {
filtered = virDomainCapsCPUModelsFilter(qemuCaps->cpuDefinitions, virDomainCapsCPUModelsPtr filtered = NULL;
(const char **) models); char **models = NULL;
virStringFreeList(models);
if (cpuGetModels(domCaps->arch, &models) >= 0) {
filtered = virDomainCapsCPUModelsFilter(qemuCaps->cpuDefinitions,
(const char **) models);
virStringFreeList(models);
}
domCaps->cpu.custom = filtered;
} }
domCaps->cpu.custom = filtered;
return 0; return 0;
} }

4
src/qemu/qemu_capabilities.h
View File

@ -430,6 +430,10 @@ int virQEMUCapsGetCPUDefinitions(virQEMUCapsPtr qemuCaps,
char ***names, char ***names,
size_t *count); size_t *count);
virCPUDefPtr virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps); virCPUDefPtr virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps);
bool virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qemuCaps,
virCapsPtr caps,
virDomainVirtType type,
virCPUMode mode);
const char *virQEMUCapsGetCanonicalMachine(virQEMUCapsPtr qemuCaps, const char *virQEMUCapsGetCanonicalMachine(virQEMUCapsPtr qemuCaps,
const char *name); const char *name);
int virQEMUCapsGetMachineMaxCpus(virQEMUCapsPtr qemuCaps, int virQEMUCapsGetMachineMaxCpus(virQEMUCapsPtr qemuCaps,