From nobody Sun Feb 8 22:07:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; 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 207.211.31.81 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=1599835148; cv=none; d=zohomail.com; s=zohoarc; b=DQQlYpVwCcM9fTWgJxBZHOZQ9p3J2++hLKR96066pVkuiVSy59kpo6R5wYkhDXdlA5p3ZThmMfysuNKG+uKvBnagNjMl9MTfvqdkBj3Cbx2mJw/vpa9LnuDzQ+rsjAC6tzt0WaGdADSNVEsriRAVulKh5h7rmcv9adzp5d9sg84= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599835148; 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=xWuuspcq1xzNwq01mUCmljSanBCNU9mCr9KRMXDF9Lo=; b=aMLb8wjxNSMLBkJOC2OR8DTKw+mCFhdSVbJiMA7TVmOnr7jv6mGbI4N23g2plEEq832lrIFGa6Ry11SMknJtCsJAtfI20RoCDWFNC5Rr1O84IYILZ0IqD9C2xeUJbAbfr/L/w3Ba9LvE9ABYF+eA+AwOQgKShzyqe1ovtI4SfIA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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 [207.211.31.81]) by mx.zohomail.com with SMTPS id 159983514848739.81061242313115; Fri, 11 Sep 2020 07:39:08 -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-144-HGSz8JsnP02YokEtUA13RQ-1; Fri, 11 Sep 2020 10:38:23 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 80D078030BA; Fri, 11 Sep 2020 14:38:17 +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 5FBAC60C04; Fri, 11 Sep 2020 14:38: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 2F8A092315; Fri, 11 Sep 2020 14:38: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 08BEbvOH002432 for ; Fri, 11 Sep 2020 10:37:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id 15ED38FCA1; Fri, 11 Sep 2020 14:37:57 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F4448FCA5 for ; Fri, 11 Sep 2020 14:37:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599835147; 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=xWuuspcq1xzNwq01mUCmljSanBCNU9mCr9KRMXDF9Lo=; b=OfZsni8KHvo7R1M21L5/bkEeeYMccqwh3hHlDnwypc4fDTsVee2Is97Yo/HA2Dncy+96oK 1Kc1CJp8aJGyQB9Q6mWeUhFRsIQ6qU+PiWBapJlSMSJDE61yRP0Il9cGII2lxzPGCctvZ1 e2OorED77LRpvJSgleiqOffftX8XOQk= X-MC-Unique: HGSz8JsnP02YokEtUA13RQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 13/17] qemuDomainSecretHostdevPrepare: remove Date: Fri, 11 Sep 2020 16:37:31 +0200 Message-Id: <560c3f5b276391b271e9c2dd113263d1ef264aba.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.79 on 10.5.11.12 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" The function is no longer used once we setup per-hostdev data. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 50 ------------------------------------------ src/qemu/qemu_domain.h | 4 ---- 2 files changed, 54 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 1289201764..a751d0c205 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1381,56 +1381,6 @@ qemuDomainSecretHostdevDestroy(virDomainHostdevDefPt= r hostdev) } -/* qemuDomainSecretHostdevPrepare: - * @priv: pointer to domain private object - * @hostdev: Pointer to a hostdev definition - * - * For the right host device, generate the qemuDomainSecretInfo structure. - * - * Returns 0 on success, -1 on failure - */ -int -qemuDomainSecretHostdevPrepare(qemuDomainObjPrivatePtr priv, - virDomainHostdevDefPtr hostdev) -{ - if (virHostdevIsSCSIDevice(hostdev)) { - virDomainHostdevSubsysSCSIPtr scsisrc =3D &hostdev->source.subsys.= u.scsi; - virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc =3D &scsisrc->u.iscsi; - virStorageSourcePtr src =3D iscsisrc->src; - - if (scsisrc->protocol =3D=3D VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE= _ISCSI && - src->auth) { - bool iscsiHasPS =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_I= SCSI_PASSWORD_SECRET); - virSecretUsageType usageType =3D VIR_SECRET_USAGE_TYPE_ISCSI; - qemuDomainStorageSourcePrivatePtr srcPriv; - - if (!(src->privateData =3D qemuDomainStorageSourcePrivateNew()= )) - return -1; - - srcPriv =3D QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); - - if (!qemuDomainSupportsEncryptedSecret(priv) || !iscsiHasPS) { - srcPriv->secinfo =3D qemuDomainSecretInfoNewPlain(usageTyp= e, - src->auth-= >username, - &src->auth= ->seclookupdef); - } else { - srcPriv->secinfo =3D qemuDomainSecretAESSetupFromSecret(pr= iv, - host= dev->info->alias, - NULL, - usag= eType, - src-= >auth->username, - &src= ->auth->seclookupdef); - } - - if (!srcPriv->secinfo) - return -1; - } - } - - return 0; -} - - void qemuDomainSecretChardevDestroy(virDomainChrSourceDefPtr dev) { diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 6abd896119..77d6bfc810 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -851,10 +851,6 @@ qemuDomainSecretInfoTLSNew(qemuDomainObjPrivatePtr pri= v, void qemuDomainSecretHostdevDestroy(virDomainHostdevDefPtr disk) ATTRIBUTE_NONNULL(1); -int qemuDomainSecretHostdevPrepare(qemuDomainObjPrivatePtr priv, - virDomainHostdevDefPtr hostdev) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); - void qemuDomainSecretChardevDestroy(virDomainChrSourceDefPtr dev) ATTRIBUTE_NONNULL(1); --=20 2.26.2