From nobody Mon Dec 15 23:09:16 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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=1658846449; cv=none; d=zohomail.com; s=zohoarc; b=OEKUje7VonJtjTw2iakAApag1mXg+AnA/4fK+1qvI4YYMkrk5/VU6seojW1d+OIqOyqv3kEHRF/YPW/Ub1qBjDuxusjWwy7axvaHIHS2TTF0decZTksEiSSgovTT+TA++mOcLlM4uT6Dl7kYCrl/3RuI5GEqkXYqlFPpFRLnPoA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846449; 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=4kvUtfVdH0GQESIzEUneEWFQNofaRLw3m6fLwMadO18=; b=CMBNOYhfrkeTvQe97n2W33SVmIhk5zxkc7JxGS8QALjslazw12TCf9Od0Fl+yoPy/ieMdeSKips1zK6aVUxkt4PD0WulO0mkikCDN36SN2NMSoKKGsNZrpQEjwe70LzMqOCXdn058Ne00zmOSGiLmym+yRO27sgarWK8tmJQF9s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1658846449147122.45475727093628; Tue, 26 Jul 2022 07:40:49 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-194-tgm4lrQyPeuooqClHozE8Q-1; Tue, 26 Jul 2022 10:39:23 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 81ED8806035; Tue, 26 Jul 2022 14:39:03 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E5F7492CA6; Tue, 26 Jul 2022 14:39:03 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5DC621947B99; Tue, 26 Jul 2022 14:38:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 70F5E1947B90 for ; Tue, 26 Jul 2022 14:38:58 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6577F40CF8EE; Tue, 26 Jul 2022 14:38:58 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id DB17540466AA for ; Tue, 26 Jul 2022 14:38:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846447; 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=4kvUtfVdH0GQESIzEUneEWFQNofaRLw3m6fLwMadO18=; b=BVDpzKhAD1/WbJw3fGRLq2YROkK0RJKf4tN6HRv5wVonjqo9/qvzBel6w5VtbB8DlOGkJE mgndMCWkZnC+mrmtKsTiaewFquERBULqDPTSZseCjP+HnJGmZxmaZQ+Zcdv4hc9EIWXh12 d7JME+9xAJHnluvQ8flSN3GFLS2lCrw= X-MC-Unique: tgm4lrQyPeuooqClHozE8Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 59/80] qemuDomainRemoveDiskDevice: Remove special casing for disks on 'sd' bus Date: Tue, 26 Jul 2022 16:37:37 +0200 Message-Id: <36bfbafb71403e89a69998a966ad6863403a938c.1658843187.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658846450345100001 Content-Type: text/plain; charset="utf-8" SD card disks can't be detached, so it makes no sense to special case them in the unplug code. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a57db12144..3c35a115e3 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4299,7 +4299,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriver *driver, if (!(diskBackend =3D qemuBlockStorageSourceChainDetachPrepareChar= dev(chardevAlias))) goto cleanup; - } else if (blockdev && !qemuDiskBusIsSD(disk->bus)) { + } else if (blockdev) { if (diskPriv->blockjob) { /* the block job keeps reference to the disk chain */ diskPriv->blockjob->disk =3D NULL; --=20 2.36.1