aboutsummaryrefslogtreecommitdiff
path: root/default-configs
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-04-22 08:05:05 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-04-22 08:05:05 -0500
commit6165daa4c8431d9d60382352864b46f34dd61ab4 (patch)
tree9d49f1cb3dca5ce3da719738550ca10c8c248b0c /default-configs
parentd639498852773a6019cf1b970dd8dc2f3791c45b (diff)
parentd6e51919a7e3250bbfb4bb0ad0f208ab6fd688a4 (diff)
downloadqemu-arm-6165daa4c8431d9d60382352864b46f34dd61ab4.tar.gz
Merge remote-tracking branch 'bonzini/scsi-next' into staging
# By Paolo Bonzini (5) and others # Via Paolo Bonzini * bonzini/scsi-next: vhost-scsi-s390: new device supporting the tcm_vhost Linux kernel module vhost-scsi-ccw: new device supporting the tcm_vhost Linux kernel module vhost-scsi-pci: new device supporting the tcm_vhost Linux kernel module vhost-scsi: new device supporting the tcm_vhost Linux kernel module virtio: simplify Makefile conditionals virtio-scsi: create VirtIOSCSICommon vhost: Add vhost_commit callback for SeaBIOS ROM region re-mapping scsi: VMWare PVSCSI paravirtual device implementation scsi: avoid assertion failure on VERIFY command Message-id: 1366381460-6041-1-git-send-email-pbonzini@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'default-configs')
-rw-r--r--default-configs/pci.mak1
1 files changed, 1 insertions, 0 deletions
diff --git a/default-configs/pci.mak b/default-configs/pci.mak
index b608f31c9a..8a5b565dd9 100644
--- a/default-configs/pci.mak
+++ b/default-configs/pci.mak
@@ -10,6 +10,7 @@ CONFIG_EEPRO100_PCI=y
CONFIG_PCNET_PCI=y
CONFIG_PCNET_COMMON=y
CONFIG_LSI_SCSI_PCI=y
+CONFIG_VMW_PVSCSI_SCSI_PCI=y
CONFIG_MEGASAS_SCSI_PCI=y
CONFIG_RTL8139_PCI=y
CONFIG_E1000_PCI=y