External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 14:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu: Bugfix for s390 CPU driver to return a host CPU model

Browse Source 
The curent libvirt CPU driver for s390 does not return a host CPU model.
This patch returns 'host' according to the other platforms that would
not decode any CPU model.
This is an intermediate bugfix due to a discussion on OpenStack mailing
list. The final patch introducing the CPU model support for s390x will
exchange the hard-coded decode method.

Signed-off-by: Daniel Hansel <daniel.hansel@linux.vnet.ibm.com>
This commit is contained in:
Daniel Hansel 2014-12-19 15:49:35 +01:00 committed by Ján Tomko
parent b789db36ae
commit 5940301889
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cpu/cpu_s390.c
View File

@ -25,6 +25,7 @@
#include <config.h>
#include "viralloc.h"
#include "virstring.h"
#include "cpu.h"
@ -47,7 +48,7 @@ s390NodeData(virArch arch)
static int
s390Decode(virCPUDefPtr cpu ATTRIBUTE_UNUSED,
s390Decode(virCPUDefPtr cpu,
const virCPUData *data ATTRIBUTE_UNUSED,
const char **models ATTRIBUTE_UNUSED,
unsigned int nmodels ATTRIBUTE_UNUSED,
@ -57,6 +58,10 @@ s390Decode(virCPUDefPtr cpu ATTRIBUTE_UNUSED,
virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, -1);
if (cpu->model == NULL &&
VIR_STRDUP(cpu->model, "host") < 0)
return -1;
return 0;
}