From nobody Sun Feb 8 17:47:06 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=1583771036; cv=none; d=zohomail.com; s=zohoarc; b=QNCn7F5Fi4m5If7GaF9A4iyEs0sCWGlslCBPYOTy6ugSu0cltnc8nUrFUeP2E5LjydB5FNzjDtSND6M/rgALzu+1kFPvBKwJRlyUWVpPaHV1C4o7A3xoEyYFHUHEwPvmYRffnm794RjUIU86wSbrsLV7mUZXY7DeLVBGw/ENue4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583771036; 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=Igo/FqcTZ9zEEiwVgXOtpaARTxMqO9tsZG7a2KY+5E4=; b=W9ZPfIYC3eCQFxntfo3BM4Yrd9KG2jQZozFOM9IZfsIS7zTETPCEaQbVPNgPsixj8+KzbkcOmxh2Z5D+T2BqKOijYu8PzbCRqNej9NzdYYiUrfqUv21OYo1DKzB/QKUFoGTdHtjU6ZduAK41AbxB6MsPSpjhzZW0Y58PZwED9Ys= 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 1583771036115891.5963344921552; Mon, 9 Mar 2020 09:23:56 -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-400-atv9EhyUPY-oxKAajK-jbg-1; Mon, 09 Mar 2020 12:23:52 -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 DECD18010EE; Mon, 9 Mar 2020 16:23:46 +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 B66DD1001DDE; Mon, 9 Mar 2020 16:23:46 +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 6B1A0180887A; Mon, 9 Mar 2020 16:23:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 029GNM8H020750 for ; Mon, 9 Mar 2020 12:23:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1C2549051C; Mon, 9 Mar 2020 16:23:22 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9778A90A03 for ; Mon, 9 Mar 2020 16:23:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583771034; 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=Igo/FqcTZ9zEEiwVgXOtpaARTxMqO9tsZG7a2KY+5E4=; b=aJ7eCpSYIOzLpkIniPGUZp45jkFJp68f3Ro88uXj8ucntquwx1pvDDAfuy6ba8BKbTDxq8 nUAr6Rux2Pw7Pgp+ejXWuuN3u14iuPB8LlrWN79As+s4NMk+uGyqXEaofEtDGDus2Vb+hx tpwQg1IONW8P5Xs+zBrCMucivjQxcEs= X-MC-Unique: atv9EhyUPY-oxKAajK-jbg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 09/30] qemu: Split out initialization of secrets for 'iscsi' hostdevs Date: Mon, 9 Mar 2020 17:22:49 +0100 Message-Id: <0ab4d2583ea88cf360c4a344c8a4934ee4efd789.1583770683.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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 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" Currently we don't have infrastructure to remember the secret aliases for hostdevs. Since an upcomming patch is going to change aliases for the disks, initialize the iscsi hostdevs separately so that we can keep the alias. At the same time let's use qemuAliasForSecret instead of qemuDomainGetSecretAESAlias when unplugging the iscsi hostdev. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 25 +++++++++++++++++++++++-- src/qemu/qemu_hotplug.c | 2 +- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 72e651ecee..c2218871a7 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1835,8 +1835,29 @@ qemuDomainSecretHostdevPrepare(qemuDomainObjPrivateP= tr priv, if (scsisrc->protocol =3D=3D VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE= _ISCSI && src->auth) { - if (qemuDomainSecretStorageSourcePrepare(priv, src, - hostdev->info->alias,= NULL) < 0) + 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, + usag= eType, + src-= >auth->username, + &src= ->auth->seclookupdef, + fals= e); + } + + if (!srcPriv->secinfo) return -1; } } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index ca18bb9e5f..e804053933 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4471,7 +4471,7 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, if (scsisrc->protocol =3D=3D VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE= _ISCSI && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_ISCSI_PASSWORD_SECRET= ) && qemuDomainStorageSourceHasAuth(iscsisrc->src)) { - if (!(objAlias =3D qemuDomainGetSecretAESAlias(hostdev->info->= alias, false))) + if (!(objAlias =3D qemuAliasForSecret(hostdev->info->alias, NU= LL))) return -1; } --=20 2.24.1