From nobody Tue Feb 10 04:16:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1599835178; cv=none; d=zohomail.com; s=zohoarc; b=m2rJoK5xAS6lJvB8TqBL7iierlkvSqDkgPXfduqPHPoZjoK9dAlnArW+/RtzB71p5z5gKQszWWWYDxfsMSrHmCe+w22ENtg15dLDQbe4E/+QnnWq8oOdqDNCeBI+xaaxpUOmOKXZm5d/KXypLVYVJEg2f7duNH5ynQtD5JuWhEY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599835178; 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=xm+XdK0WpjsnpbmSJQ07xu6R4856/OuDFVOOXRjnleE=; b=VGDKqSM40vZu5s5ElBhW42HolMBaz65dNZVZ+DF4fHKjUTSBFjJ6HictkqgrgtPJIgrKHgGwNu62TA5XNkmlBsqEC+shOaApbWu+M8ksxeG5tllFTdLsD4+TTL+mE54J7fR1757MJW12MgCtmctOlpZVeMTWrdjE4jbUnrs83Fk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1599835178333766.7200058415867; Fri, 11 Sep 2020 07:39:38 -0700 (PDT) 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-284-xC1X5GgBP1C7k9tJZppRvw-1; Fri, 11 Sep 2020 10:39:35 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CF00F18B9F4B; Fri, 11 Sep 2020 14:39:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A54E71002D49; Fri, 11 Sep 2020 14:39:29 +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 264AD9230F; Fri, 11 Sep 2020 14:39:29 +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 08BEbhTC002309 for ; Fri, 11 Sep 2020 10:37:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7E9188FCA3; Fri, 11 Sep 2020 14:37:43 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA9EA8FCA1 for ; Fri, 11 Sep 2020 14:37:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599835177; 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=xm+XdK0WpjsnpbmSJQ07xu6R4856/OuDFVOOXRjnleE=; b=Bui4OFZokGXdMueBnNmKSJJMXZOu+52iGvG8Z5u6+CvSHkF7iVDCsiQvEM/9RoWiEHDtHU vklXkiA6JTSoWdakUTWyzXjQt18rQSKCvUQ/Wu3q6BxccnOoI8vDUcfg5KKlfJ2yVOUn2L tQFAIaEVOwTEj3r9m41Neh4aPKKhis8= X-MC-Unique: xC1X5GgBP1C7k9tJZppRvw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 01/17] virDomainHostdevSubsysSCSIiSCSIClear: Inline contents into only caller Date: Fri, 11 Sep 2020 16:37:19 +0200 Message-Id: <15734d6a2439aa34bd4816bb23c143811cc9db52.1599834862.git.pkrempa@redhat.com> In-Reply-To: References: 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.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" There's just one caller for the function. Move the code into the caller. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 72ac4f4191..acbc3f1c1e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3011,24 +3011,15 @@ virDomainHostdevDefNew(void) } -static void -virDomainHostdevSubsysSCSIiSCSIClear(virDomainHostdevSubsysSCSIiSCSIPtr is= csisrc) -{ - if (!iscsisrc) - return; - - virObjectUnref(iscsisrc->src); - iscsisrc->src =3D NULL; -} - - static void virDomainHostdevSubsysSCSIClear(virDomainHostdevSubsysSCSIPtr scsisrc) { - if (scsisrc->protocol =3D=3D VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISC= SI) - virDomainHostdevSubsysSCSIiSCSIClear(&scsisrc->u.iscsi); - else + if (scsisrc->protocol =3D=3D VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISC= SI) { + virObjectUnref(scsisrc->u.iscsi.src); + scsisrc->u.iscsi.src =3D NULL; + } else { VIR_FREE(scsisrc->u.host.adapter); + } } --=20 2.26.2