openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "qemu: Pass migratable host model to virCPUUpdate" 

This reverts commit 959e72d323 which was
pushed accidentally.
This commit is contained in:
Jiri Denemark 2017-04-07 13:17:57 +02:00
parent 8a1c7ed6d5
commit 0268df4020
5 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/qemu/qemu_capabilities.c
View File

@ -2446,20 +2446,12 @@ virQEMUCapsGetCPUDefinitions(virQEMUCapsPtr qemuCaps,
virCPUDefPtr virCPUDefPtr
virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps, virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps,
virDomainVirtType type, virDomainVirtType type)
bool migratable)
{ {
virQEMUCapsCPUModelPtr model;
if (type == VIR_DOMAIN_VIRT_KVM) if (type == VIR_DOMAIN_VIRT_KVM)
model = &qemuCaps->hostCPU.kvm; return qemuCaps->hostCPU.kvm.full;
else else
model = &qemuCaps->hostCPU.tcg; return qemuCaps->hostCPU.tcg.full;
if (migratable)
return model->migratable;
else
return model->full;
} }
@ -2477,7 +2469,7 @@ virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qemuCaps,
virQEMUCapsGuestIsNative(caps->host.arch, qemuCaps->arch); virQEMUCapsGuestIsNative(caps->host.arch, qemuCaps->arch);
case VIR_CPU_MODE_HOST_MODEL: case VIR_CPU_MODE_HOST_MODEL:
return !!virQEMUCapsGetHostModel(qemuCaps, type, false); return !!virQEMUCapsGetHostModel(qemuCaps, type);
case VIR_CPU_MODE_CUSTOM: case VIR_CPU_MODE_CUSTOM:
if (type == VIR_DOMAIN_VIRT_KVM) if (type == VIR_DOMAIN_VIRT_KVM)
@ -5542,8 +5534,7 @@ virQEMUCapsFillDomainCPUCaps(virCapsPtr caps,
if (virQEMUCapsIsCPUModeSupported(qemuCaps, caps, domCaps->virttype, if (virQEMUCapsIsCPUModeSupported(qemuCaps, caps, domCaps->virttype,
VIR_CPU_MODE_HOST_MODEL)) { VIR_CPU_MODE_HOST_MODEL)) {
virCPUDefPtr cpu = virQEMUCapsGetHostModel(qemuCaps, domCaps->virttype, virCPUDefPtr cpu = virQEMUCapsGetHostModel(qemuCaps, domCaps->virttype);
false);
domCaps->cpu.hostModel = virCPUDefCopy(cpu); domCaps->cpu.hostModel = virCPUDefCopy(cpu);
} }

3
src/qemu/qemu_capabilities.h
View File

@ -450,8 +450,7 @@ int virQEMUCapsGetCPUDefinitions(virQEMUCapsPtr qemuCaps,
char ***names, char ***names,
size_t *count); size_t *count);
virCPUDefPtr virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps, virCPUDefPtr virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps,
virDomainVirtType type, virDomainVirtType type);
bool migratable);
bool virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qemuCaps, bool virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qemuCaps,
virCapsPtr caps, virCapsPtr caps,
virDomainVirtType type, virDomainVirtType type,

2
src/qemu/qemu_command.c
View File

@ -6887,7 +6887,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
if (def->cpu->mode == VIR_CPU_MODE_CUSTOM) if (def->cpu->mode == VIR_CPU_MODE_CUSTOM)
cpuDef = def->cpu; cpuDef = def->cpu;
else if (def->cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH) else if (def->cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH)
cpuDef = virQEMUCapsGetHostModel(qemuCaps, def->virtType, false); cpuDef = virQEMUCapsGetHostModel(qemuCaps, def->virtType);
if (cpuDef) { if (cpuDef) {
int svm = virCPUCheckFeature(def->os.arch, cpuDef, "svm"); int svm = virCPUCheckFeature(def->os.arch, cpuDef, "svm");

4
src/qemu/qemu_process.c
View File

@ -5304,12 +5304,12 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def,
if (def->cpu->check == VIR_CPU_CHECK_PARTIAL && if (def->cpu->check == VIR_CPU_CHECK_PARTIAL &&
virCPUCompare(caps->host.arch, virCPUCompare(caps->host.arch,
virQEMUCapsGetHostModel(qemuCaps, def->virtType, false), virQEMUCapsGetHostModel(qemuCaps, def->virtType),
def->cpu, true) < 0) def->cpu, true) < 0)
return -1; return -1;
if (virCPUUpdate(def->os.arch, def->cpu, if (virCPUUpdate(def->os.arch, def->cpu,
virQEMUCapsGetHostModel(qemuCaps, def->virtType, true)) < 0) virQEMUCapsGetHostModel(qemuCaps, def->virtType)) < 0)
goto cleanup; goto cleanup;
if (virQEMUCapsGetCPUDefinitions(qemuCaps, def->virtType, if (virQEMUCapsGetCPUDefinitions(qemuCaps, def->virtType,

7
tests/cputest.c
View File

@ -393,7 +393,6 @@ cpuTestUpdate(const void *arg)
const struct data *data = arg; const struct data *data = arg;
int ret = -1; int ret = -1;
virCPUDefPtr host = NULL; virCPUDefPtr host = NULL;
virCPUDefPtr migHost = NULL;
virCPUDefPtr cpu = NULL; virCPUDefPtr cpu = NULL;
char *result = NULL; char *result = NULL;
@ -401,10 +400,7 @@ cpuTestUpdate(const void *arg)
!(cpu = cpuTestLoadXML(data->arch, data->name))) !(cpu = cpuTestLoadXML(data->arch, data->name)))
goto cleanup; goto cleanup;
if (!(migHost = virCPUCopyMigratable(data->arch, host))) if (virCPUUpdate(host->arch, cpu, host) < 0)
goto cleanup;
if (virCPUUpdate(host->arch, cpu, migHost) < 0)
goto cleanup; goto cleanup;
if (virAsprintf(&result, "%s+%s", data->host, data->name) < 0) if (virAsprintf(&result, "%s+%s", data->host, data->name) < 0)
@ -415,7 +411,6 @@ cpuTestUpdate(const void *arg)
cleanup: cleanup:
virCPUDefFree(host); virCPUDefFree(host);
virCPUDefFree(cpu); virCPUDefFree(cpu);
virCPUDefFree(migHost);
VIR_FREE(result); VIR_FREE(result);
return ret; return ret;
} }