mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-17 10:46:33 +00:00
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>
This commit is contained in:
parent
81a8deab1c
commit
0ad07ec1fd
@ -53,5 +53,6 @@ config KVM_AMD
|
|||||||
# OK, it's a little counter-intuitive to do this, but it puts it neatly under
|
# OK, it's a little counter-intuitive to do this, but it puts it neatly under
|
||||||
# the virtualization menu.
|
# the virtualization menu.
|
||||||
source drivers/lguest/Kconfig
|
source drivers/lguest/Kconfig
|
||||||
|
source drivers/virtio/Kconfig
|
||||||
|
|
||||||
endif # VIRTUALIZATION
|
endif # VIRTUALIZATION
|
||||||
|
@ -91,6 +91,4 @@ source "drivers/dca/Kconfig"
|
|||||||
source "drivers/auxdisplay/Kconfig"
|
source "drivers/auxdisplay/Kconfig"
|
||||||
|
|
||||||
source "drivers/uio/Kconfig"
|
source "drivers/uio/Kconfig"
|
||||||
|
|
||||||
source "drivers/virtio/Kconfig"
|
|
||||||
endmenu
|
endmenu
|
||||||
|
@ -440,6 +440,7 @@ config VIRTIO_BLK
|
|||||||
tristate "Virtio block driver (EXPERIMENTAL)"
|
tristate "Virtio block driver (EXPERIMENTAL)"
|
||||||
depends on EXPERIMENTAL && VIRTIO
|
depends on EXPERIMENTAL && VIRTIO
|
||||||
---help---
|
---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
|
endif # BLK_DEV
|
||||||
|
@ -3113,6 +3113,7 @@ config VIRTIO_NET
|
|||||||
tristate "Virtio network driver (EXPERIMENTAL)"
|
tristate "Virtio network driver (EXPERIMENTAL)"
|
||||||
depends on EXPERIMENTAL && VIRTIO
|
depends on EXPERIMENTAL && VIRTIO
|
||||||
---help---
|
---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
|
endif # NETDEVICES
|
||||||
|
Loading…
x
Reference in New Issue
Block a user