9:34 p.m.
Clean up the previous patch which abused switch on virDomainState
while working with a variable containing virDomainSnapshotState, by
converting the two affected switch statements to now use the right
enum.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
src/qemu/qemu_driver.c | 67 ++++++++++++++++++++----------------------
1 file changed, 32 insertions(+), 35 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 2abe3417c9..7e01b396fb 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15693,7 +15693,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
virQEMUDriverConfigPtr cfg = NULL;
virCapsPtr caps = NULL;
qemuDomainObjPrivatePtr priv;
- virDomainState state;
+ virDomainSnapshotState state;
virCheckFlags(VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE |
VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT |
@@ -15779,36 +15779,36 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
}
/* allow snapshots only in certain states */
- state = vm->state.state;
- if (redefine)
- state = def->state == VIR_SNAP_STATE_DISK_SNAPSHOT ? VIR_DOMAIN_SHUTOFF :
- def->state;
- /* FIXME: state should be virDomainSnapshotState, with the switch
- * statement handling of VIR_SNAP_STATE_DISK_SNAPSHOT (the only
- * enum value added beyond what virDomainState supports). But for
- * now it doesn't matter, because we slammed the extra snapshot
- * state into a safe domain state. */
+ state = redefine ? def->state : vm->state.state;
switch (state) {
/* valid states */
- case VIR_DOMAIN_RUNNING:
- case VIR_DOMAIN_PAUSED:
- case VIR_DOMAIN_SHUTDOWN:
- case VIR_DOMAIN_SHUTOFF:
- case VIR_DOMAIN_CRASHED:
+ case VIR_SNAP_STATE_RUNNING:
+ case VIR_SNAP_STATE_PAUSED:
+ case VIR_SNAP_STATE_SHUTDOWN:
+ case VIR_SNAP_STATE_SHUTOFF:
+ case VIR_SNAP_STATE_CRASHED:
break;
- case VIR_DOMAIN_PMSUSPENDED:
+ case VIR_SNAP_STATE_DISK_SNAPSHOT:
+ if (!redefine) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid domain state
%s"),
+ virDomainSnapshotStateTypeToString(state));
+ goto cleanup;
+ }
+ break;
+
+ case VIR_SNAP_STATE_PMSUSPENDED:
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("qemu doesn't support taking snapshots of "
"PMSUSPENDED guests"));
goto cleanup;
/* invalid states */
- case VIR_DOMAIN_NOSTATE:
- case VIR_DOMAIN_BLOCKED: /* invalid state, unused in qemu */
- case VIR_DOMAIN_LAST:
+ case VIR_SNAP_STATE_NOSTATE:
+ case VIR_SNAP_STATE_BLOCKED: /* invalid state, unused in qemu */
+ case VIR_SNAP_STATE_LAST:
virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid domain state %s"),
- virDomainStateTypeToString(state));
+ virDomainSnapshotStateTypeToString(state));
goto cleanup;
}
@@ -16486,14 +16486,9 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
cookie = (qemuDomainSaveCookiePtr) snap->def->cookie;
- /* FIXME: This cast should be to virDomainSnapshotState, with
- * better handling of VIR_SNAP_STATE_DISK_SNAPSHOT (the only enum
- * value added beyond what virDomainState supports). But for now
- * it doesn't matter, because of the above rejection of revert to
- * external snapshots. */
- switch ((virDomainState) snap->def->state) {
- case VIR_DOMAIN_RUNNING:
- case VIR_DOMAIN_PAUSED:
+ switch ((virDomainSnapshotState) snap->def->state) {
+ case VIR_SNAP_STATE_RUNNING:
+ case VIR_SNAP_STATE_PAUSED:
start_flags |= VIR_QEMU_PROCESS_START_PAUSED;
@@ -16668,9 +16663,9 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
}
break;
- case VIR_DOMAIN_SHUTDOWN:
- case VIR_DOMAIN_SHUTOFF:
- case VIR_DOMAIN_CRASHED:
+ case VIR_SNAP_STATE_SHUTDOWN:
+ case VIR_SNAP_STATE_SHUTOFF:
+ case VIR_SNAP_STATE_CRASHED:
/* Transitions 1, 4, 7 */
/* Newer qemu -loadvm refuses to revert to the state of a snapshot
* created by qemu-img snapshot -c. If the domain is running, we
@@ -16727,15 +16722,17 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
}
break;
- case VIR_DOMAIN_PMSUSPENDED:
+ case VIR_SNAP_STATE_PMSUSPENDED:
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("qemu doesn't support reversion of snapshot taken in
"
"PMSUSPENDED state"));
goto endjob;
- case VIR_DOMAIN_NOSTATE:
- case VIR_DOMAIN_BLOCKED:
- case VIR_DOMAIN_LAST:
+ case VIR_SNAP_STATE_DISK_SNAPSHOT:
+ /* Rejected earlier as an external snapshot */
+ case VIR_SNAP_STATE_NOSTATE:
+ case VIR_SNAP_STATE_BLOCKED:
+ case VIR_SNAP_STATE_LAST:
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Invalid target domain state '%s'. Refusing "
"snapshot reversion"),
--
2.20.1