virDomainSnapshotAlignDisks: Convert @default_snapshot to virDomainSnapshotLocation

Use the appropriate type for the variable and fix all callers.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index d7e18596bc73b0f9e11812c99ee5bd8fbc49ce9c..f0ded7919c00897983a0064a042f464271fbabe2 100644 (file)
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -473,7 +473,7 @@ virDomainSnapshotRedefineValidate(virDomainSnapshotDef *def,
                                   virDomainXMLOption *xmlopt,
                                   unsigned int flags)
 {
-    int align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL;
+    virDomainSnapshotLocation align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL;
     bool align_match = true;
     bool external = def->state == VIR_DOMAIN_SNAPSHOT_DISK_SNAPSHOT ||
         virDomainSnapshotDefIsExternal(def);
@@ -640,7 +640,7 @@ virDomainSnapshotDefAssignExternalNames(virDomainSnapshotDef *def)
  */
 int
 virDomainSnapshotAlignDisks(virDomainSnapshotDef *snapdef,
-                            int default_snapshot,
+                            virDomainSnapshotLocation default_snapshot,
                             bool require_match)
 {
     virDomainDef *domdef = snapdef->parent.dom;

diff --git a/src/conf/snapshot_conf.h b/src/conf/snapshot_conf.h
index a3ec0cd410980e1adaa1cda21b894b526931542d..e5d4d0fc4592ac3f224da7b486ef9a79c71ab8e3 100644 (file)
--- a/src/conf/snapshot_conf.h
+++ b/src/conf/snapshot_conf.h
@@ -126,7 +126,7 @@ char *virDomainSnapshotDefFormat(const char *uuidstr,
                                  virDomainXMLOption *xmlopt,
                                  unsigned int flags);
 int virDomainSnapshotAlignDisks(virDomainSnapshotDef *snapshot,
-                                int default_snapshot,
+                                virDomainSnapshotLocation default_snapshot,
                                 bool require_match);
 
 bool virDomainSnapshotDefIsExternal(virDomainSnapshotDef *def);

diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index f92e00f9c0e7e5ddcb514815f443e6db28e7ebc9..51df0ed8dfb248784f4da95b474946ab8a275e5b 100644 (file)
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -1630,7 +1630,7 @@ qemuSnapshotCreateAlignDisks(virDomainObj *vm,
 {
     g_autofree char *xml = NULL;
     qemuDomainObjPrivate *priv = vm->privateData;
-    int align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL;
+    virDomainSnapshotLocation align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL;
     bool align_match = true;
 
     /* Easiest way to clone inactive portion of vm->def is via

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 0e93b79922b9b3cd8aa735c5c764045c78a11640..2ff56cf03f77ed7d2a6f5a947e775f159b0905d9 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -8717,7 +8717,7 @@ testDomainSnapshotAlignDisks(virDomainObj *vm,
                              virDomainSnapshotDef *def,
                              unsigned int flags)
 {
-    int align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL;
+    virDomainSnapshotLocation align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL;
     bool align_match = true;
 
     if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY) {