From nobody Mon Feb 9 04:03:18 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=1594391704; cv=none; d=zohomail.com; s=zohoarc; b=lnwsv+7xbYVl/uoii5z1ehBZU4bF0Q+1CXCgTmdyNOY4jQ1kmD+UAKPWa1rfhLnTF9b/Iixayn1xBN9ylDmQDFrERYgXFtcQabb8fYrvLy4vHdMnOrzWQvTkolyNnr67TD911bxVIQidz2WaY4S3hafZJ3P5sr5XN0jKczB4NHs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594391704; 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=Wx0/o3xMjKSFHXKmmFqtNMAiguggAzMUBuoXjZLeN7k=; b=cMDhDJL4/ntgAc2pQK+5v8D4WCgaMEBjUu7E8iElWl0aHdkWKdQmBcWU8B07N3NVjvOkwr9mga8hcWDFNJiGZvaw3P1AgEtsn5YcEMq9mTu9uc5sVHtzmkmU/19WOoVWH13SyMlU1rQSIuj2+5tcwZqC44k8ikns62CX8TsWW9Y= 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 1594391704033851.9596569821944; Fri, 10 Jul 2020 07:35:04 -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-413-f0Iq2CMJM3a6vURap_57Mg-1; Fri, 10 Jul 2020 10:34:22 -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 28FAE1086; Fri, 10 Jul 2020 14:34:15 +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 0614860C05; Fri, 10 Jul 2020 14:34:15 +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 CAC5084375; Fri, 10 Jul 2020 14:34:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06AEY7JD007231 for ; Fri, 10 Jul 2020 10:34:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id AC63878A3D; Fri, 10 Jul 2020 14:34:07 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0E1E27880F for ; Fri, 10 Jul 2020 14:34:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594391702; 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=Wx0/o3xMjKSFHXKmmFqtNMAiguggAzMUBuoXjZLeN7k=; b=EQrjWDbXTRhJRhurLgFc5bGdxorT8ApJCpmiVa3Fx/bOW8orFrWtVWcl72GnTNre563YeA DeIZswLmkZ4E+6NUGKf1B8+98gJrg8NgrR9+PlMzFa76VypbOXqfZCUIK1peusxTruOFZv 94GBM1D6kGqYvUjJTudpsyGAqYQ0SUM= X-MC-Unique: f0Iq2CMJM3a6vURap_57Mg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 16/18] qemuDomainRemoveHostDevice: Use new infrastructure for (i)SCSI Date: Fri, 10 Jul 2020 16:33:37 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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 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" Similarly to previous commits, modify the hostdev detach code to use blockdev infrastructure to detach (i)SCSI hostdevs. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_hotplug.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 06b3b94ff2..607f9fdc0f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4441,31 +4441,17 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, virDomainNetDefPtr net =3D NULL; size_t i; qemuDomainObjPrivatePtr priv =3D vm->privateData; - g_autofree char *drivealias =3D NULL; - const char *secretObjAlias =3D NULL; VIR_DEBUG("Removing host device %s from domain %p %s", hostdev->info->alias, vm, vm->def->name); if (hostdev->source.subsys.type =3D=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_= SCSI) { - virDomainHostdevSubsysSCSIPtr scsisrc =3D &hostdev->source.subsys.= u.scsi; - virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc =3D &scsisrc->u.iscsi; + g_autoptr(qemuBlockStorageSourceAttachData) detachscsi =3D NULL; - if (!(drivealias =3D qemuAliasFromHostdev(hostdev))) - return -1; - - if (scsisrc->protocol =3D=3D VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE= _ISCSI) { - qemuDomainStorageSourcePrivatePtr srcPriv =3D QEMU_DOMAIN_STOR= AGE_SOURCE_PRIVATE(iscsisrc->src); - if (srcPriv && srcPriv->secinfo) - secretObjAlias =3D srcPriv->secinfo->s.aes.alias; - } + detachscsi =3D qemuBuildHostdevSCSIDetachPrepare(hostdev, priv->qe= muCaps); qemuDomainObjEnterMonitor(driver, vm); - qemuMonitorDriveDel(priv->mon, drivealias); - - if (secretObjAlias) - ignore_value(qemuMonitorDelObject(priv->mon, secretObjAlias, f= alse)); - + qemuBlockStorageSourceAttachRollback(priv->mon, detachscsi); if (qemuDomainObjExitMonitor(driver, vm) < 0) return -1; } --=20 2.26.2