[libvirt] [PATCH 33/26] snapshot: support extra state in snapshots

Eric Blake eblake at redhat.com
Fri Aug 19 17:06:54 UTC 2011


On 08/18/2011 06:07 PM, Eric Blake wrote:
> In order to distinguish disk snapshots from system checkpoints, a
> new state value that is only valid for snapshots is helpful.
>
> * include/libvirt/libvirt.h.in (VIR_DOMAIN_LAST): New placeholder.
> * src/conf/domain_conf.h (virDomainSnapshotState): New enum mapping.
> * src/conf/domain_conf.c (virDomainState): Use placeholder.
> (virDomainSnapshotState): Extend mapping by one for use in snapshot.
> (virDomainSnapshotDefParseString, virDomainSnapshotDefFormat):
> Handle new state.
> (virDomainObjSetState, virDomainStateReasonToString)
> (virDomainStateReasonFromString): Avoid compiler warnings.
> * tools/virsh.c (vshDomainState, vshDomainStateReasonToString):
> Likewise.
> (cmdList): Translate state output.
> * src/libvirt_private.syms (domain_conf.h): Export new functions.
> * docs/schemas/domainsnapshot.rng: Tighten state definition.
> * docs/formatsnapshot.html.in: Document it.
> * tests/domainsnapshotxml2xmlout/disk_snapshot.xml: New test.
> ---

Squash this in, so later patches can let drivers act on that internal 
state value by a decent name:

diff --git i/src/conf/domain_conf.h w/src/conf/domain_conf.h
index 863d64f..ea8194a 100644
--- i/src/conf/domain_conf.h
+++ w/src/conf/domain_conf.h
@@ -226,6 +226,11 @@ enum virDomainDiskSnapshot {
      VIR_DOMAIN_DISK_SNAPSHOT_LAST
  };

+enum virDomainSnapshotState {
+    /* Inherit the VIR_DOMAIN_* states from virDomainState.  */
+    VIR_DOMAIN_DISK_SNAPSHOT = VIR_DOMAIN_LAST,
+};
+
  /* Stores the virtual disk configuration */
  typedef struct _virDomainDiskDef virDomainDiskDef;
  typedef virDomainDiskDef *virDomainDiskDefPtr;


-- 
Eric Blake   eblake at redhat.com    +1-801-349-2682
Libvirt virtualization library http://libvirt.org




More information about the libvir-list mailing list