From: Asias He <asias.hejun@gmail.com>
Date: Tue, 5 Jun 2012 16:40:43 +0000 (+0800)
Subject: kvm tools: Improve compat message format
X-Git-Tag: next-20120724~32^2~103^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f0888c89262ee3942f002d8b594a264071b17c77;p=karo-tx-linux.git

kvm tools: Improve compat message format

---------
Before:
---------
*** Compatibility Warning ***

        virtio-blk device was not detected

While you have requested a virtio-blk device, the guest kernel did not initialize it.
Please make sure that the guest kernel was compiled with CONFIG_VIRTIO_BLK=y enabled in its .config

*** Compatibility Warning ***

        virtio-net device was not detected

While you have requested a virtio-net device, the guest kernel did not initialize it.
Please make sure that the guest kernel was compiled with CONFIG_VIRTIO_NET=y enabled in its .config

  # KVM session ended normally.

---------
After:
---------
  # KVM compatibility warning.
        virtio-blk device was not detected.
        While you have requested a virtio-blk device, the guest kernel did not initialize it.
        Please make sure that the guest kernel was compiled with CONFIG_VIRTIO_BLK=y enabled in .config.

  # KVM compatibility warning.
        virtio-net device was not detected.
        While you have requested a virtio-net device, the guest kernel did not initialize it.
        Please make sure that the guest kernel was compiled with CONFIG_VIRTIO_NET=y enabled in .config.

  # KVM session ended normally.

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

diff --git a/tools/kvm/guest_compat.c b/tools/kvm/guest_compat.c
index 43b9035f1866..fd4704b20b16 100644
--- a/tools/kvm/guest_compat.c
+++ b/tools/kvm/guest_compat.c
@@ -86,7 +86,7 @@ int compat__print_all_messages(void)
 
 		msg = list_first_entry(&messages, struct compat_message, list);
 
-		printf("\n\n*** Compatibility Warning ***\n\n\t%s\n\n%s\n",
+		printf("\n  # KVM compatibility warning.\n\t%s\n\t%s\n",
 			msg->title, msg->desc);
 
 		list_del(&msg->list);
diff --git a/tools/kvm/virtio/core.c b/tools/kvm/virtio/core.c
index 8e0f63ba4e0a..2dfb828d177f 100644
--- a/tools/kvm/virtio/core.c
+++ b/tools/kvm/virtio/core.c
@@ -217,11 +217,11 @@ int virtio_compat_add_message(const char *device, const char *config)
 		return -ENOMEM;
 	}
 
-	snprintf(title, len, "%s device was not detected", device);
+	snprintf(title, len, "%s device was not detected.", device);
 	snprintf(desc,  len, "While you have requested a %s device, "
 			     "the guest kernel did not initialize it.\n"
-			     "Please make sure that the guest kernel was "
-			     "compiled with %s=y enabled in its .config",
+			     "\tPlease make sure that the guest kernel was "
+			     "compiled with %s=y enabled in .config.",
 			     device, config);
 
 	compat_id = compat__add_message(title, desc);