From nobody Mon Dec 15 23:09:28 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=1658846477; cv=none; d=zohomail.com; s=zohoarc; b=VLPdJJGSAmuyIQQ3on2I1J4XHjnNHpwVCNh7AxKVhGwfEPd0UPrVGMai8dr7DiA5fNg6HGa4OJLo0VjJvcRZfuskkk1s8Q9/jX8l7wd9iFJKFJfhTLvByTxPj+aT2fmc4gAtkO28ZnxO0UFQWS1h1BF/iHrZ3pqkGaEQIA3ktL0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846477; 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=kJ/gR9qpboi8TUi4HiUcZH/4g9jljt82hFnMAp6RQSs=; b=P/hhhqZOHbUsRuocVj+lQrK2hN87BKNMn876YD+X7QOEWcYzutLRf5SHawVXaTl7u0nXozCMPoDvkbUJaZry0CkYSerUdMd2wFm/dA/Z8oSkafkdyov/JuVa5iu4P7dHCDL4X0FRCqlfTVgMAbVlxDuv8xYA1xUp/Ud6z55OQK4= 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 1658846477287672.5009183716886; Tue, 26 Jul 2022 07:41:17 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-457-I8aSQ_aoO_Wts_5nj4zzag-1; Tue, 26 Jul 2022 10:38:49 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D1A3529324A8; Tue, 26 Jul 2022 14:38:32 +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 B18BCC44AE6; Tue, 26 Jul 2022 14:38:32 +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 198031945DAD; Tue, 26 Jul 2022 14:38:32 +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 771701945DB8 for ; Tue, 26 Jul 2022 14:38:27 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5FFDD400DFD7; Tue, 26 Jul 2022 14:38:27 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id D9EA140CFD0A for ; Tue, 26 Jul 2022 14:38:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846476; 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=kJ/gR9qpboi8TUi4HiUcZH/4g9jljt82hFnMAp6RQSs=; b=PVuBiYTcHD9fMeYPP/NautPGDvu52zSzFhaX7XzDOcud91yavgorrl0h0nto5mTpaMpB7+ bH1kTcwbru/BwPmENtgmlxp2B6cONoPCxKHK3gH/A1gzhWzwYrSBTk/xD23b0ljTlYcG1u 8oQ5NlkcA+FWrfsKcwEOHPm2W79FKes= X-MC-Unique: I8aSQ_aoO_Wts_5nj4zzag-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 25/80] qemu: snapshot: Remove pre-blockdev code paths Date: Tue, 26 Jul 2022 16:37:03 +0200 Message-Id: <25a3e3f3f6839b8a79d88b3542d50d96c7dfcf59.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.8 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: 1658846478257100001 Content-Type: text/plain; charset="utf-8" Assume that QEMU_CAPS_BLOCKDEV is present and remove all code executed when it's not. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_snapshot.c | 116 +++++---------------------------------- 1 file changed, 15 insertions(+), 101 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 0733d44faa..b96ef7a50b 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -449,8 +449,7 @@ qemuSnapshotPrepareDiskExternalInactive(virDomainSnapsh= otDiskDef *snapdisk, static int qemuSnapshotPrepareDiskExternalActive(virDomainObj *vm, virDomainSnapshotDiskDef *snapdisk, - virDomainDiskDef *domdisk, - bool blockdev) + virDomainDiskDef *domdisk) { virStorageType actualType =3D virStorageSourceGetActualType(snapdisk->= src); @@ -470,38 +469,7 @@ qemuSnapshotPrepareDiskExternalActive(virDomainObj *vm, switch (actualType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: - break; - case VIR_STORAGE_TYPE_NETWORK: - /* defer all of the checking to either qemu or libvirt's blockdev = code */ - if (blockdev) - break; - - switch ((virStorageNetProtocol) snapdisk->src->protocol) { - case VIR_STORAGE_NET_PROTOCOL_GLUSTER: - break; - - case VIR_STORAGE_NET_PROTOCOL_NONE: - case VIR_STORAGE_NET_PROTOCOL_NBD: - case VIR_STORAGE_NET_PROTOCOL_RBD: - case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: - case VIR_STORAGE_NET_PROTOCOL_ISCSI: - case VIR_STORAGE_NET_PROTOCOL_HTTP: - case VIR_STORAGE_NET_PROTOCOL_HTTPS: - case VIR_STORAGE_NET_PROTOCOL_FTP: - case VIR_STORAGE_NET_PROTOCOL_FTPS: - case VIR_STORAGE_NET_PROTOCOL_TFTP: - case VIR_STORAGE_NET_PROTOCOL_SSH: - case VIR_STORAGE_NET_PROTOCOL_VXHS: - case VIR_STORAGE_NET_PROTOCOL_NFS: - case VIR_STORAGE_NET_PROTOCOL_LAST: - virReportError(VIR_ERR_INTERNAL_ERROR, - _("external active snapshots are not supported = on " - "'network' disks using '%s' protocol"), - virStorageNetProtocolTypeToString(snapdisk->src= ->protocol)); - return -1; - - } break; case VIR_STORAGE_TYPE_DIR: @@ -528,17 +496,8 @@ qemuSnapshotPrepareDiskExternal(virDomainObj *vm, virDomainDiskDef *disk, virDomainSnapshotDiskDef *snapdisk, bool active, - bool reuse, - bool blockdev) + bool reuse) { - - if (disk->src->readonly && !(reuse || blockdev)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("external snapshot for readonly disk %s " - "is not supported"), disk->dst); - return -1; - } - if (qemuTranslateSnapshotDiskSourcePool(snapdisk) < 0) return -1; @@ -549,7 +508,7 @@ qemuSnapshotPrepareDiskExternal(virDomainObj *vm, if (qemuSnapshotPrepareDiskExternalInactive(snapdisk, disk) < 0) return -1; } else { - if (qemuSnapshotPrepareDiskExternalActive(vm, snapdisk, disk, bloc= kdev) < 0) + if (qemuSnapshotPrepareDiskExternalActive(vm, snapdisk, disk) < 0) return -1; } @@ -679,8 +638,6 @@ qemuSnapshotPrepare(virDomainObj *vm, bool *has_manual, unsigned int *flags) { - qemuDomainObjPrivate *priv =3D vm->privateData; - bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); size_t i; bool active =3D virDomainObjIsActive(vm); bool reuse =3D (*flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT) !=3D 0; @@ -742,16 +699,10 @@ qemuSnapshotPrepare(virDomainObj *vm, _("metadata cache max size control is s= upported only with qcow2 images")); return -1; } - - if (!blockdev) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("metadata cache max size control is n= ot supported with this QEMU binary")); - return -1; - } } if (qemuSnapshotPrepareDiskExternal(vm, dom_disk, disk, - active, reuse, blockdev) <= 0) + active, reuse) < 0) return -1; external++; @@ -1059,10 +1010,7 @@ qemuSnapshotDiskPrepareOne(qemuSnapshotDiskContext *= snapctxt, virDomainObj *vm =3D snapctxt->vm; qemuDomainObjPrivate *priv =3D vm->privateData; virQEMUDriver *driver =3D priv->driver; - bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); virDomainDiskDef *persistdisk; - bool supportsCreate; - bool updateRelativeBacking =3D false; qemuSnapshotDiskData *dd =3D snapctxt->dd + snapctxt->ndd++; dd->disk =3D disk; @@ -1092,28 +1040,15 @@ qemuSnapshotDiskPrepareOne(qemuSnapshotDiskContext = *snapctxt, return -1; } - supportsCreate =3D virStorageSourceSupportsCreate(dd->src); - - /* relative backing store paths need to be updated so that relative - * block commit still works. With blockdev we must update it when doing - * commit anyways so it's skipped here */ - if (!blockdev && - virStorageSourceSupportsBackingChainTraversal(dd->src)) - updateRelativeBacking =3D true; - - if (supportsCreate || updateRelativeBacking) { + if (virStorageSourceSupportsCreate(dd->src)) { if (qemuDomainStorageFileInit(driver, vm, dd->src, NULL) < 0) return -1; dd->initialized =3D true; - if (reuse) { - if (updateRelativeBacking && - virStorageSourceFetchRelativeBackingPath(dd->src, &dd->rel= Path) < 0) - return -1; - } else { + if (!reuse) { /* pre-create the image file so that we can label it before ha= nding it to qemu */ - if (supportsCreate && dd->src->type !=3D VIR_STORAGE_TYPE_BLOC= K) { + if (dd->src->type !=3D VIR_STORAGE_TYPE_BLOCK) { if (virStorageSourceCreate(dd->src) < 0) { virReportSystemError(errno, _("failed to create image = file '%s'"), NULLSTR(dd->src->path)); @@ -1131,20 +1066,15 @@ qemuSnapshotDiskPrepareOne(qemuSnapshotDiskContext = *snapctxt, dd->prepared =3D true; - if (blockdev) { - if (qemuSnapshotDiskPrepareOneBlockdev(driver, vm, dd, snapctxt->c= fg, reuse, - blockNamedNodeData, snapctx= t->asyncJob) < 0) - return -1; + if (qemuSnapshotDiskPrepareOneBlockdev(driver, vm, dd, snapctxt->cfg, = reuse, + blockNamedNodeData, snapctxt->a= syncJob) < 0) + return -1; - if (qemuSnapshotDiskBitmapsPropagate(dd, snapctxt->actions, blockN= amedNodeData) < 0) - return -1; + if (qemuSnapshotDiskBitmapsPropagate(dd, snapctxt->actions, blockNamed= NodeData) < 0) + return -1; - if (qemuBlockSnapshotAddBlockdev(snapctxt->actions, dd->disk, dd->= src) < 0) - return -1; - } else { - if (qemuBlockSnapshotAddLegacy(snapctxt->actions, dd->disk, dd->sr= c, reuse) < 0) - return -1; - } + if (qemuBlockSnapshotAddBlockdev(snapctxt->actions, dd->disk, dd->src)= < 0) + return -1; return 0; } @@ -1211,17 +1141,6 @@ qemuSnapshotGetTransientDiskDef(virDomainDiskDef *do= mdisk, } -static void -qemuSnapshotDiskUpdateSourceRenumber(virStorageSource *src) -{ - virStorageSource *next; - unsigned int idx =3D 1; - - for (next =3D src->backingStore; virStorageSourceIsBacking(next); next= =3D next->backingStore) - next->id =3D idx++; -} - - /** * qemuSnapshotDiskUpdateSource: * @vm: domain object @@ -1257,10 +1176,6 @@ qemuSnapshotDiskUpdateSource(virDomainObj *vm, dd->src->backingStore =3D g_steal_pointer(&dd->disk->src); dd->disk->src =3D g_steal_pointer(&dd->src); - /* fix numbering of disks */ - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) - qemuSnapshotDiskUpdateSourceRenumber(dd->disk->src); - if (dd->persistdisk) { dd->persistdisk->src->readonly =3D true; dd->persistsrc->backingStore =3D g_steal_pointer(&dd->persistdisk-= >src); @@ -1415,8 +1330,7 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *drive= r, /* We need to collect reply from 'query-named-block-nodes' prior to the * migration step as qemu deactivates bitmaps after migration so the r= esult * would be wrong */ - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) && - !(blockNamedNodeData =3D qemuBlockGetNamedNodeData(vm, VIR_ASYNC_J= OB_SNAPSHOT))) + if (!(blockNamedNodeData =3D qemuBlockGetNamedNodeData(vm, VIR_ASYNC_J= OB_SNAPSHOT))) goto cleanup; /* do the memory snapshot if necessary */ --=20 2.36.1