Revert "capabilities: report full external snapshot support"

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 <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/docs/formatcaps.rst b/docs/formatcaps.rst
index 95502c511fb85a99e4ccc8f5622cd1b3ceddbdfa..bb8bc663d2e5676be3299325d10685eec767faea 100644 (file)
--- a/docs/formatcaps.rst
+++ b/docs/formatcaps.rst
@@ -134,12 +134,6 @@ The ``<guest/>`` element will typically wrap up the following elements:
       creating external disk snapshots is supported. If absent, creating external
       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 creation
-      of external snapshots is reported via the ``disksnapshot`` feature flag.
-      Management applications can now switch from internal snapshots to external
-      snapshots. :since:`Since 9.7.0`
 
 Examples
 ~~~~~~~~
@@ -324,7 +318,6 @@ capabilities enabled in the chip and BIOS you will see:
         <cpuselection/>
         <deviceboot/>
         <disksnapshot default='on' toggle='no'/>
-        <externalSnapshot/>
       </features>
     </guest>
 

diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 34f04cb7d3ed8dfbb5aa6801eb928d71f94f782c..56768ce6e0d86dec8b9bac4e9ba9d5a20ef4550e 100644 (file)
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -508,7 +508,6 @@ static const struct virCapsGuestFeatureInfo virCapsGuestFeatureInfos[VIR_CAPS_GU
     [VIR_CAPS_GUEST_FEATURE_TYPE_DEVICEBOOT] = { "deviceboot", false },
     [VIR_CAPS_GUEST_FEATURE_TYPE_DISKSNAPSHOT] = { "disksnapshot", true },
     [VIR_CAPS_GUEST_FEATURE_TYPE_HAP] = { "hap", true },
-    [VIR_CAPS_GUEST_FEATURE_TYPE_EXTERNAL_SNAPSHOT] = { "externalSnapshot", false },
 };
 
 

diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h
index 9eaf6e280798ca530a9581d9169264033e14a7b1..c78e3e52fa23b0a37db09d64401842904cd38bc4 100644 (file)
--- 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,
 
     VIR_CAPS_GUEST_FEATURE_TYPE_LAST
 } virCapsGuestFeatureType;

diff --git a/src/conf/schemas/capability.rng b/src/conf/schemas/capability.rng
index b1968df258565018066969943da5a4bc17f38459..83b414961ad6ecb8b94e6fa69b26c58d9378bdfa 100644 (file)
--- a/src/conf/schemas/capability.rng
+++ b/src/conf/schemas/capability.rng
@@ -493,11 +493,6 @@
             <empty/>
           </element>
         </optional>
-        <optional>
-          <element name="externalSnapshot">
-            <empty/>
-          </element>
-        </optional>
       </interleave>
     </element>
   </define>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 05cc11218adb77a4be7cc0f70baaf4e611e31720..40eacf0f4dbbd93ce27250012bf3401d5d566b7a 100644 (file)
--- 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_DEVICEBOOT);
     virCapabilitiesAddGuestFeatureWithToggle(guest, VIR_CAPS_GUEST_FEATURE_TYPE_DISKSNAPSHOT,
                                              true, false);
-    virCapabilitiesAddGuestFeature(guest, VIR_CAPS_GUEST_FEATURE_TYPE_EXTERNAL_SNAPSHOT);
 
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_TCG)) {
         virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_QEMU,

diff --git a/tests/qemucaps2xmloutdata/caps.aarch64+hvf.xml b/tests/qemucaps2xmloutdata/caps.aarch64+hvf.xml
index b9a5b5a1d60af9ff2b9189bd6610b60b252e35af..b53a886b90d827d43650d5ce2187caf767b2b863 100644 (file)
--- a/tests/qemucaps2xmloutdata/caps.aarch64+hvf.xml
+++ b/tests/qemucaps2xmloutdata/caps.aarch64+hvf.xml
@@ -21,7 +21,6 @@
       <cpuselection/>
       <deviceboot/>
       <disksnapshot default='on' toggle='no'/>
-      <externalSnapshot/>
     </features>
   </guest>
 

diff --git a/tests/qemucaps2xmloutdata/caps.aarch64.xml b/tests/qemucaps2xmloutdata/caps.aarch64.xml
index 61512ed740caf00b50bb0711aa534f7aa7b191a5..5dca6d3102753052ab2474b0e17787304f9cb12a 100644 (file)
--- a/tests/qemucaps2xmloutdata/caps.aarch64.xml
+++ b/tests/qemucaps2xmloutdata/caps.aarch64.xml
@@ -21,7 +21,6 @@
       <cpuselection/>
       <deviceboot/>
       <disksnapshot default='on' toggle='no'/>
-      <externalSnapshot/>
     </features>
   </guest>
 

diff --git a/tests/qemucaps2xmloutdata/caps.ppc.xml b/tests/qemucaps2xmloutdata/caps.ppc.xml
index 86d6b85ae002c76b78443315e1d315a363a69330..e7ba3917951d1ce85113b4a63fd559964a67a1f2 100644 (file)
--- a/tests/qemucaps2xmloutdata/caps.ppc.xml
+++ b/tests/qemucaps2xmloutdata/caps.ppc.xml
@@ -19,7 +19,6 @@
       <cpuselection/>
       <deviceboot/>
       <disksnapshot default='on' toggle='no'/>
-      <externalSnapshot/>
     </features>
   </guest>
 

diff --git a/tests/qemucaps2xmloutdata/caps.ppc64.xml b/tests/qemucaps2xmloutdata/caps.ppc64.xml
index 90859f9594523b3041f429a1222ce1ab3d4bb3eb..85623f39804cda36cdeb2be8c888984424068ef6 100644 (file)
--- a/tests/qemucaps2xmloutdata/caps.ppc64.xml
+++ b/tests/qemucaps2xmloutdata/caps.ppc64.xml
@@ -20,7 +20,6 @@
       <cpuselection/>
       <deviceboot/>
       <disksnapshot default='on' toggle='no'/>
-      <externalSnapshot/>
     </features>
   </guest>
 

diff --git a/tests/qemucaps2xmloutdata/caps.riscv64.xml b/tests/qemucaps2xmloutdata/caps.riscv64.xml
index c6fa9502115b897d41486d766adc17a0e1fac66b..09b7eb7f2fb79bbce20b960f6103722fc2e83729 100644 (file)
--- a/tests/qemucaps2xmloutdata/caps.riscv64.xml
+++ b/tests/qemucaps2xmloutdata/caps.riscv64.xml
@@ -19,7 +19,6 @@
       <cpuselection/>
       <deviceboot/>
       <disksnapshot default='on' toggle='no'/>
-      <externalSnapshot/>
     </features>
   </guest>
 

diff --git a/tests/qemucaps2xmloutdata/caps.s390x.xml b/tests/qemucaps2xmloutdata/caps.s390x.xml
index 6379ab73e6e5572f0a9afea7f1242fb93ca9620a..bb82a150409ef3970ce160e29930f85febd546c4 100644 (file)
--- a/tests/qemucaps2xmloutdata/caps.s390x.xml
+++ b/tests/qemucaps2xmloutdata/caps.s390x.xml
@@ -20,7 +20,6 @@
       <cpuselection/>
       <deviceboot/>
       <disksnapshot default='on' toggle='no'/>
-      <externalSnapshot/>
     </features>
   </guest>
 

diff --git a/tests/qemucaps2xmloutdata/caps.sparc.xml b/tests/qemucaps2xmloutdata/caps.sparc.xml
index b5b158e43071a16b091fe05c060154a10544c4d6..9d977c4102b5e7ce4162151d039cbb4b7a9da115 100644 (file)
--- a/tests/qemucaps2xmloutdata/caps.sparc.xml
+++ b/tests/qemucaps2xmloutdata/caps.sparc.xml
@@ -19,7 +19,6 @@
       <cpuselection/>
       <deviceboot/>
       <disksnapshot default='on' toggle='no'/>
-      <externalSnapshot/>
     </features>
   </guest>
 

diff --git a/tests/qemucaps2xmloutdata/caps.x86_64+hvf.xml b/tests/qemucaps2xmloutdata/caps.x86_64+hvf.xml
index f5e49ba4dbd2157b4d11f184648b19771d29d3bf..356819a6c6c36cb065212133bf01699bd1e9707a 100644 (file)
--- a/tests/qemucaps2xmloutdata/caps.x86_64+hvf.xml
+++ b/tests/qemucaps2xmloutdata/caps.x86_64+hvf.xml
@@ -22,7 +22,6 @@
       <cpuselection/>
       <deviceboot/>
       <disksnapshot default='on' toggle='no'/>
-      <externalSnapshot/>
     </features>
   </guest>
 

diff --git a/tests/qemucaps2xmloutdata/caps.x86_64.xml b/tests/qemucaps2xmloutdata/caps.x86_64.xml
index 8dd1439a80a8f56f26b0ce96ba0d7afed8d31f92..35359780c42fc4d9e5a2bda51c4b795e3b477567 100644 (file)
--- a/tests/qemucaps2xmloutdata/caps.x86_64.xml
+++ b/tests/qemucaps2xmloutdata/caps.x86_64.xml
@@ -22,7 +22,6 @@
       <cpuselection/>
       <deviceboot/>
       <disksnapshot default='on' toggle='no'/>
-      <externalSnapshot/>
     </features>
   </guest>