diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-01 22:42:49 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-01 22:42:49 +0100 |
| commit | b5b1de3537e2cd8f52971224a1be24bb3ce34a65 (patch) | |
| tree | cd199730744628103c36b14c878b94af4fea4735 /kernel | |
| parent | Merge tag 'xtensa-20181101' of git://github.com/jcmvbkbc/linux-xtensa (diff) | |
| parent | MAINTAINERS: remove reference to bogus vsock file (diff) | |
| download | linux-b5b1de3537e2cd8f52971224a1be24bb3ce34a65.tar.xz linux-b5b1de3537e2cd8f52971224a1be24bb3ce34a65.zip | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio/vhost updates from Michael Tsirkin:
"Fixes and tweaks:
- virtio balloon page hinting support
- vhost scsi control queue
- misc fixes"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
MAINTAINERS: remove reference to bogus vsock file
vhost/scsi: Use common handling code in request queue handler
vhost/scsi: Extract common handling code from control queue handler
vhost/scsi: Respond to control queue operations
vhost/scsi: truncate T10 PI iov_iter to prot_bytes
virtio-balloon: VIRTIO_BALLOON_F_PAGE_POISON
mm/page_poison: expose page_poisoning_enabled to kernel modules
virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT
kvm_config: add CONFIG_VIRTIO_MENU
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/configs/kvm_guest.config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/configs/kvm_guest.config b/kernel/configs/kvm_guest.config index 108fecc20fc1..208481d91090 100644 --- a/kernel/configs/kvm_guest.config +++ b/kernel/configs/kvm_guest.config @@ -20,6 +20,7 @@ CONFIG_PARAVIRT=y CONFIG_KVM_GUEST=y CONFIG_S390_GUEST=y CONFIG_VIRTIO=y +CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_BLK=y CONFIG_VIRTIO_CONSOLE=y |