From bc814746d9f21ca9e40ae56d0a3875371c4a53e9 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Wed, 7 Nov 2007 20:46:31 -0600 Subject: [PATCH] --- yaml --- r: 82823 b: refs/heads/master c: 0ad07ec1fd2f3e90dfb086b04c07a83db40e9172 h: refs/heads/master i: 82821: 55d59b9070725bff454f1033fca122da68fb0906 82819: db6220fe28a0e338c26eaa9b20af8ab4b9c5ea7e 82815: ea18d4ab0718b290727e7ba23dc60f5956183fa4 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/Kconfig | 1 + trunk/drivers/Kconfig | 2 -- trunk/drivers/block/Kconfig | 3 ++- trunk/drivers/net/Kconfig | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 736354f1a9d4..f2efdb7ba2fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81a8deab1ce3816c6a89e3429e234e7d3686da94 +refs/heads/master: 0ad07ec1fd2f3e90dfb086b04c07a83db40e9172 diff --git a/trunk/arch/x86/kvm/Kconfig b/trunk/arch/x86/kvm/Kconfig index c83e1c9b5129..41962e793c0f 100644 --- a/trunk/arch/x86/kvm/Kconfig +++ b/trunk/arch/x86/kvm/Kconfig @@ -53,5 +53,6 @@ config KVM_AMD # OK, it's a little counter-intuitive to do this, but it puts it neatly under # the virtualization menu. source drivers/lguest/Kconfig +source drivers/virtio/Kconfig endif # VIRTUALIZATION diff --git a/trunk/drivers/Kconfig b/trunk/drivers/Kconfig index 08d4ae201597..3f8a231fe754 100644 --- a/trunk/drivers/Kconfig +++ b/trunk/drivers/Kconfig @@ -91,6 +91,4 @@ source "drivers/dca/Kconfig" source "drivers/auxdisplay/Kconfig" source "drivers/uio/Kconfig" - -source "drivers/virtio/Kconfig" endmenu diff --git a/trunk/drivers/block/Kconfig b/trunk/drivers/block/Kconfig index f2122855d4ec..64e5148d82bc 100644 --- a/trunk/drivers/block/Kconfig +++ b/trunk/drivers/block/Kconfig @@ -440,6 +440,7 @@ config VIRTIO_BLK tristate "Virtio block driver (EXPERIMENTAL)" depends on EXPERIMENTAL && VIRTIO ---help--- - This is the virtual block driver for lguest. Say Y or M. + This is the virtual block driver for virtio. It can be used with + lguest or QEMU based VMMs (like KVM or Xen). Say Y or M. endif # BLK_DEV diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index 389980f0e59e..e9d761cbde93 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/drivers/net/Kconfig @@ -3113,6 +3113,7 @@ config VIRTIO_NET tristate "Virtio network driver (EXPERIMENTAL)" depends on EXPERIMENTAL && VIRTIO ---help--- - This is the virtual network driver for lguest. Say Y or M. + This is the virtual network driver for virtio. It can be used with + lguest or QEMU based VMMs (like KVM or Xen). Say Y or M. endif # NETDEVICES