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. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- include/libvirt/libvirt-domain-checkpoint.h | 4 ++-- src/libvirt-domain-checkpoint.c | 4 ++-- src/qemu/qemu_checkpoint.c | 4 ++-- tools/virsh-checkpoint.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/libvirt/libvirt-domain-checkpoint.h b/include/libvirt/libvirt-domain-checkpoint.h index 58932c8a6a..a2f97531f8 100644 --- 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 e0c2527ccb..e6ad4f4f5d 100644 --- 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 c24376dbe8..eb33633a11 100644 --- 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 cc2bbdae8a..f6396d16eb 100644 --- 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; -- 2.28.0