External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu_s390: Don't check match attribute for host-model CPUs

Browse Source 
The match attribute is only relevant for custom mode CPUs. Reporting
failure when match == 'minimum' regardless on CPU mode can cause
unexpected failures. We should only report the error for custom CPUs. In
fact, calling virCPUs390Update on a custom mode CPU should always report
an error as optional features are not supported on s390 either.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark 2019-11-12 15:27:45 +01:00
parent af8e39921a
commit 0a24331c6e
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cpu/cpu_s390.c
View File

@ -49,15 +49,15 @@ virCPUs390Update(virCPUDefPtr guest,
int ret = -1; int ret = -1;
size_t i; size_t i;
if (guest->match == VIR_CPU_MATCH_MINIMUM) { if (guest->mode == VIR_CPU_MODE_CUSTOM) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, if (guest->match == VIR_CPU_MATCH_MINIMUM) {
_("match mode %s not supported"), virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
virCPUMatchTypeToString(guest->match)); _("match mode %s not supported"),
goto cleanup; virCPUMatchTypeToString(guest->match));
} } else {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
if (guest->mode != VIR_CPU_MODE_HOST_MODEL) { _("optional CPU features are not supported"));
ret = 0; }
goto cleanup; goto cleanup;
} }