提交 adf0d770 编写于 作者: L Li Zhang 提交者: Daniel P. Berrange

qemu: Remove CPU features functions calling for non-x86 platform.

CPU features are not supported on non-x86 and hasFeatures will be NULL.

This patch is to remove CPU features functions calling to avoid errors.
Signed-off-by: NLi Zhang <zhlcindy@linux.vnet.ibm.com>
上级 9ba230d4
...@@ -6447,7 +6447,6 @@ qemuBuildCpuArgStr(const virQEMUDriverPtr driver, ...@@ -6447,7 +6447,6 @@ qemuBuildCpuArgStr(const virQEMUDriverPtr driver,
(def->cpu->mode != VIR_CPU_MODE_CUSTOM || def->cpu->model)) { (def->cpu->mode != VIR_CPU_MODE_CUSTOM || def->cpu->model)) {
virCPUCompareResult cmp; virCPUCompareResult cmp;
const char *preferred; const char *preferred;
int hasSVM;
if (!host || if (!host ||
!host->model || !host->model ||
...@@ -6487,10 +6486,13 @@ qemuBuildCpuArgStr(const virQEMUDriverPtr driver, ...@@ -6487,10 +6486,13 @@ qemuBuildCpuArgStr(const virQEMUDriverPtr driver,
/* Only 'svm' requires --enable-nesting. The nested /* Only 'svm' requires --enable-nesting. The nested
* 'vmx' patches now simply hook off the CPU features * 'vmx' patches now simply hook off the CPU features
*/ */
hasSVM = cpuHasFeature(data, "svm"); if (def->os.arch == VIR_ARCH_X86_64 ||
if (hasSVM < 0) def->os.arch == VIR_ARCH_I686) {
goto cleanup; int hasSVM = cpuHasFeature(data, "svm");
*hasHwVirt = hasSVM > 0 ? true : false; if (hasSVM < 0)
goto cleanup;
*hasHwVirt = hasSVM > 0 ? true : false;
}
if (cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH) { if (cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH) {
const char *mode = virCPUModeTypeToString(cpu->mode); const char *mode = virCPUModeTypeToString(cpu->mode);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册