[PATCH 3/3] kvm tools: Improve compat message format

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



---------
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@xxxxxxxxx>
---
 tools/kvm/guest_compat.c |    2 +-
 tools/kvm/virtio/core.c  |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/kvm/guest_compat.c b/tools/kvm/guest_compat.c
index 43b9035..fd4704b 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 8e0f63b..2dfb828 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);
-- 
1.7.10.2

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux