conf: Drop unused VIR_DOMAIN_DEF_FORMAT_UPDATE_CPU

The only real usage of this flag was removed by "cpu_conf: Drop
updateCPU from virCPUDefFormat".

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index f4c2f26ff84ab29a1c71d8a94f3b3763bf130721..e3e9fc748a895ba675b4533fb55ead2ab2ff949a 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -87,7 +87,6 @@ struct _virDomainXMLOption {
 #define VIR_DOMAIN_DEF_FORMAT_COMMON_FLAGS             \
     (VIR_DOMAIN_DEF_FORMAT_SECURE |                    \
      VIR_DOMAIN_DEF_FORMAT_INACTIVE |                  \
-     VIR_DOMAIN_DEF_FORMAT_UPDATE_CPU |                \
      VIR_DOMAIN_DEF_FORMAT_MIGRATABLE)
 
 VIR_ENUM_IMPL(virDomainTaint, VIR_DOMAIN_TAINT_LAST,
@@ -25998,8 +25997,6 @@ unsigned int virDomainDefFormatConvertXMLFlags(unsigned int flags)
         formatFlags |= VIR_DOMAIN_DEF_FORMAT_SECURE;
     if (flags & VIR_DOMAIN_XML_INACTIVE)
         formatFlags |= VIR_DOMAIN_DEF_FORMAT_INACTIVE;
-    if (flags & VIR_DOMAIN_XML_UPDATE_CPU)
-        formatFlags |= VIR_DOMAIN_DEF_FORMAT_UPDATE_CPU;
     if (flags & VIR_DOMAIN_XML_MIGRATABLE)
         formatFlags |= VIR_DOMAIN_DEF_FORMAT_MIGRATABLE;
 

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index bb3b6f0c3c1399a6751e4ed63c3d629541c3ebd6..e11ae5247876dad632c1f6835a0f25d82a1653ec 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2857,17 +2857,16 @@ typedef enum {
 typedef enum {
     VIR_DOMAIN_DEF_FORMAT_SECURE          = 1 << 0,
     VIR_DOMAIN_DEF_FORMAT_INACTIVE        = 1 << 1,
-    VIR_DOMAIN_DEF_FORMAT_UPDATE_CPU      = 1 << 2,
-    VIR_DOMAIN_DEF_FORMAT_MIGRATABLE      = 1 << 3,
+    VIR_DOMAIN_DEF_FORMAT_MIGRATABLE      = 1 << 2,
     /* format internal domain status information */
-    VIR_DOMAIN_DEF_FORMAT_STATUS          = 1 << 4,
+    VIR_DOMAIN_DEF_FORMAT_STATUS          = 1 << 3,
     /* format <actual> element */
-    VIR_DOMAIN_DEF_FORMAT_ACTUAL_NET      = 1 << 5,
+    VIR_DOMAIN_DEF_FORMAT_ACTUAL_NET      = 1 << 4,
     /* format original states of host PCI device */
-    VIR_DOMAIN_DEF_FORMAT_PCI_ORIG_STATES = 1 << 6,
-    VIR_DOMAIN_DEF_FORMAT_ALLOW_ROM       = 1 << 7,
-    VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT      = 1 << 8,
-    VIR_DOMAIN_DEF_FORMAT_CLOCK_ADJUST    = 1 << 9,
+    VIR_DOMAIN_DEF_FORMAT_PCI_ORIG_STATES = 1 << 5,
+    VIR_DOMAIN_DEF_FORMAT_ALLOW_ROM       = 1 << 6,
+    VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT      = 1 << 7,
+    VIR_DOMAIN_DEF_FORMAT_CLOCK_ADJUST    = 1 << 8,
 } virDomainDefFormatFlags;
 
 /* Use these flags to skip specific domain ABI consistency checks done

diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 5a07d3734aa4adb5c3fb09e58eaf50dbb900ef4e..07706e0b269f449bb659b27af340bbd7e0ee58ab 100644 (file)
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -703,8 +703,7 @@ virDomainSnapshotDefFormat(const char *domain_uuid,
     virBuffer buf = VIR_BUFFER_INITIALIZER;
     size_t i;
 
-    virCheckFlags(VIR_DOMAIN_DEF_FORMAT_SECURE |
-                  VIR_DOMAIN_DEF_FORMAT_UPDATE_CPU, NULL);
+    virCheckFlags(VIR_DOMAIN_DEF_FORMAT_SECURE, NULL);
 
     flags |= VIR_DOMAIN_DEF_FORMAT_INACTIVE;