kvm tools: Check the state before pause/resume

Let the user know what happened Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com> Signed-off-by: Pekka Enberg <penberg@kernel.org>
kvmtool · Jun 1, 2015 · 08ffc82 · 08ffc82
1 parent 0a56c42
commit 08ffc82
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/builtin-list.c b/builtin-list.c
@@ -51,7 +51,7 @@ static pid_t get_pid(int sock)
 	return pid;
 }
 
-static int get_vmstate(int sock)
+int get_vmstate(int sock)
 {
 	int vmstate;
 	int r;

diff --git a/builtin-pause.c b/builtin-pause.c
@@ -1,6 +1,7 @@
 #include <kvm/util.h>
 #include <kvm/kvm-cmd.h>
 #include <kvm/builtin-pause.h>
+#include <kvm/builtin-list.h>
 #include <kvm/kvm.h>
 #include <kvm/parse-options.h>
 #include <kvm/kvm-ipc.h>
@@ -42,6 +43,15 @@ void kvm_pause_help(void)
 static int do_pause(const char *name, int sock)
 {
 	int r;
+	int vmstate;
+
+	vmstate = get_vmstate(sock);
+	if (vmstate < 0)
+		return vmstate;
+	if (vmstate == KVM_VMSTATE_PAUSED) {
+		printf("Guest %s is already paused.\n", name);
+		return 0;
+	}
 
 	r = kvm_ipc__send(sock, KVM_IPC_PAUSE);
 	if (r)

diff --git a/builtin-resume.c b/builtin-resume.c
@@ -1,6 +1,7 @@
 #include <kvm/util.h>
 #include <kvm/kvm-cmd.h>
 #include <kvm/builtin-resume.h>
+#include <kvm/builtin-list.h>
 #include <kvm/kvm.h>
 #include <kvm/parse-options.h>
 #include <kvm/kvm-ipc.h>
@@ -42,6 +43,15 @@ void kvm_resume_help(void)
 static int do_resume(const char *name, int sock)
 {
 	int r;
+	int vmstate;
+
+	vmstate = get_vmstate(sock);
+	if (vmstate < 0)
+		return vmstate;
+	if (vmstate == KVM_VMSTATE_RUNNING) {
+		printf("Guest %s is still running.\n", name);
+		return 0;
+	}
 
 	r = kvm_ipc__send(sock, KVM_IPC_RESUME);
 	if (r)

diff --git a/include/kvm/builtin-list.h b/include/kvm/builtin-list.h
@@ -5,5 +5,6 @@
 
 int kvm_cmd_list(int argc, const char **argv, const char *prefix);
 void kvm_list_help(void) NORETURN;
+int get_vmstate(int sock);
 
 #endif