diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2007-11-07 20:46:31 -0600 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-02-04 23:50:05 +1100 |
| commit | 0ad07ec1fd2f3e90dfb086b04c07a83db40e9172 (patch) | |
| tree | 783d29d4e7d7e94ed9020b26e37b9c33f7aefcb2 | |
| parent | 81a8deab1ce3816c6a89e3429e234e7d3686da94 (diff) | |
| download | linux-0ad07ec1fd2f3e90dfb086b04c07a83db40e9172.tar.gz linux-0ad07ec1fd2f3e90dfb086b04c07a83db40e9172.tar.xz | |
virtio: Put the virtio under the virtualization menu
This patch moves virtio under the virtualization menu and changes virtio
devices to not claim to only be for lguest.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
| -rw-r--r-- | arch/x86/kvm/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/block/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig index c83e1c9b5129..41962e793c0f 100644 --- a/arch/x86/kvm/Kconfig +++ b/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/drivers/Kconfig b/drivers/Kconfig index 08d4ae201597..3f8a231fe754 100644 --- a/drivers/Kconfig +++ b/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/drivers/block/Kconfig b/drivers/block/Kconfig index f2122855d4ec..64e5148d82bc 100644 --- a/drivers/block/Kconfig +++ b/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/drivers/net/Kconfig b/drivers/net/Kconfig index 389980f0e59e..e9d761cbde93 100644 --- a/drivers/net/Kconfig +++ b/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 |