conf: Rename original_memlock -> originalMemlock

That's more consistent with our usual naming convention.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 881d64bae9812f3cc7c89db39869d75ae0b417cf..39b678af8086b81105fecae6afdeb8b8b30804db 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2808,8 +2808,8 @@ struct _virDomainObj {
     size_t ndeprecations;
     char **deprecations;
 
-    unsigned long long original_memlock; /* Original RLIMIT_MEMLOCK, zero if no
-                                          * restore will be required later */
+    unsigned long long originalMemlock; /* Original RLIMIT_MEMLOCK, zero if no
+                                         * restore will be required later */
 };
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainObj, virObjectUnref);

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 54d8bd0d3a878a6c49a282d558764fa844c809df..73e2473dce7260945ed173d3a3575e56689987f8 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -9248,15 +9248,15 @@ qemuDomainAdjustMaxMemLock(virDomainObjPtr vm,
          * value so that we can restore it once memory locking is no longer
          * required. Failing to obtain the current limit is not a critical
          * failure, it just means we'll be unable to lower it later */
-        if (!vm->original_memlock) {
-            if (virProcessGetMaxMemLock(vm->pid, &(vm->original_memlock)) < 0)
-                vm->original_memlock = 0;
+        if (!vm->originalMemlock) {
+            if (virProcessGetMaxMemLock(vm->pid, &(vm->originalMemlock)) < 0)
+                vm->originalMemlock = 0;
         }
     } else {
         /* Once memory locking is no longer required, we can restore the
          * original, usually very low, limit */
-        bytes = vm->original_memlock;
-        vm->original_memlock = 0;
+        bytes = vm->originalMemlock;
+        vm->originalMemlock = 0;
     }
 
     if (bytes > 0 &&