External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 22:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: rename gluster_debug_entry

Browse Source 
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>
This commit is contained in:
Ján Tomko 2019-12-11 22:22:31 +01:00
parent d7c5679bc1
commit adadc342c3
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/libvirtd_qemu.aug
View File

@ -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

11
src/qemu/qemu_conf.c
View File

@ -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)