Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7254219 authored by Ohad Ben-Cohen's avatar Ohad Ben-Cohen Committed by Rusty Russell
Browse files

virtio: expose for non-virtualization users too 



virtio has been so far used only in the context of virtualization,
and the virtio Kconfig was sourced directly by the relevant arch
Kconfigs when VIRTUALIZATION was selected.

Now that we start using virtio for inter-processor communications,
we need to source the virtio Kconfig outside of the virtualization
scope too.

Moreover, some architectures might use virtio for both virtualization
and inter-processor communications, so directly sourcing virtio
might yield unexpected results due to conflicting selections.

The simple solution offered by this patch is to always source virtio's
Kconfig in drivers/Kconfig, and remove it from the appropriate arch
Kconfigs. Additionally, a virtio menu entry has been added so virtio
drivers don't show up in the general drivers menu.

This way anyone can use virtio, though it's arguably less accessible
(and neat!) for virtualization users now.

Note: some architectures (mips and sh) seem to have a VIRTUALIZATION
menu merely for sourcing virtio's Kconfig, so that menu is removed too.

Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent bbd9d6f7

arch/ia64/kvm/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -49,6 +49,5 @@ config KVM_INTEL 
	  extensions.

	  extensions.





source drivers/vhost/Kconfig

source drivers/vhost/Kconfig

source drivers/virtio/Kconfig





endif # VIRTUALIZATION
 
endif # VIRTUALIZATION

arch/mips/Kconfig

+0 −16
Original line number Original line Diff line number Diff line
@@ -2493,20 +2493,4 @@ source "security/Kconfig" 




source "crypto/Kconfig"

source "crypto/Kconfig"





menuconfig VIRTUALIZATION

	bool "Virtualization"

	default n

	---help---

	  Say Y here to get to see options for using your Linux host to run other

	  operating systems inside virtual machines (guests).

	  This option alone does not add any kernel code.



	  If you say N, all options in this submenu will be skipped and disabled.



if VIRTUALIZATION



source drivers/virtio/Kconfig



endif # VIRTUALIZATION



source "lib/Kconfig"
 
source "lib/Kconfig"

arch/powerpc/kvm/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -99,6 +99,5 @@ config KVM_E500 
	  If unsure, say N.

	  If unsure, say N.





source drivers/vhost/Kconfig

source drivers/vhost/Kconfig

source drivers/virtio/Kconfig





endif # VIRTUALIZATION
 
endif # VIRTUALIZATION

arch/s390/kvm/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -37,6 +37,5 @@ config KVM 
# 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/vhost/Kconfig

source drivers/vhost/Kconfig

source drivers/virtio/Kconfig





endif # VIRTUALIZATION
 
endif # VIRTUALIZATION

arch/sh/Kconfig

+0 −16
Original line number Original line Diff line number Diff line
@@ -897,20 +897,4 @@ source "security/Kconfig" 




source "crypto/Kconfig"

source "crypto/Kconfig"





menuconfig VIRTUALIZATION

	bool "Virtualization"

	default n

	---help---

	  Say Y here to get to see options for using your Linux host to run other

	  operating systems inside virtual machines (guests).

	  This option alone does not add any kernel code.



	  If you say N, all options in this submenu will be skipped and disabled.



if VIRTUALIZATION



source drivers/virtio/Kconfig



endif # VIRTUALIZATION



source "lib/Kconfig"
 
source "lib/Kconfig"