From nobody Mon Feb 9 19:52:59 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614971726; cv=none; d=zohomail.com; s=zohoarc; b=WgSb9XD8zgnMT2tRg4LMHPGW1YDiZM/n7OnGQGkYa0545pRlzs+zeAaVfkznXdvhejuuJLi9dc06pHNKuXfxNc5SdO7sAeHHGRjl3qcA5w6O3ZWT8KAhelIEt2tPw4FCc0n29HsFBsO0dlVmXHv9GXfyCU5upXuMFdT4auWyHRg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614971726; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/umiBwSCc49aU/Wt135G858S8V4vLOeZ6LBpeyaF2Wc=; b=kU5i2LgR6rXwpUZLRkqFUc/PbaYuIWArOtTiV2uvs422O6IO8mS2Pdz6xUrOuQKBSP48WNL70p2+dhocwfq30T0A4BDm/fQLoTQtjR2nSNpaBjqlAckQBCecJf+lE7s+PaXuIk6UcztNGyKgbBUCIpTgIgSyiTIq4aUUHpHNnfY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 16149717267751017.7099125408541; Fri, 5 Mar 2021 11:15:26 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-510-pxkStBRGP1KC3idGrd9w8g-1; Fri, 05 Mar 2021 14:15:23 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0747B1084D69; Fri, 5 Mar 2021 19:15:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D96115C1BD; Fri, 5 Mar 2021 19:15:17 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9DEAD18077BF; Fri, 5 Mar 2021 19:15:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 125JEMPF001817 for ; Fri, 5 Mar 2021 14:14:22 -0500 Received: by smtp.corp.redhat.com (Postfix) id A7CB15D6DC; Fri, 5 Mar 2021 19:14:22 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.220]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 066115D6B1 for ; Fri, 5 Mar 2021 19:14:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614971725; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=/umiBwSCc49aU/Wt135G858S8V4vLOeZ6LBpeyaF2Wc=; b=GzEhRNV0bPF1+jmG9rBFkmsstNDlC1Z1uATEBhrqf67BDOOZjKtnMwGTo60uYUmZC5EGp+ kNwA0auXM0OjVL5mlb8+JfMVOP2VaUkbyG5UdTd+xsBQBf2pRAeVYOTdYWPNbjaOd4tHCk aMkj3yCOUAhpjmpxdozzEAPqs0FOomA= X-MC-Unique: pxkStBRGP1KC3idGrd9w8g-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 10/17] conf: Rename original_memlock -> originalMemlock Date: Fri, 5 Mar 2021 20:13:57 +0100 Message-Id: <20210305191404.529903-11-abologna@redhat.com> In-Reply-To: <20210305191404.529903-1-abologna@redhat.com> References: <20210305191404.529903-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" That's more consistent with our usual naming convention. Signed-off-by: Andrea Bolognani --- 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; =20 - unsigned long long original_memlock; /* Original RLIMIT_MEMLOCK, zero = if no - * restore will be required later= */ + unsigned long long originalMemlock; /* Original RLIMIT_MEMLOCK, zero i= f no + * restore will be required later = */ }; =20 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 =3D 0; + if (!vm->originalMemlock) { + if (virProcessGetMaxMemLock(vm->pid, &(vm->originalMemlock)) <= 0) + vm->originalMemlock =3D 0; } } else { /* Once memory locking is no longer required, we can restore the * original, usually very low, limit */ - bytes =3D vm->original_memlock; - vm->original_memlock =3D 0; + bytes =3D vm->originalMemlock; + vm->originalMemlock =3D 0; } =20 if (bytes > 0 && --=20 2.26.2