From: Asias He <asias.hejun@gmail.com>
Date: Thu, 22 Dec 2011 02:10:45 +0000 (+0800)
Subject: kvm tools: Improve 'lkvm {pause,resume}'s output
X-Git-Tag: next-20120402~5^2~71
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d01318c66232c5e63a85013bf26ac1b7c296aefc;p=karo-tx-linux.git

kvm tools: Improve 'lkvm {pause,resume}'s output

lkvm {pause,resume} do not give any feedback to user who uses these
commands in the console where the command run.

This patch makes the command output in the command console instead of
guest console.

Signed-off-by: Asias He <asias.hejun@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
---

diff --git a/tools/kvm/builtin-pause.c b/tools/kvm/builtin-pause.c
index ee5a5b844a78..436963f3e87b 100644
--- a/tools/kvm/builtin-pause.c
+++ b/tools/kvm/builtin-pause.c
@@ -41,7 +41,15 @@ void kvm_pause_help(void)
 
 static int do_pause(const char *name, int sock)
 {
-	return kvm_ipc__send(sock, KVM_IPC_PAUSE);
+	int r;
+
+	r = kvm_ipc__send(sock, KVM_IPC_PAUSE);
+	if (r)
+		return r;
+
+	printf("Guest %s paused\n", name);
+
+	return 0;
 }
 
 int kvm_cmd_pause(int argc, const char **argv, const char *prefix)
diff --git a/tools/kvm/builtin-resume.c b/tools/kvm/builtin-resume.c
index 9c47183c33c6..033a05b7d0a3 100644
--- a/tools/kvm/builtin-resume.c
+++ b/tools/kvm/builtin-resume.c
@@ -41,7 +41,15 @@ void kvm_resume_help(void)
 
 static int do_resume(const char *name, int sock)
 {
-	return kvm_ipc__send(sock, KVM_IPC_RESUME);
+	int r;
+
+	r = kvm_ipc__send(sock, KVM_IPC_RESUME);
+	if (r)
+		return r;
+
+	printf("Guest %s resumed\n", name);
+
+	return 0;
 }
 
 int kvm_cmd_resume(int argc, const char **argv, const char *prefix)
diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c
index 80806a1ae073..bf39cfb6790c 100644
--- a/tools/kvm/builtin-run.c
+++ b/tools/kvm/builtin-run.c
@@ -522,7 +522,6 @@ static void handle_pause(int fd, u32 type, u32 len, u8 *msg)
 	}
 
 	is_paused = !is_paused;
-	pr_info("Guest %s\n", is_paused ? "paused" : "resumed");
 }
 
 static void handle_vmstate(int fd, u32 type, u32 len, u8 *msg)