[libvirt] [PATCH 2/7] qemu: Add qemuProcessVerifyCPU
Separated from qemuProcessUpdateLiveGuestCPU. The function makes sure
a guest CPU provides all features required by a domain definition.
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
src/qemu/qemu_process.c | 35 ++++++++++++++++++++++++++++-------
1 file changed, 28 insertions(+), 7 deletions(-)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index b2d27b6be..198f68d93 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3986,6 +3986,31 @@ qemuProcessFetchGuestCPU(virQEMUDriverPtr driver,
static int
+qemuProcessVerifyCPU(virDomainObjPtr vm,
+ virCPUDataPtr cpu)
+{
+ virDomainDefPtr def = vm->def;
+
+ if (!cpu)
+ return 0;
+
+ if (qemuProcessVerifyKVMFeatures(def, cpu) < 0 ||
+ qemuProcessVerifyHypervFeatures(def, cpu) < 0)
+ return -1;
+
+ if (!def->cpu ||
+ (def->cpu->mode == VIR_CPU_MODE_CUSTOM &&
+ !def->cpu->model))
+ return 0;
+
+ if (qemuProcessVerifyCPUFeatures(def, cpu) < 0)
+ return -1;
+
+ return 0;
+}
+
+
+static int
qemuProcessUpdateLiveGuestCPU(virQEMUDriverPtr driver,
virDomainObjPtr vm,
qemuDomainAsyncJob asyncJob)
@@ -4001,11 +4026,10 @@ qemuProcessUpdateLiveGuestCPU(virQEMUDriverPtr driver,
if (qemuProcessFetchGuestCPU(driver, vm, asyncJob, &cpu, &disabled) < 0)
goto cleanup;
- if (cpu) {
- if (qemuProcessVerifyKVMFeatures(def, cpu) < 0 ||
- qemuProcessVerifyHypervFeatures(def, cpu) < 0)
- goto cleanup;
+ if (qemuProcessVerifyCPU(vm, cpu) < 0)
+ goto cleanup;
+ if (cpu) {
if (!def->cpu ||
(def->cpu->mode == VIR_CPU_MODE_CUSTOM &&
!def->cpu->model)) {
@@ -4013,9 +4037,6 @@ qemuProcessUpdateLiveGuestCPU(virQEMUDriverPtr driver,
goto cleanup;
}
- if (qemuProcessVerifyCPUFeatures(def, cpu) < 0)
- goto cleanup;
-
if (!(orig = virCPUDefCopy(def->cpu)))
goto cleanup;
--
2.13.2