From nobody Mon Sep 16 19:33:22 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
as permitted sender) client-ip=209.132.183.28;
envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com;
dmarc=pass(p=none dis=none) header.from=redhat.com
Return-Path: virDomainSaveImageGetXMLDesc()
to work with
those files.
System checkpoints are created
- by virDomainSnapshotCreateXML()
with no flags, and
+
Full system snapshots are created
+ by virDomainSnapshotCreateXML()
with no flags, while
disk snapshots are created by the same function with
- the VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY
flag; in
- both cases, they are restored by
+ the VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY
+ flag. Regardless of the flags provided, restoration of the
+ snapshot is handled by
the virDomainRevertToSnapshot()
function. For
these types of snapshots, libvirt tracks each snapshot as a
separate virDomainSnapshotPtr
object, and maintains
@@ -128,13 +129,10 @@
what file name is created in an external snapshot. On output,
this is fully populated to show the state of each disk in the
snapshot, including any properties that were generated by the
- hypervisor defaults. For system checkpoints, this field is
- ignored on input and omitted on output (a system checkpoint
- implies that all disks participate in the snapshot process,
- and since the current implementation only does internal system
- checkpoints, there are no extra details to add); a future
- release may allow the use of disks
with a system
- checkpoint. This element has a list of disk
+ hypervisor defaults. For full system snapshots, this field is
+ ignored on input and omitted on output (a full system snapshot
+ implies that all disks participate in the snapshot process).
+ This element has a list of disk
sub-elements, describing anywhere from zero to all of the
disks associated with the domain. Since
0.9.5
@@ -206,11 +204,12 @@
state
virDomainRevertToSnapshot()
. Additionally,
+ this state, unless overridden
+ by virDomainRevertToSnapshot()
flags to revert to
+ a running or paused state. Additionally,
this field can be the value "disk-snapshot"
(since 0.9.5) when it represents
only a disk snapshot (no VM memory state), and reverting to this
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index adba149241..f89048e3f1 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -1302,8 +1302,8 @@ virDomainSnapshotRedefinePrep(virDomainPtr domain,
if ((other->def->state =3D=3D VIR_DOMAIN_DISK_SNAPSHOT) !=3D
(def->state =3D=3D VIR_DOMAIN_DISK_SNAPSHOT)) {
virReportError(VIR_ERR_INVALID_ARG,
- _("cannot change between disk snapshot and "
- "system checkpoint in snapshot %s"),
+ _("cannot change between disk only and "
+ "full system in snapshot %s"),
def->name);
goto cleanup;
}
diff --git a/src/libvirt-domain-snapshot.c b/src/libvirt-domain-snapshot.c
index 100326a5e7..1cc0188928 100644
--- a/src/libvirt-domain-snapshot.c
+++ b/src/libvirt-domain-snapshot.c
@@ -105,8 +105,9 @@ virDomainSnapshotGetConnect(virDomainSnapshotPtr snapsh=
ot)
* contained in xmlDesc.
*
* If @flags is 0, the domain can be active, in which case the
- * snapshot will be a system checkpoint (both disk state and runtime
- * VM state such as RAM contents), where reverting to the snapshot is
+ * snapshot will be a full system snapshot (capturing both disk state,
+ * and runtime VM state such as RAM contents), where reverting to the
+ * snapshot is
* the same as resuming from hibernation (TCP connections may have
* timed out, but everything else picks up where it left off); or
* the domain can be inactive, in which case the snapshot includes
@@ -149,7 +150,7 @@ virDomainSnapshotGetConnect(virDomainSnapshotPtr snapsh=
ot)
* is not paused while creating the snapshot. This increases the size
* of the memory dump file, but reduces downtime of the guest while
* taking the snapshot. Some hypervisors only support this flag during
- * external checkpoints.
+ * external snapshots.
*
* If @flags includes VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY, then the
* snapshot will be limited to the disks described in @xmlDesc, and no
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 9f71641dfa..bb5bc4d200 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -2153,7 +2153,7 @@ qemuDomainReset(virDomainPtr dom, unsigned int flags)
}
-/* Count how many snapshots in a set are external snapshots or checkpoints=
. */
+/* Count how many snapshots in a set are external snapshots. */
static int
qemuDomainSnapshotCountExternal(void *payload,
const void *name ATTRIBUTE_UNUSED,
@@ -14713,7 +14713,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm,
if ((def->memory =3D=3D VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL && !foun=
d_internal) ||
(found_internal && forbid_internal)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("internal snapshots and checkpoints require all "
+ _("internal and full system snapshots require all "
"disks to be selected for snapshot"));
goto cleanup;
}
@@ -15163,7 +15163,7 @@ qemuDomainSnapshotCreateActiveExternal(virQEMUDrive=
rPtr driver,
if (virDomainObjGetState(vm, NULL) =3D=3D VIR_DOMAIN_PMSUSPENDED) {
pmsuspended =3D true;
} else if (virDomainObjGetState(vm, NULL) =3D=3D VIR_DOMAIN_RUNNING) {
- /* For external checkpoints (those with memory), the guest
+ /* For full system external snapshots (those with memory), the gue=
st
* must pause (either by libvirt up front, or by qemu after
* _LIVE converges). */
if (memory)
@@ -15391,7 +15391,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
redefine)) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("live snapshot creation is supported only "
- "with external checkpoints"));
+ "during full system snapshots"));
goto cleanup;
}
@@ -15511,12 +15511,12 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
} else if (virDomainObjIsActive(vm)) {
if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY ||
snap->def->memory =3D=3D VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL=
) {
- /* external checkpoint or disk snapshot */
+ /* external full system or disk snapshot */
if (qemuDomainSnapshotCreateActiveExternal(driver,
vm, snap, flags) < =
0)
goto endjob;
} else {
- /* internal checkpoint */
+ /* internal full system */
if (qemuDomainSnapshotCreateActiveInternal(driver,
vm, snap, flags) < =
0)
goto endjob;
diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c
index 73861957ba..7b340162f3 100644
--- a/tools/virsh-snapshot.c
+++ b/tools/virsh-snapshot.c
@@ -1427,7 +1427,7 @@ static const vshCmdOptDef opts_snapshot_list[] =3D {
},
{.name =3D "active",
.type =3D VSH_OT_BOOL,
- .help =3D N_("filter by snapshots taken while active (system checkpoi=
nts)")
+ .help =3D N_("filter by snapshots taken while active (full system sna=
pshots)")
},
{.name =3D "disk-only",
.type =3D VSH_OT_BOOL,
diff --git a/tools/virsh.pod b/tools/virsh.pod
index 86c041d575..58ab9a090b 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -4490,8 +4490,8 @@ If I<--halt> is specified, the domain will be left in=
an inactive state
after the snapshot is created.
If I<--disk-only> is specified, the snapshot will only include disk
-state rather than the usual system checkpoint with vm state. Disk
-snapshots are faster than full system checkpoints, but reverting to a
+content rather than the usual full system snapshot with vm state. Disk
+snapshots are captured faster than full system snapshots, but reverting to=
a
disk snapshot may require fsck or journal replays, since it is like
the disk state at the point when the power cord is abruptly pulled;
and mixing I<--halt> and I<--disk-only> loses any data that was not
@@ -4530,10 +4530,10 @@ this. If this flag is not specified, then some hyp=
ervisors may fail
after partially performing the action, and B