Provide the vm_resume helper which resumes the vm in the requested state,
correctly restoring the suspended state.

Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
---
 include/sysemu/runstate.h |  8 ++++++++
 system/cpus.c             | 11 +++++++++++
 2 files changed, 19 insertions(+)

diff --git a/include/sysemu/runstate.h b/include/sysemu/runstate.h
index 9e78c7f..3fa28a4 100644
--- a/include/sysemu/runstate.h
+++ b/include/sysemu/runstate.h
@@ -50,6 +50,14 @@ void vm_start(void);
  */
 int vm_prepare_start(bool step_pending, RunState state);
 
+/**
+ * vm_resume: If @state is a running state, start the vm and set the state,
+ * else just set the state.
+ *
+ * @state: the state to restore
+ */
+void vm_resume(RunState state);
+
 int vm_stop(RunState state);
 int vm_stop_force_state(RunState state);
 int vm_shutdown(void);
diff --git a/system/cpus.c b/system/cpus.c
index 4d05d83..1d867bb 100644
--- a/system/cpus.c
+++ b/system/cpus.c
@@ -725,6 +725,17 @@ void vm_start(void)
     }
 }
 
+void vm_resume(RunState state)
+{
+    if (state == RUN_STATE_RUNNING) {
+        vm_start();
+    } else if (state == RUN_STATE_SUSPENDED) {
+        vm_prepare_start(false, state);
+    } else {
+        runstate_set(state);
+    }
+}
+
 /* does a state transition even if the VM is already stopped,
    current state is forgotten forever */
 int vm_stop_force_state(RunState state)
-- 
1.8.3.1

Steve Sistare <steven.sistare@oracle.com> writes:

> Provide the vm_resume helper which resumes the vm in the requested state,
> correctly restoring the suspended state.
>
> Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
> ---
>  include/sysemu/runstate.h |  8 ++++++++
>  system/cpus.c             | 11 +++++++++++
>  2 files changed, 19 insertions(+)
>
> diff --git a/include/sysemu/runstate.h b/include/sysemu/runstate.h
> index 9e78c7f..3fa28a4 100644
> --- a/include/sysemu/runstate.h
> +++ b/include/sysemu/runstate.h
> @@ -50,6 +50,14 @@ void vm_start(void);
>   */
>  int vm_prepare_start(bool step_pending, RunState state);
>  
> +/**
> + * vm_resume: If @state is a running state, start the vm and set the state,
> + * else just set the state.
> + *
> + * @state: the state to restore
> + */
> +void vm_resume(RunState state);
> +
>  int vm_stop(RunState state);
>  int vm_stop_force_state(RunState state);
>  int vm_shutdown(void);
> diff --git a/system/cpus.c b/system/cpus.c
> index 4d05d83..1d867bb 100644
> --- a/system/cpus.c
> +++ b/system/cpus.c
> @@ -725,6 +725,17 @@ void vm_start(void)
>      }
>  }
>  
> +void vm_resume(RunState state)
> +{
> +    if (state == RUN_STATE_RUNNING) {
> +        vm_start();
> +    } else if (state == RUN_STATE_SUSPENDED) {
> +        vm_prepare_start(false, state);
> +    } else {
> +        runstate_set(state);
> +    }
> +}
> +
>  /* does a state transition even if the VM is already stopped,
>     current state is forgotten forever */
>  int vm_stop_force_state(RunState state)

Reviewed-by: Fabiano Rosas <farosas@suse.de>