Fix name prefix of VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE

The enum constant names should all have a prefix that matches the enum
name. VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE was missing the "CREATE_"
part of the name prefix.

Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/include/libvirt/libvirt-domain-checkpoint.h b/include/libvirt/libvirt-domain-checkpoint.h
index 58932c8a6a99e4903a70e094fc4f0307cc115844..a2f97531f8b3cce2ddd9dd9929f8f5eb3f63734e 100644 (file)
--- a/include/libvirt/libvirt-domain-checkpoint.h
+++ b/include/libvirt/libvirt-domain-checkpoint.h
@@ -57,8 +57,8 @@ typedef enum {
                                                             quiesce all mounted
                                                             file systems within
                                                             the domain */
-    VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE  = (1 << 2), /* validate disk data state
-                                                            when redefining a checkpoint */
+    VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE_VALIDATE  = (1 << 2),   /* validate disk data state
+                                                                     when redefining a checkpoint */
 } virDomainCheckpointCreateFlags;
 
 /* Create a checkpoint using the current VM state. */

diff --git a/src/libvirt-domain-checkpoint.c b/src/libvirt-domain-checkpoint.c
index e0c2527ccb4dc380a4a12a277dd12ea696c4c742..e6ad4f4f5dd41a14e34e38564c093a42ab016698 100644 (file)
--- a/src/libvirt-domain-checkpoint.c
+++ b/src/libvirt-domain-checkpoint.c
@@ -125,7 +125,7 @@ virDomainCheckpointGetConnect(virDomainCheckpointPtr checkpoint)
  * has a way to resupply correct defaults).  Not all hypervisors support
  * this flag.
  *
- * If @flags includes VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE along with
+ * If @flags includes VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE_VALIDATE along with
  * VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE the state of the metadata related
  * to the disk state of the redefined checkpoint is validated. Note that
  * hypervisors may require that the @domain is running to perform validation.
@@ -160,7 +160,7 @@ virDomainCheckpointCreateXML(virDomainPtr domain,
                              VIR_DOMAIN_CHECKPOINT_CREATE_QUIESCE,
                              error);
 
-    VIR_REQUIRE_FLAG_GOTO(VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE,
+    VIR_REQUIRE_FLAG_GOTO(VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE_VALIDATE,
                           VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE,
                           error);
 

diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
index c24376dbe86142d54db46cbd4e36207b872cbefc..eb33633a11b17bfc2d1bab7b31f0f147d4925641 100644 (file)
--- a/src/qemu/qemu_checkpoint.c
+++ b/src/qemu/qemu_checkpoint.c
@@ -538,13 +538,13 @@ qemuCheckpointCreateXML(virDomainPtr domain,
     virDomainCheckpointPtr checkpoint = NULL;
     bool update_current = true;
     bool redefine = flags & VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE;
-    bool validate_bitmaps = flags & VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE;
+    bool validate_bitmaps = flags & VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE_VALIDATE;
     unsigned int parse_flags = 0;
     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
     g_autoptr(virDomainCheckpointDef) def = NULL;
 
     virCheckFlags(VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE |
-                  VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE, NULL);
+                  VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE_VALIDATE, NULL);
 
     if (redefine) {
         parse_flags |= VIR_DOMAIN_CHECKPOINT_PARSE_REDEFINE;

diff --git a/tools/virsh-checkpoint.c b/tools/virsh-checkpoint.c
index cc2bbdae8a722f47f290afb1165f48719c61ba95..f6396d16eb32d562b67b0909df1082c7cacd9120 100644 (file)
--- a/tools/virsh-checkpoint.c
+++ b/tools/virsh-checkpoint.c
@@ -125,7 +125,7 @@ cmdCheckpointCreate(vshControl *ctl,
     if (vshCommandOptBool(cmd, "redefine"))
         flags |= VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE;
     if (vshCommandOptBool(cmd, "redefine-validate"))
-        flags |= VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE;
+        flags |= VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE_VALIDATE;
     if (vshCommandOptBool(cmd, "quiesce"))
         flags |= VIR_DOMAIN_CHECKPOINT_CREATE_QUIESCE;