NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

cpu: Make models array in virCPUTranslate constant

Browse Source 
The API doesn't change the array so let's make it constant.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark
2016-11-10 09:49:06 +01:00
parent adf44c7bae
commit 2a2ce08a6d
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cpu/cpu.c
View File

@@ -896,7 +896,7 @@ virCPUGetModels(virArch arch, char ***models)
int
virCPUTranslate(virArch arch,
virCPUDefPtr cpu,
char **models,
const char **models,
unsigned int nmodels)
{
struct cpuArchDriver *driver;
@@ -911,7 +911,7 @@ virCPUTranslate(virArch arch,
cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH)
return 0;
if (virCPUModelIsAllowed(cpu->model, (const char **) models, nmodels))
if (virCPUModelIsAllowed(cpu->model, models, nmodels))
return 0;
if (cpu->fallback != VIR_CPU_FALLBACK_ALLOW) {
@@ -928,7 +928,7 @@ virCPUTranslate(virArch arch,
return -1;
}
if (driver->translate(cpu, (const char **) models, nmodels) < 0)
if (driver->translate(cpu, models, nmodels) < 0)
return -1;
VIR_DEBUG("model=%s", NULLSTR(cpu->model));

2
src/cpu/cpu.h
View File

@@ -225,7 +225,7 @@ virCPUGetModels(virArch arch, char ***models);
int
virCPUTranslate(virArch arch,
virCPUDefPtr cpu,
char **models,
const char **models,
unsigned int nmodels)
ATTRIBUTE_NONNULL(2);

3
src/qemu/qemu_process.c
View File

@@ -5083,7 +5083,8 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def,
goto cleanup;
if (virQEMUCapsGetCPUDefinitions(qemuCaps, &models, &nmodels) < 0 ||
virCPUTranslate(def->os.arch, def->cpu, models, nmodels) < 0)
virCPUTranslate(def->os.arch, def->cpu,
(const char **) models, nmodels) < 0)
goto cleanup;
def->cpu->fallback = VIR_CPU_FALLBACK_FORBID;