[libvirt PATCH 10/17] conf: Rename original_memlock -> originalMemlock

That's more consistent with our usual naming convention. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- src/conf/domain_conf.h | 4 ++-- src/qemu/qemu_domain.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 930eed60de..7d208d881c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2807,8 +2807,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 54d8bd0d3a..73e2473dce 100644 --- 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 && -- 2.26.2