From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 13 May 2025 17:05:31 +0000 (+0200)
Subject: qemuProcessStart: Rename 'snapshot' to 'internalSnapshotRevert'
X-Git-Tag: v11.4.0-rc1~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=897b3aa3c5dc53fb635c0f659847347a1f73b74e;p=thirdparty%2Flibvirt.git

qemuProcessStart: Rename 'snapshot' to 'internalSnapshotRevert'

Make it obvious that the variable is used for internal snapshot
reversion by renaming it. This is necessary mainly as the function
parameters are not documented, but makes it obvious also if they were.

We can also report the name of the sanpshot rather than a pointer that
says absolutely nothing to the reader.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 8533dab730..b7757aecfc 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8472,7 +8472,7 @@ qemuProcessStart(virConnectPtr conn,
                  qemuProcessIncomingDef *incoming,
                  int migrateFd,
                  const char *migratePath,
-                 virDomainMomentObj *snapshot,
+                 virDomainMomentObj *internalSnapshotRevert,
                  qemuMigrationParams *migParams,
                  virNetDevVPortProfileOp vmop,
                  unsigned int flags)
@@ -8486,11 +8486,12 @@ qemuProcessStart(virConnectPtr conn,
 
     VIR_DEBUG("conn=%p driver=%p vm=%p name=%s id=%d asyncJob=%s "
               "incoming=%p migrateFd=%d migratePath=%s "
-              "snapshot=%p vmop=%d flags=0x%x",
+              "internalSnapshotRevert=%s vmop=%d flags=0x%x",
               conn, driver, vm, vm->def->name, vm->def->id,
               virDomainAsyncJobTypeToString(asyncJob),
               incoming, migrateFd, NULLSTR(migratePath),
-              snapshot, vmop, flags);
+              NULLSTR(internalSnapshotRevert ? internalSnapshotRevert->def->name : NULL),
+              vmop, flags);
 
     virCheckFlagsGoto(VIR_QEMU_PROCESS_START_COLD |
                       VIR_QEMU_PROCESS_START_PAUSED |
@@ -8498,7 +8499,7 @@ qemuProcessStart(virConnectPtr conn,
                       VIR_QEMU_PROCESS_START_GEN_VMID |
                       VIR_QEMU_PROCESS_START_RESET_NVRAM, cleanup);
 
-    if (!incoming && !snapshot)
+    if (!incoming && !internalSnapshotRevert)
         flags |= VIR_QEMU_PROCESS_START_NEW;
 
     if (qemuProcessInit(driver, vm, updatedCPU,
@@ -8519,7 +8520,7 @@ qemuProcessStart(virConnectPtr conn,
     }
 
     if ((rv = qemuProcessLaunch(conn, driver, vm, asyncJob, incoming,
-                                snapshot, vmop, flags)) < 0) {
+                                internalSnapshotRevert, vmop, flags)) < 0) {
         if (rv == -2)
             relabel = true;
         goto stop;
diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
index 021dbbd960..6d5f189aa4 100644
--- a/src/qemu/qemu_process.h
+++ b/src/qemu/qemu_process.h
@@ -91,7 +91,7 @@ int qemuProcessStart(virConnectPtr conn,
                      qemuProcessIncomingDef *incoming,
                      int stdin_fd,
                      const char *stdin_path,
-                     virDomainMomentObj *snapshot,
+                     virDomainMomentObj *internalSnapshotRevert,
                      qemuMigrationParams *migParams,
                      virNetDevVPortProfileOp vmop,
                      unsigned int flags);