[libvirt] [PATCH v2 5/5] qemu_process.c: removing qemuProcessStartValidateXML
Commit ("qemu_domain.c: moving maxCpu validation to
qemuDomainDefValidate") shortened the code of qemuProcessStartValidateXML.
The function is called only by qemuProcessStartValidate, in the
same file, and its code is now a single check that calls virDomainDefValidate.
Instead of leaving a function call just to execute a single check,
this patch puts the check in the body of qemuProcessStartValidate in the
place where qemuProcessStartValidateXML was being called. The function can
now be removed.
Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
---
src/qemu/qemu_process.c | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 0d1dc7ed35..c9ef2050a1 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5114,23 +5114,6 @@ qemuProcessStartValidateDisks(virDomainObjPtr vm,
}
-static int
-qemuProcessStartValidateXML(virQEMUDriverPtr driver,
- virDomainObjPtr vm,
- virCapsPtr caps,
- unsigned int flags)
-{
- /* checks below should not be executed when starting a qemu process for a
- * VM that was running before (migration, snapshots, save). It's more
- * important to start such VM than keep the configuration clean */
- if ((flags & VIR_QEMU_PROCESS_START_NEW) &&
- virDomainDefValidate(vm->def, caps, 0, driver->xmlopt) < 0)
- return -1;
-
- return 0;
-}
-
-
/**
* qemuProcessStartValidate:
* @vm: domain object
@@ -5169,7 +5152,11 @@ qemuProcessStartValidate(virQEMUDriverPtr driver,
}
- if (qemuProcessStartValidateXML(driver, vm, caps, flags) < 0)
+ /* Checks below should not be executed when starting a qemu process for a
+ * VM that was running before (migration, snapshots, save). It's more
+ * important to start such VM than keep the configuration clean */
+ if ((flags & VIR_QEMU_PROCESS_START_NEW) &&
+ virDomainDefValidate(vm->def, caps, 0, driver->xmlopt) < 0)
return -1;
if (qemuProcessStartValidateGraphics(vm) < 0)
--
2.19.1