From nobody Mon Feb 9 01:05:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1741797690946580.7112042214419; Wed, 12 Mar 2025 09:41:30 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id CEE5B186F; Wed, 12 Mar 2025 12:41:29 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 6D8181D9F; Wed, 12 Mar 2025 12:32:26 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 00AAD1C3C; Wed, 12 Mar 2025 12:32:13 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id E51061DBC for ; Wed, 12 Mar 2025 12:31:51 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-601-SKaUzie7OMyDrfcCPlwzVg-1; Wed, 12 Mar 2025 12:31:50 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4060E180025C for ; Wed, 12 Mar 2025 16:31:48 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.6]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6C3321955BCB for ; Wed, 12 Mar 2025 16:31:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741797111; h=from:from: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; bh=dbTWXaq8GJbsB/l9DeUzbWbeQHjpd2FNdPhTb/tldSg=; b=EDi8Yj5rY3samyKf4uTcMODvcfOIfvHF0xVxAaxU7N3i05GqKwOedw1fL1nKUpVnURUEh2 CYwTDYMP+bKSruCrKM1UCRspM5yrdSsUpq9LW7Vh1W/TvNfgJ2w55qpMT5ud6c2zo5kASm zy7Fbe1bjbiIHJfA7zjB9gKEynO7ZRg= X-MC-Unique: SKaUzie7OMyDrfcCPlwzVg-1 X-Mimecast-MFC-AGG-ID: SKaUzie7OMyDrfcCPlwzVg_1741797108 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 13/17] qemu: Always assume support for QEMU_CAPS_INCREMENTAL_BACKUP Date: Wed, 12 Mar 2025 17:31:23 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ahTgyacj6_Vkgm6su5ZgXtf1RfLjxssTyN-B65hSx28_1741797108 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: QDKA2U3EGDOMGK5PDFZKCWGATSX7MUZ3 X-Message-ID-Hash: QDKA2U3EGDOMGK5PDFZKCWGATSX7MUZ3 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741797692833019100 Content-Type: text/plain; charset="utf-8" The support for incremental backup (not the backup api itself) was gated on support for migrating bitmaps. As the ability to migrate bitmaps was added in qemu-6.0 we can now assume that all supported qemu versions support incremental backup. Remove the interlocking. Signed-off-by: Peter Krempa --- src/qemu/qemu_backup.c | 18 ------------------ src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_checkpoint.c | 12 ------------ src/qemu/qemu_domain.c | 11 +---------- 4 files changed, 2 insertions(+), 41 deletions(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index f64639d501..43576d135b 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -806,24 +806,6 @@ qemuBackupBegin(virDomainObj *vm, if (virDomainBackupAlignDisks(def, vm->def, suffix) < 0) goto endjob; - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP)) { - size_t i; - - if (chkdef) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("creating checkpoint for incremental backup i= s not supported yet")); - goto endjob; - } - - for (i =3D 0; i < def->ndisks; i++) { - if (def->disks[i].backupmode =3D=3D VIR_DOMAIN_BACKUP_DISK_BAC= KUP_MODE_INCREMENTAL) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("incremental backup is not supported yet"= )); - goto endjob; - } - } - } - if (priv->backup) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("another backup job is already running")); diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 615efbf021..117648f03f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -6392,7 +6392,7 @@ static const struct virQEMUCapsDomainFeatureCapabilit= yTuple domCapsTuples[] =3D { { VIR_DOMAIN_CAPS_FEATURE_VMCOREINFO, QEMU_CAPS_DEVICE_VMCOREINFO }, { VIR_DOMAIN_CAPS_FEATURE_GENID, QEMU_CAPS_DEVICE_VMGENID }, { VIR_DOMAIN_CAPS_FEATURE_BACKING_STORE_INPUT, QEMU_CAPS_LAST }, - { VIR_DOMAIN_CAPS_FEATURE_BACKUP, QEMU_CAPS_INCREMENTAL_BACKUP }, + { VIR_DOMAIN_CAPS_FEATURE_BACKUP, QEMU_CAPS_LAST }, { VIR_DOMAIN_CAPS_FEATURE_ASYNC_TEARDOWN, QEMU_CAPS_RUN_WITH_ASYNC_TEA= RDOWN }, }; diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index b05aaa246e..cf44e45aa1 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -588,12 +588,6 @@ qemuCheckpointCreateXML(virDomainPtr domain, _("cannot create checkpoint for inactive domain= ")); return NULL; } - - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP))= { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("incremental backup is not supported yet")); - return NULL; - } } if (!(def =3D virDomainCheckpointDefParseString(xmlDesc, driver->xmlop= t, @@ -855,12 +849,6 @@ qemuCheckpointDelete(virDomainObj *vm, _("cannot delete checkpoint for inactive domain= ")); goto endjob; } - - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP))= { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("incremental backup is not supported yet")); - goto endjob; - } } if (!(chk =3D qemuCheckpointObjFromCheckpoint(vm, checkpoint))) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 8be2181156..ea29765c61 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10178,17 +10178,8 @@ qemuDomainDefHasManagedPR(virDomainObj *vm) * 0 in case everything is supported. */ int -qemuDomainSupportsCheckpointsBlockjobs(virDomainObj *vm) +qemuDomainSupportsCheckpointsBlockjobs(virDomainObj *vm G_GNUC_UNUSED) { - qemuDomainObjPrivate *priv =3D vm->privateData; - - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP) && - virDomainListCheckpoints(vm->checkpoints, NULL, NULL, NULL, 0) > 0= ) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("cannot perform block operations while checkpoint= exists")); - return -1; - } - return 0; } --=20 2.48.1