From nobody Tue May 14 15:52:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1648478912; cv=none; d=zohomail.com; s=zohoarc; b=i7chbsJAvuSUjTrpCtNIg8GhE4eMJA3gCg9YYLS7rQ6wwoVberwPWs1qKefidahHvLQdvMQ7dXy1CXw+HrgROjOyh/ph9H8m/iEMP5vPIySNSOimyIfFmBe5It6z7+1z8JR+v1Fqg/9jKbD5e6Mn6sc7J9ZBlzxGi3MRLZDeUHc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648478912; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=VrOK7awdcZgBc+CMVLLlwqW8EAwRyXtskxDiTkbtsr8=; b=NfP0EN6c26mJk6vb0tkmPTXKKbKfTbDtFTPShOl4CnoJHo7IsBCXYr5M/TQS8k9JpAigxWhQKFRRbciAL8+oVduKH0U5J+s02z+7Tk8/SboALlZAJur3m2O8W0od7LIEAFKadb6/tNYlc8TRBXnkFCB5j6zCuI4oUICncsON6aU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 16484789126691021.6227550190756; Mon, 28 Mar 2022 07:48:32 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-552-li8vTBrUMkaDj3dwyMr4mg-1; Mon, 28 Mar 2022 10:48:27 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AAD0F1C06934; Mon, 28 Mar 2022 14:48:24 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 39B42409B3E0; Mon, 28 Mar 2022 14:48:24 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E190C1947BBF; Mon, 28 Mar 2022 14:48:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5593C1947BBE for ; Mon, 28 Mar 2022 14:48:23 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 30A8443F50F; Mon, 28 Mar 2022 14:48:23 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B1EC443F500 for ; Mon, 28 Mar 2022 14:48:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648478911; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=VrOK7awdcZgBc+CMVLLlwqW8EAwRyXtskxDiTkbtsr8=; b=UY+t60i+6k1Sh18InY8l1t5eNlSHqH1bLheEvL/MaIduXE9zzam930VSnvCCn0q02kVQNZ zU8SXsYcL3s6Tv6uZecJmk4ZeBTNKRF0cu0+p3lUuJnn8vcjUYh8aOxPpk6XhhMGsy6eYu cW1ZXUNdbV6nyEKggYHWd7OrhXa0Eyk= X-MC-Unique: li8vTBrUMkaDj3dwyMr4mg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH] qemu: Use real defaults for user and group in qemu.conf Date: Mon, 28 Mar 2022 16:48:20 +0200 Message-Id: <20220328144820.359214-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 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) X-ZM-MESSAGEID: 1648478914272100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The default values used by the library are determined at configure time based on a number of factors, and we should reflect them in the installed configuration file to make the comments it contains more useful. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/263 Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- src/qemu/meson.build | 30 +++++++++++++++++++++++++--- src/qemu/{qemu.conf =3D> qemu.conf.in} | 4 ++-- src/qemu/test_libvirtd_qemu.aug.in | 4 ++-- 3 files changed, 31 insertions(+), 7 deletions(-) rename src/qemu/{qemu.conf =3D> qemu.conf.in} (99%) diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 39f0f615cc..96952cc52d 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -130,12 +130,36 @@ if conf.has('WITH_QEMU') ], } =20 - virt_conf_files +=3D files('qemu.conf') + qemu_user_group_conf =3D configuration_data({ + 'QEMU_USER': qemu_user, + 'QEMU_GROUP': qemu_group, + }) + qemu_conf =3D configure_file( + input: 'qemu.conf.in', + output: 'qemu.conf', + configuration: qemu_user_group_conf, + ) + + qemu_user_group_hack_conf =3D configuration_data({ + 'QEMU_USER': qemu_user, + 'QEMU_GROUP': qemu_group, + # This hack is necessary because the output file is going to be + # used as input for another configure_file() call later, which + # will take care of substituting @CONFIG@ with useful data + 'CONFIG': '@CONFIG@', + }) + test_libvirtd_qemu_aug_tmp =3D configure_file( + input: 'test_libvirtd_qemu.aug.in', + output: 'test_libvirtd_qemu.aug.tmp', + configuration: qemu_user_group_hack_conf, + ) + + virt_conf_files +=3D qemu_conf virt_aug_files +=3D files('libvirtd_qemu.aug') virt_test_aug_files +=3D { 'name': 'test_libvirtd_qemu.aug', - 'aug': files('test_libvirtd_qemu.aug.in'), - 'conf': files('qemu.conf'), + 'aug': test_libvirtd_qemu_aug_tmp, + 'conf': qemu_conf, 'test_name': 'libvirtd_qemu', 'test_srcdir': meson.current_source_dir(), 'test_builddir': meson.current_build_dir(), diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf.in similarity index 99% rename from src/qemu/qemu.conf rename to src/qemu/qemu.conf.in index 71fd125699..04b7740136 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf.in @@ -516,11 +516,11 @@ # user =3D "+0" # Super user (uid=3D0) # user =3D "100" # A user named "100" or a user with uid=3D100 # -#user =3D "root" +#user =3D "@QEMU_USER@" =20 # The group for QEMU processes run by the system instance. It can be # specified in a similar way to user. -#group =3D "root" +#group =3D "@QEMU_GROUP@" =20 # Whether libvirt should dynamically change file ownership # to match the configured user/group above. Defaults to 1. diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qe= mu.aug.in index 20a89ade32..757d21c33f 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -47,8 +47,8 @@ module Test_libvirtd_qemu =3D { "security_driver" =3D "selinux" } { "security_default_confined" =3D "1" } { "security_require_confined" =3D "1" } -{ "user" =3D "root" } -{ "group" =3D "root" } +{ "user" =3D "@QEMU_USER@" } +{ "group" =3D "@QEMU_GROUP@" } { "dynamic_ownership" =3D "1" } { "remember_owner" =3D "1" } { "cgroup_controllers" --=20 2.35.1