summaryrefslogtreecommitdiff
path: root/default-configs
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-02-24 09:33:03 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2012-02-24 09:33:03 -0600
commit9ef1300b1b7d36794af30dcaf04e11184eb22dd2 (patch)
tree6d0973eae1f96b3724a1aed50ee666e9c9e4766c /default-configs
parentdcce6675de5a596e486e7dc341c3a7510d22aed6 (diff)
parenteaccf49e9524dbdd43feb6a1cdafddf64252389a (diff)
Merge remote-tracking branch 'bonzini/virtio-scsi' into staging
* bonzini/virtio-scsi: scsi-block: always use scsi_generic_ops for cache != none scsi: fix searching for an empty id scsi: fix wrong return for target INQUIRY virtio-scsi: add migration support virtio-scsi: process control queue requests virtio-scsi: add basic SCSI bus operation virtio-scsi: Add basic request processing infrastructure virtio-scsi: Add virtio-scsi stub device scsi-disk: add migration support scsi-generic: add migration support scsi: add SCSIDevice vmstate definitions scsi-disk: enable scatter/gather functionality scsi: add scatter/gather functionality scsi: pass residual amount to command_complete ahci: use new DMA helpers dma-helpers: add accounting wrappers dma-helpers: add dma_buf_read and dma_buf_write dma-helpers: make QEMUSGList target independent
Diffstat (limited to 'default-configs')
-rw-r--r--default-configs/pci.mak1
-rw-r--r--default-configs/s390x-softmmu.mak1
2 files changed, 2 insertions, 0 deletions
diff --git a/default-configs/pci.mak b/default-configs/pci.mak
index 9d3e1dbda1..21e4ccfb00 100644
--- a/default-configs/pci.mak
+++ b/default-configs/pci.mak
@@ -1,5 +1,6 @@
CONFIG_PCI=y
CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_SCSI=y
CONFIG_VIRTIO=y
CONFIG_USB_UHCI=y
CONFIG_USB_OHCI=y
diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
index 3005729204..e5888037cf 100644
--- a/default-configs/s390x-softmmu.mak
+++ b/default-configs/s390x-softmmu.mak
@@ -1 +1,2 @@
CONFIG_VIRTIO=y
+CONFIG_VIRTIO_SCSI=y