From nobody Mon Dec 15 23:05:15 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=1658846537; cv=none; d=zohomail.com; s=zohoarc; b=OC1JsOWwY5nyu7YbmUE5K5X297LvShmbqgLqOcGPB1a6Sh4MIWxlpILOFipKuPLoDSy0VedSR8Esivp2nCEc5K2h68hXfh7boQCtrthQaY6bG2I4CRW25lUa5z80kqY73uk3kq51sJo9zfqm0mbQkoTqE1cPpoagg4ea5DXBtQM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846537; 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=nCY+x31wuqJHmlAdrMpPWt+zz1n4QRtqsppSwEf+ZAI=; b=a7/SYQ2VXdrv7voXfg1gjGZ8G881jVQxm3xgoEfohJh/f/bkS0j3JsCKoRV8Ifk8kvpJJDKzjjdPqIQxIWy6gehXr1lhe/2IdJy+V9L6+eLlb3PQeCyg/whC0Xt9UvAwlgTlGakRoMjPJ78T3XyPO5hsVyALiVBSRnngIblem1o= 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 1658846537301919.1028329871505; Tue, 26 Jul 2022 07:42:17 -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-248-I1EwcMeYOmuENSL1aQjRrQ-1; Tue, 26 Jul 2022 10:39:29 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6C81780B90C; Tue, 26 Jul 2022 14:39:08 +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 543962166B26; Tue, 26 Jul 2022 14:39:08 +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 973CA194707C; Tue, 26 Jul 2022 14:39:05 +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 C1F361947BA9 for ; Tue, 26 Jul 2022 14:39:01 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 970C440CFD0B; Tue, 26 Jul 2022 14:39:01 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20EEF40CFD0A for ; Tue, 26 Jul 2022 14:39:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846536; 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=nCY+x31wuqJHmlAdrMpPWt+zz1n4QRtqsppSwEf+ZAI=; b=eihBEzItMEA8PDPMReEt5uve5oiOtJb+RSjAF0VocGuiQTtK+wmg/e7FcWgl9y/0XHLixy VDR2u9Sutjs/mBkAf58toLTEgdIRoS5JNwRIXnusGeuDlNvuVHI5P8QxB8qw/Dm2rPXZJH 5Y7R4GyN/Njr1lgsrbYb7YSvLf2KZ0U= X-MC-Unique: I1EwcMeYOmuENSL1aQjRrQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 62/80] qemu: Remove 'driveAlias' argument of qemuBlockStorageSourceDetachPrepare Date: Tue, 26 Jul 2022 16:37:40 +0200 Message-Id: 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.78 on 10.11.54.6 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: 1658846538270100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_block.c | 33 +++++++++++++-------------------- src/qemu/qemu_block.h | 3 +-- src/qemu/qemu_blockjob.c | 4 ++-- src/qemu/qemu_hotplug.c | 2 +- 4 files changed, 17 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index a5d9f47ec4..afdcca2813 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -1555,36 +1555,29 @@ qemuBlockStorageSourceAttachRollback(qemuMonitor *m= on, /** * qemuBlockStorageSourceDetachPrepare: * @src: disk source structure - * @driveAlias: Alias of the -drive backend, the pointer is always consumed * * Prepare qemuBlockStorageSourceAttachData *for detaching a single source - * from a VM. If @driveAlias is NULL -blockdev is assumed. + * from a VM. */ qemuBlockStorageSourceAttachData * -qemuBlockStorageSourceDetachPrepare(virStorageSource *src, - char *driveAlias) +qemuBlockStorageSourceDetachPrepare(virStorageSource *src) { qemuDomainStorageSourcePrivate *srcpriv =3D QEMU_DOMAIN_STORAGE_SOURCE= _PRIVATE(src); g_autoptr(qemuBlockStorageSourceAttachData) data =3D NULL; data =3D g_new0(qemuBlockStorageSourceAttachData, 1); - if (driveAlias) { - data->driveAlias =3D g_steal_pointer(&driveAlias); - data->driveAdded =3D true; - } else { - data->formatNodeName =3D src->nodeformat; - data->formatAttached =3D true; - data->storageNodeName =3D src->nodestorage; - data->storageAttached =3D true; + data->formatNodeName =3D src->nodeformat; + data->formatAttached =3D true; + data->storageNodeName =3D src->nodestorage; + data->storageAttached =3D true; - /* 'raw' format doesn't need the extra 'raw' layer when slicing, t= hus - * the nodename is NULL */ - if (src->sliceStorage && - src->sliceStorage->nodename) { - data->storageSliceNodeName =3D src->sliceStorage->nodename; - data->storageSliceAttached =3D true; - } + /* 'raw' format doesn't need the extra 'raw' layer when slicing, thus + * the nodename is NULL */ + if (src->sliceStorage && + src->sliceStorage->nodename) { + data->storageSliceNodeName =3D src->sliceStorage->nodename; + data->storageSliceAttached =3D true; } if (src->pr && @@ -1647,7 +1640,7 @@ qemuBlockStorageSourceChainDetachPrepareBlockdev(virS= torageSource *src) data =3D g_new0(qemuBlockStorageSourceChainData, 1); for (n =3D src; virStorageSourceIsBacking(n); n =3D n->backingStore) { - if (!(backend =3D qemuBlockStorageSourceDetachPrepare(n, NULL))) + if (!(backend =3D qemuBlockStorageSourceDetachPrepare(n))) return NULL; VIR_APPEND_ELEMENT(data->srcdata, data->nsrcdata, backend); diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h index a20a5e8a61..d29d444a5a 100644 --- a/src/qemu/qemu_block.h +++ b/src/qemu/qemu_block.h @@ -116,8 +116,7 @@ qemuBlockStorageSourceAttachPrepareBlockdev(virStorageS= ource *src, bool autoreadonly); qemuBlockStorageSourceAttachData * -qemuBlockStorageSourceDetachPrepare(virStorageSource *src, - char *driveAlias); +qemuBlockStorageSourceDetachPrepare(virStorageSource *src); int qemuBlockStorageSourceAttachApply(qemuMonitor *mon, diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 03c46923b3..62ed71f5a8 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -1328,7 +1328,7 @@ qemuBlockJobProcessEventConcludedCreate(virQEMUDriver= *driver, if (!job->data.create.src) return; - if (!(backend =3D qemuBlockStorageSourceDetachPrepare(job->data.create= .src, NULL))) + if (!(backend =3D qemuBlockStorageSourceDetachPrepare(job->data.create= .src))) return; /* the format node part was not attached yet, so we don't need to deta= ch it */ @@ -1365,7 +1365,7 @@ qemuBlockJobProcessEventConcludedBackup(virQEMUDriver= *driver, progressCurrent, progressTotal, asyncJob); if (job->data.backup.store && - !(backend =3D qemuBlockStorageSourceDetachPrepare(job->data.backup= .store, NULL))) + !(backend =3D qemuBlockStorageSourceDetachPrepare(job->data.backup= .store))) return; if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index d7f10d8277..a752702fc4 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -706,7 +706,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver, goto rollback; QEMU_DOMAIN_DISK_PRIVATE(disk)->transientOverlayCreated =3D true; - backend =3D qemuBlockStorageSourceDetachPrepare(disk->src, NULL); + backend =3D qemuBlockStorageSourceDetachPrepare(disk->src); ignore_value(VIR_INSERT_ELEMENT(data->srcdata, 0, data->nsrcdata, = backend)); } --=20 2.36.1