From nobody Fri Oct 18 08:46:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1720171385; cv=none; d=zohomail.com; s=zohoarc; b=nbNIb9h6mndq8UwbUtu0t2a6VPIvixap7iY2GKZWA/5WsvdrS0NbzIwWiUFdZKvaUeLbfy3YJf3r5VfNUi+jF7yh1d+fLhFFVYflph7Yxma3q7evuh5ZaL1sHXod8Te+dbR418ikxOK+eR+ZJzKKwccQT6k5zmOBPsDS5oJikBA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1720171385; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=0MtGE0PTyHUkjSyNDPl0R4I2tAL/O7420LoMp+X6a4c=; b=GnVMQ4BqWDYfR1uuQ1/A5hU7UNxh/h6wmlz5WfRZsD7TLinL04DUmwCBBcRvyeuZviGswjiuw4CimfaCWr8eGcdLgv8jpVdjBHM5SMLmIoLi0k9Sy8PEmXUzEESK6Far8ZlNAootkHEnihbW9BfRAaYOJ0h/6xC/OebEnwTIp+k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1720171385110915.2854303235878; Fri, 5 Jul 2024 02:23:05 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1E065127D; Fri, 5 Jul 2024 05:23:04 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 7477C1552; Fri, 5 Jul 2024 05:21:59 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id A4E3D11E1; Fri, 5 Jul 2024 04:02:22 -0400 (EDT) Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 18B651202 for ; Fri, 5 Jul 2024 04:02:22 -0400 (EDT) Received: by mail-oi1-f182.google.com with SMTP id 5614622812f47-3d562882f4cso794402b6e.3 for ; Fri, 05 Jul 2024 01:02:22 -0700 (PDT) Received: from D491Q0MXRG.bytedance.net ([139.177.225.246]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-72c6c8ebf1asm10793757a12.74.2024.07.05.01.02.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 05 Jul 2024 01:02:19 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1720166540; x=1720771340; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZJHBkn29Bx6/7u5dr/DHjID6yat4KS5+fcbkhocRYO0=; b=Z1LZyvMHWV+mKilslEmVPFT3vPQfTrD6nRZhoyr/jjX24IovCbCfmwyRtyQDCCpkvu ucYenoNufGwKiHZUCwhHWrrRU2Vm5a6qU7qGe+krDYCLuJyHvht3l7UgmKlFbkIn46ac GkMA/qa2ZOFprFKPM2Rdwab3IuKJDjS9kqVx/vhanSei25w1jkpZoivWNsDD3eOc9KJg WudRVFfRKjk5rG66jeH4fV6g/fhTZfZySKCuJWw/09TCcDO68ev3XFQ6vV3YeA0iO/DP i8MuE/q9lnlJFo+C/oQrFDAeyX85joAxAiZD/UOW6uiuyZCi2OVh9yGMx7PDW1NX6SB3 53/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720166540; x=1720771340; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZJHBkn29Bx6/7u5dr/DHjID6yat4KS5+fcbkhocRYO0=; b=X6neUeNFyu4zw7Os8B7DR7vTbpCDJDL8RE4ziB5G8Kw8pRl9batVSxzj8pf++7mV5Z hjXPnLoqE6mk1MW4rR/e2qtn0n7IH9LAkknlE0ShnijWirZ5I+kgEJr0h6TTiopMeHKh Oc8/W/behrD9MKq0fP+N2oCtpOl83d+7Aj+rQswzLPo5TsAFv7akB1jvaU+AEn5iitrz knQf79NcPMUs3kUbcVSLp9hZsaoaYcNX4owkVSO1xkcRwRZajdsdeq1na/D7Y9AkbbVL IhXNTMJPNDD/JEAxE8sZ/OBTwF6h5sagJpF8gDFMEDtQNdT5pwXkx5irqGLHJzjbsP6t dMXw== X-Gm-Message-State: AOJu0Yxt+4f801u+TCx96F2pNPFqXfbijr8xOTwvmjnis4soS7CaiBK9 EQQAfjavnLzw4knJNLr1YxurG7kY/YjoK+9n5LG/jIXbC3lhw6IYXiJsaikmHJvAJyfxbzc0yDE A X-Google-Smtp-Source: AGHT+IGDHMvy0vO4lKVNuSTMzw95jFkXGw1caNg4HTg6vVHpftcp0OM5F3RF1Bv0nq4JFDxKCyxJKQ== X-Received: by 2002:a05:6808:181e:b0:3d5:65b1:22a0 with SMTP id 5614622812f47-3d914c437cemr4489998b6e.11.1720166540236; Fri, 05 Jul 2024 01:02:20 -0700 (PDT) To: devel@lists.libvirt.org, mprivozn@redhat.com Subject: [PATCH v3 2/2] security_manager: Remove redundant qemuSecurityGetNested() call Date: Fri, 5 Jul 2024 16:01:58 +0800 Message-Id: <20240705080158.92603-3-hongmianquan@bytedance.com> X-Mailer: git-send-email 2.32.1 (Apple Git-133) In-Reply-To: <20240705080158.92603-1-hongmianquan@bytedance.com> References: <20240705080158.92603-1-hongmianquan@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MailFrom: hongmianquan@bytedance.com X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0 Message-ID-Hash: J25KVN5I5TZ2OVMRUQMSWSIPCOL42VHO X-Message-ID-Hash: J25KVN5I5TZ2OVMRUQMSWSIPCOL42VHO X-Mailman-Approved-At: Fri, 05 Jul 2024 09:21:53 -0400 CC: xieyongji@bytedance.com, yinyipeng@bytedance.com, hongmianquan X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: hongmianquan via Devel Reply-To: hongmianquan X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1720171385894100001 Content-Type: text/plain; charset="utf-8" This commit removes the redundant call to qemuSecurityGetNested() in qemuStateInitialize(). In qemuSecurityGetModel(), the first security manager in the stack is already used by default, so this change helps to simplify the code. Signed-off-by: hongmianquan --- src/qemu/qemu_driver.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9d4958789c..4831490456 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -650,7 +650,6 @@ qemuStateInitialize(bool privileged, bool autostart =3D true; size_t i; const char *defsecmodel =3D NULL; - g_autofree virSecurityManager **sec_managers =3D NULL; g_autoptr(virIdentity) identity =3D virIdentityGetCurrent(); =20 qemu_driver =3D g_new0(virQEMUDriver, 1); @@ -925,11 +924,8 @@ qemuStateInitialize(bool privileged, if (!qemu_driver->qemuCapsCache) goto error; =20 - if (!(sec_managers =3D qemuSecurityGetNested(qemu_driver->securityMana= ger))) - goto error; - - if (sec_managers[0] !=3D NULL) - defsecmodel =3D qemuSecurityGetModel(sec_managers[0]); + if (qemu_driver->securityManager !=3D NULL) + defsecmodel =3D qemuSecurityGetModel(qemu_driver->securityManager); =20 if (!(qemu_driver->xmlopt =3D virQEMUDriverCreateXMLConf(qemu_driver, defsecmodel))) --=20 2.20.1