[PATCH 6/9] qemu: Move logic from qemuProcessStartValidateShmem to qemuValidateDomainDeviceDefShmem

[Peter Krempa via Devel]

From: Peter Krempa <pkre...@redhat.com>

Move the check to the appropriate central place.

Signed-off-by: Peter Krempa <pkre...@redhat.com>
---
 src/qemu/qemu_process.c  | 23 -----------------------
 src/qemu/qemu_validate.c |  7 +++++++
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index c13a284473..9fbb03ee8b 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5580,26 +5580,6 @@ qemuProcessStartValidateGraphics(virDomainObj *vm)
 }


-static int
-qemuProcessStartValidateShmem(virDomainObj *vm)
-{
-    size_t i;
-
-    for (i = 0; i < vm->def->nshmems; i++) {
-        virDomainShmemDef *shmem = vm->def->shmems[i];
-
-        if (strchr(shmem->name, '/')) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("shmem name '%1$s' must not contain '/'"),
-                           shmem->name);
-            return -1;
-        }
-    }
-
-    return 0;
-}
-
-
 /* 250 parts per million (ppm) is a half of NTP threshold */
 #define TSC_TOLERANCE 250

@@ -5707,9 +5687,6 @@ qemuProcessStartValidate(virQEMUDriver *driver,
     if (qemuProcessStartValidateGraphics(vm) < 0)
         return -1;

-    if (qemuProcessStartValidateShmem(vm) < 0)
-        return -1;
-
     if (vm->def->cpu) {
         if (virCPUValidateFeatures(vm->def->os.arch, vm->def->cpu) < 0)
             return -1;
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index e45f636418..0e7dd3fc58 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -5472,6 +5472,13 @@ static int
 qemuValidateDomainDeviceDefShmem(virDomainShmemDef *shmem,
                                  virQEMUCaps *qemuCaps)
 {
+    if (strchr(shmem->name, '/')) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("shmem name '%1$s' must not contain '/'"),
+                       shmem->name);
+        return -1;
+    }
+
     if (shmem->size > 0) {
         if (shmem->size < 1024 * 1024 ||
             !VIR_IS_POW2(shmem->size)) {
-- 
2.49.0