From nobody Sun Feb 8 10:43:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1693557159; cv=none; d=zohomail.com; s=zohoarc; b=OYjcxqAolgDHQtBvdZWdCILMZ0AGJqVZZDfOSeqwU7PjVmLyuw42L2TCf8sGIibwkyDepK7O5Z8t1izzN3ZuwatAHB41+u3tYVuvCrJ2DidbU9hiL9iAPASd+bI3Rw0tr5Mldfme2d2hxGlbeUnuwEOk4UjLYAFJu74a7sQTwQ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693557159; 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=RrSOyiGVT51v8FfpdIk3XRUef+A6hOHh/ZlPP6qmXI0=; b=M/fBg+3ewF6fEnTBFsX1RSCYgiN9DK1lqSTOWLtxVweZdL9WT3BXONG08srCXy15KXYiSgI4Qz50OF8IgIHPrd8AuQW/HzyN8BuSfdcdU/q7JDtjJgi772PP7FXH0NH1dniVzZgfJpKg4YkiX4pthOq0zedsy2+jCPVSY/V2oJU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1693557159325112.6866572818243; Fri, 1 Sep 2023 01:32:39 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.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-205-dltKx5DePKar9n2uN-uscw-1; Fri, 01 Sep 2023 04:32:33 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A18E429DD99A; Fri, 1 Sep 2023 08:32:31 +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 8DC9A6466B; Fri, 1 Sep 2023 08:32:31 +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 CF8B919472BB; Fri, 1 Sep 2023 08:32:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E9FBA19472BA for ; Fri, 1 Sep 2023 08:32:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E5374C15BBA; Fri, 1 Sep 2023 08:32:26 +0000 (UTC) Received: from localhost.localdomain (unknown [10.45.225.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 88DA7C15BAE for ; Fri, 1 Sep 2023 08:32:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693557158; 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=RrSOyiGVT51v8FfpdIk3XRUef+A6hOHh/ZlPP6qmXI0=; b=WPyYeNPmyn9s7DkGcsnZ2Tzla2W4PJ2zBtRF2ZV8s1dyb96tqBR9MamR4g+Hdjo2yw61+g hKSHZqw+ULJob9MzK8lBIzn5Vvk2KudOJCU3nHtMkiRTRNLFnxtyd13aG69dBVDVb2Oa29 CxR/ahjET924APsKYRf5GHUSN+pdG2k= X-MC-Unique: dltKx5DePKar9n2uN-uscw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH v2 6/6] Revert "capabilities: report full external snapshot support" Date: Fri, 1 Sep 2023 10:32:17 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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 3.1 on 10.11.54.5 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: 1693557160107100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Reverting external snapshot for running VM doesn't work correctly so we should not report this capability until it is fixed. This reverts commit de71573bfec7f3acd22ec74794318de121716e21. Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa --- docs/formatcaps.rst | 7 ------- src/conf/capabilities.c | 1 - src/conf/capabilities.h | 1 - src/conf/schemas/capability.rng | 5 ----- src/qemu/qemu_capabilities.c | 1 - tests/qemucaps2xmloutdata/caps.aarch64+hvf.xml | 1 - tests/qemucaps2xmloutdata/caps.aarch64.xml | 1 - tests/qemucaps2xmloutdata/caps.ppc.xml | 1 - tests/qemucaps2xmloutdata/caps.ppc64.xml | 1 - tests/qemucaps2xmloutdata/caps.riscv64.xml | 1 - tests/qemucaps2xmloutdata/caps.s390x.xml | 1 - tests/qemucaps2xmloutdata/caps.sparc.xml | 1 - tests/qemucaps2xmloutdata/caps.x86_64+hvf.xml | 1 - tests/qemucaps2xmloutdata/caps.x86_64.xml | 1 - 14 files changed, 24 deletions(-) diff --git a/docs/formatcaps.rst b/docs/formatcaps.rst index 95502c511f..bb8bc663d2 100644 --- a/docs/formatcaps.rst +++ b/docs/formatcaps.rst @@ -134,12 +134,6 @@ The ```` element will typically wrap up the fo= llowing elements: creating external disk snapshots is supported. If absent, creating e= xternal snapshots may still be supported, but it requires attempting the API= and checking for an error to find out for sure. :since:`Since 1.2.3` - ``externalSnapshot`` - If this element is present, the hypervisor supports deleting and - reverting external snapshots including memory state. Support for cre= ation - of external snapshots is reported via the ``disksnapshot`` feature f= lag. - Management applications can now switch from internal snapshots to ex= ternal - snapshots. :since:`Since 9.7.0` =20 Examples ~~~~~~~~ @@ -324,7 +318,6 @@ capabilities enabled in the chip and BIOS you will see: - =20 diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 34f04cb7d3..56768ce6e0 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -508,7 +508,6 @@ static const struct virCapsGuestFeatureInfo virCapsGues= tFeatureInfos[VIR_CAPS_GU [VIR_CAPS_GUEST_FEATURE_TYPE_DEVICEBOOT] =3D { "deviceboot", false }, [VIR_CAPS_GUEST_FEATURE_TYPE_DISKSNAPSHOT] =3D { "disksnapshot", true = }, [VIR_CAPS_GUEST_FEATURE_TYPE_HAP] =3D { "hap", true }, - [VIR_CAPS_GUEST_FEATURE_TYPE_EXTERNAL_SNAPSHOT] =3D { "externalSnapsho= t", false }, }; =20 =20 diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 9eaf6e2807..c78e3e52fa 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -40,7 +40,6 @@ typedef enum { VIR_CAPS_GUEST_FEATURE_TYPE_DEVICEBOOT, VIR_CAPS_GUEST_FEATURE_TYPE_DISKSNAPSHOT, VIR_CAPS_GUEST_FEATURE_TYPE_HAP, - VIR_CAPS_GUEST_FEATURE_TYPE_EXTERNAL_SNAPSHOT, =20 VIR_CAPS_GUEST_FEATURE_TYPE_LAST } virCapsGuestFeatureType; diff --git a/src/conf/schemas/capability.rng b/src/conf/schemas/capability.= rng index b1968df258..83b414961a 100644 --- a/src/conf/schemas/capability.rng +++ b/src/conf/schemas/capability.rng @@ -493,11 +493,6 @@ - - - - - diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 05cc11218a..40eacf0f4d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1121,7 +1121,6 @@ virQEMUCapsInitGuestFromBinary(virCaps *caps, virCapabilitiesAddGuestFeature(guest, VIR_CAPS_GUEST_FEATURE_TYPE_DEVI= CEBOOT); virCapabilitiesAddGuestFeatureWithToggle(guest, VIR_CAPS_GUEST_FEATURE= _TYPE_DISKSNAPSHOT, true, false); - virCapabilitiesAddGuestFeature(guest, VIR_CAPS_GUEST_FEATURE_TYPE_EXTE= RNAL_SNAPSHOT); =20 if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_TCG)) { virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_QEMU, diff --git a/tests/qemucaps2xmloutdata/caps.aarch64+hvf.xml b/tests/qemucap= s2xmloutdata/caps.aarch64+hvf.xml index b9a5b5a1d6..b53a886b90 100644 --- a/tests/qemucaps2xmloutdata/caps.aarch64+hvf.xml +++ b/tests/qemucaps2xmloutdata/caps.aarch64+hvf.xml @@ -21,7 +21,6 @@ - =20 diff --git a/tests/qemucaps2xmloutdata/caps.aarch64.xml b/tests/qemucaps2xm= loutdata/caps.aarch64.xml index 61512ed740..5dca6d3102 100644 --- a/tests/qemucaps2xmloutdata/caps.aarch64.xml +++ b/tests/qemucaps2xmloutdata/caps.aarch64.xml @@ -21,7 +21,6 @@ - =20 diff --git a/tests/qemucaps2xmloutdata/caps.ppc.xml b/tests/qemucaps2xmlout= data/caps.ppc.xml index 86d6b85ae0..e7ba391795 100644 --- a/tests/qemucaps2xmloutdata/caps.ppc.xml +++ b/tests/qemucaps2xmloutdata/caps.ppc.xml @@ -19,7 +19,6 @@ - =20 diff --git a/tests/qemucaps2xmloutdata/caps.ppc64.xml b/tests/qemucaps2xmlo= utdata/caps.ppc64.xml index 90859f9594..85623f3980 100644 --- a/tests/qemucaps2xmloutdata/caps.ppc64.xml +++ b/tests/qemucaps2xmloutdata/caps.ppc64.xml @@ -20,7 +20,6 @@ - =20 diff --git a/tests/qemucaps2xmloutdata/caps.riscv64.xml b/tests/qemucaps2xm= loutdata/caps.riscv64.xml index c6fa950211..09b7eb7f2f 100644 --- a/tests/qemucaps2xmloutdata/caps.riscv64.xml +++ b/tests/qemucaps2xmloutdata/caps.riscv64.xml @@ -19,7 +19,6 @@ - =20 diff --git a/tests/qemucaps2xmloutdata/caps.s390x.xml b/tests/qemucaps2xmlo= utdata/caps.s390x.xml index 6379ab73e6..bb82a15040 100644 --- a/tests/qemucaps2xmloutdata/caps.s390x.xml +++ b/tests/qemucaps2xmloutdata/caps.s390x.xml @@ -20,7 +20,6 @@ - =20 diff --git a/tests/qemucaps2xmloutdata/caps.sparc.xml b/tests/qemucaps2xmlo= utdata/caps.sparc.xml index b5b158e430..9d977c4102 100644 --- a/tests/qemucaps2xmloutdata/caps.sparc.xml +++ b/tests/qemucaps2xmloutdata/caps.sparc.xml @@ -19,7 +19,6 @@ - =20 diff --git a/tests/qemucaps2xmloutdata/caps.x86_64+hvf.xml b/tests/qemucaps= 2xmloutdata/caps.x86_64+hvf.xml index f5e49ba4db..356819a6c6 100644 --- a/tests/qemucaps2xmloutdata/caps.x86_64+hvf.xml +++ b/tests/qemucaps2xmloutdata/caps.x86_64+hvf.xml @@ -22,7 +22,6 @@ - =20 diff --git a/tests/qemucaps2xmloutdata/caps.x86_64.xml b/tests/qemucaps2xml= outdata/caps.x86_64.xml index 8dd1439a80..35359780c4 100644 --- a/tests/qemucaps2xmloutdata/caps.x86_64.xml +++ b/tests/qemucaps2xmloutdata/caps.x86_64.xml @@ -22,7 +22,6 @@ - =20 --=20 2.41.0