summary refs log tree commit diff stats
path: root/include/hw/pci
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 /include/hw/pci
parentd639498852773a6019cf1b970dd8dc2f3791c45b (diff)
parentd6e51919a7e3250bbfb4bb0ad0f208ab6fd688a4 (diff)
downloadfocaccia-qemu-6165daa4c8431d9d60382352864b46f34dd61ab4.tar.gz
focaccia-qemu-6165daa4c8431d9d60382352864b46f34dd61ab4.zip
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 'include/hw/pci')
-rw-r--r--include/hw/pci/pci.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index 7053d5bb4b..8d075ab5a3 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -59,6 +59,7 @@
 #define PCI_DEVICE_ID_VMWARE_SVGA        0x0710
 #define PCI_DEVICE_ID_VMWARE_NET         0x0720
 #define PCI_DEVICE_ID_VMWARE_SCSI        0x0730
+#define PCI_DEVICE_ID_VMWARE_PVSCSI      0x07C0
 #define PCI_DEVICE_ID_VMWARE_IDE         0x1729
 #define PCI_DEVICE_ID_VMWARE_VMXNET3     0x07B0