qemu: rename gluster_debug_entry

Remove the 'gluster' part and decouple the return from
the gluster_debug_level parsing to allow adding more options
to this section.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug
index 86bea2a32a6c15a4caa74f31324e1e60011af1f0..557b6f38f8b0d77b774ba223e2d93aa301841637 100644 (file)
--- a/src/qemu/libvirtd_qemu.aug
+++ b/src/qemu/libvirtd_qemu.aug
@@ -115,7 +115,7 @@ module Libvirtd_qemu =
 
    let nvram_entry = str_array_entry "nvram"
 
-   let gluster_debug_level_entry = int_entry "gluster_debug_level"
+   let debug_level_entry = int_entry "gluster_debug_level"
 
    let memory_entry = str_entry "memory_backing_dir"
 
@@ -152,7 +152,7 @@ module Libvirtd_qemu =
              | network_entry
              | log_entry
              | nvram_entry
-             | gluster_debug_level_entry
+             | debug_level_entry
              | memory_entry
              | vxhs_entry
              | nbd_entry

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index c07a844dfc443e4bda7943655d1ed42f53b676c6..b62dd1df52d54ca9f8386beb8b786a9f39dd4854 100644 (file)
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -796,10 +796,13 @@ virQEMUDriverConfigLoadNVRAMEntry(virQEMUDriverConfigPtr cfg,
 
 
 static int
-virQEMUDriverConfigLoadGlusterDebugEntry(virQEMUDriverConfigPtr cfg,
-                                         virConfPtr conf)
+virQEMUDriverConfigLoadDebugEntry(virQEMUDriverConfigPtr cfg,
+                                  virConfPtr conf)
 {
-    return virConfGetValueUInt(conf, "gluster_debug_level", &cfg->glusterDebugLevel);
+    if (virConfGetValueUInt(conf, "gluster_debug_level", &cfg->glusterDebugLevel) < 0)
+        return -1;
+
+    return 0;
 }
 
 
@@ -1014,7 +1017,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg,
     if (virQEMUDriverConfigLoadNVRAMEntry(cfg, conf, privileged) < 0)
         return -1;
 
-    if (virQEMUDriverConfigLoadGlusterDebugEntry(cfg, conf) < 0)
+    if (virQEMUDriverConfigLoadDebugEntry(cfg, conf) < 0)
         return -1;
 
     if (virQEMUDriverConfigLoadSecurityEntry(cfg, conf, privileged) < 0)