From 02ec1e43741d56bf1e287af5cae5c1f759d9b898 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Thu, 13 Oct 2011 11:32:42 +0200 Subject: [PATCH] kvm tools: Improve compat message Suggested-by: Ingo Molnar Acked-by: Ingo Molnar Signed-off-by: Sasha Levin Signed-off-by: Pekka Enberg --- tools/kvm/virtio/9p.c | 7 ++++--- tools/kvm/virtio/balloon.c | 7 ++++--- tools/kvm/virtio/blk.c | 7 ++++--- tools/kvm/virtio/console.c | 7 ++++--- tools/kvm/virtio/net.c | 7 ++++--- tools/kvm/virtio/rng.c | 7 ++++--- 6 files changed, 24 insertions(+), 18 deletions(-) diff --git a/tools/kvm/virtio/9p.c b/tools/kvm/virtio/9p.c index b9b92b859e74..8dbd016c9d52 100644 --- a/tools/kvm/virtio/9p.c +++ b/tools/kvm/virtio/9p.c @@ -1251,9 +1251,10 @@ int virtio_9p__register(struct kvm *kvm, const char *root, const char *tag_name) if (compat_id != -1) compat_id = compat__add_message("virtio-9p device was not detected", "While you have requested a virtio-9p device, " - "the guest kernel didn't seem to detect it.\n" - "Please make sure that the kernel was compiled " - "with CONFIG_NET_9P_VIRTIO."); + "the guest kernel did not initialize it.\n" + "Please make sure that the guest kernel was " + "compiled with CONFIG_NET_9P_VIRTIO=y enabled " + "in its .config"); return err; diff --git a/tools/kvm/virtio/balloon.c b/tools/kvm/virtio/balloon.c index 643392bbd7a6..1691b79fa075 100644 --- a/tools/kvm/virtio/balloon.c +++ b/tools/kvm/virtio/balloon.c @@ -283,7 +283,8 @@ void virtio_bln__init(struct kvm *kvm) if (compat_id != -1) compat_id = compat__add_message("virtio-balloon device was not detected", "While you have requested a virtio-balloon device, " - "the guest kernel didn't seem to detect it.\n" - "Please make sure that the kernel was compiled " - "with CONFIG_VIRTIO_BALLOON."); + "the guest kernel did not initialize it.\n" + "Please make sure that the guest kernel was " + "compiled with CONFIG_VIRTIO_BALLOON=y enabled " + "in its .config"); } diff --git a/tools/kvm/virtio/blk.c b/tools/kvm/virtio/blk.c index 272613b445e7..86059510c594 100644 --- a/tools/kvm/virtio/blk.c +++ b/tools/kvm/virtio/blk.c @@ -223,9 +223,10 @@ void virtio_blk__init(struct kvm *kvm, struct disk_image *disk) if (compat_id != -1) compat_id = compat__add_message("virtio-blk device was not detected", "While you have requested a virtio-blk device, " - "the guest kernel didn't seem to detect it.\n" - "Please make sure that the kernel was compiled " - "with CONFIG_VIRTIO_BLK."); + "the guest kernel did not initialize it.\n" + "Please make sure that the guest kernel was " + "compiled with CONFIG_VIRTIO_BLK=y enabled " + "in its .config"); } void virtio_blk__init_all(struct kvm *kvm) diff --git a/tools/kvm/virtio/console.c b/tools/kvm/virtio/console.c index ef1ef0d96f09..36997bd70b1a 100644 --- a/tools/kvm/virtio/console.c +++ b/tools/kvm/virtio/console.c @@ -192,7 +192,8 @@ void virtio_console__init(struct kvm *kvm) if (compat_id != -1) compat_id = compat__add_message("virtio-console device was not detected", "While you have requested a virtio-console device, " - "the guest kernel didn't seem to detect it.\n" - "Please make sure that the kernel was compiled " - "with CONFIG_VIRTIO_CONSOLE."); + "the guest kernel did not initialize it.\n" + "Please make sure that the guest kernel was " + "compiled with CONFIG_VIRTIO_CONSOLE=y enabled " + "in its .config"); } diff --git a/tools/kvm/virtio/net.c b/tools/kvm/virtio/net.c index 9c39a8784ec2..bfa2c7b4a0f5 100644 --- a/tools/kvm/virtio/net.c +++ b/tools/kvm/virtio/net.c @@ -416,7 +416,8 @@ void virtio_net__init(const struct virtio_net_params *params) if (compat_id != -1) compat_id = compat__add_message("virtio-net device was not detected", "While you have requested a virtio-net device, " - "the guest kernel didn't seem to detect it.\n" - "Please make sure that the kernel was compiled " - "with CONFIG_VIRTIO_NET."); + "the guest kernel did not initialize it.\n" + "Please make sure that the guest kernel was " + "compiled with CONFIG_VIRTIO_NET=y enabled " + "in its .config"); } diff --git a/tools/kvm/virtio/rng.c b/tools/kvm/virtio/rng.c index 17cd49292a41..c7e7f2d296b3 100644 --- a/tools/kvm/virtio/rng.c +++ b/tools/kvm/virtio/rng.c @@ -167,9 +167,10 @@ void virtio_rng__init(struct kvm *kvm) if (compat_id != -1) compat_id = compat__add_message("virtio-rng device was not detected", "While you have requested a virtio-rng device, " - "the guest kernel didn't seem to detect it.\n" - "Please make sure that the kernel was compiled " - "with CONFIG_HW_RANDOM_VIRTIO."); + "the guest kernel did not initialize it.\n" + "Please make sure that the guest kernel was " + "compiled with CONFIG_HW_RANDOM_VIRTIO=y enabled " + "in its .config"); } void virtio_rng__delete_all(struct kvm *kvm) -- 2.39.5