mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-05 05:45:46 +00:00
qemu: Support hostdev model=virtio-{non-}transitional
Add <hostdev> protocol=vhost model handling for virtio transitional devices. Ex: <hostdev mode='subsystem' type='scsi_host' model='virtio-transitional'> <source protocol='vhost' wwpn=X/> </hostdev> * "virtio-transitional" maps to qemu "vhost-scsi-pci-transitional" * "virtio-non-transitional" maps to qemu "vhost-scsi-pci-non-transitional" Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
parent
ef41ff4219
commit
37f75d56da
@ -485,12 +485,18 @@ qemuBuildVirtioDevStr(virBufferPtr buf,
|
|||||||
"virtio-non-transitional");
|
"virtio-non-transitional");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case VIR_DOMAIN_DEVICE_HOSTDEV:
|
||||||
|
if (device.data.hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST)
|
||||||
|
return 0;
|
||||||
|
has_tmodel = device.data.hostdev->source.subsys.u.scsi_host.model == VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_VHOST_MODEL_TYPE_VIRTIO_TRANSITIONAL;
|
||||||
|
has_ntmodel = device.data.hostdev->source.subsys.u.scsi_host.model == VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_VHOST_MODEL_TYPE_VIRTIO_NON_TRANSITIONAL;
|
||||||
|
break;
|
||||||
|
|
||||||
case VIR_DOMAIN_DEVICE_LEASE:
|
case VIR_DOMAIN_DEVICE_LEASE:
|
||||||
case VIR_DOMAIN_DEVICE_FS:
|
case VIR_DOMAIN_DEVICE_FS:
|
||||||
case VIR_DOMAIN_DEVICE_INPUT:
|
case VIR_DOMAIN_DEVICE_INPUT:
|
||||||
case VIR_DOMAIN_DEVICE_SOUND:
|
case VIR_DOMAIN_DEVICE_SOUND:
|
||||||
case VIR_DOMAIN_DEVICE_VIDEO:
|
case VIR_DOMAIN_DEVICE_VIDEO:
|
||||||
case VIR_DOMAIN_DEVICE_HOSTDEV:
|
|
||||||
case VIR_DOMAIN_DEVICE_WATCHDOG:
|
case VIR_DOMAIN_DEVICE_WATCHDOG:
|
||||||
case VIR_DOMAIN_DEVICE_CONTROLLER:
|
case VIR_DOMAIN_DEVICE_CONTROLLER:
|
||||||
case VIR_DOMAIN_DEVICE_GRAPHICS:
|
case VIR_DOMAIN_DEVICE_GRAPHICS:
|
||||||
|
@ -794,11 +794,22 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev,
|
|||||||
return pcieFlags;
|
return pcieFlags;
|
||||||
|
|
||||||
/* according to pbonzini, from the guest PoV vhost-scsi devices
|
/* according to pbonzini, from the guest PoV vhost-scsi devices
|
||||||
* are the same as virtio-scsi, so they should use virtioFlags
|
* are the same as virtio-scsi, so they should follow virtio logic
|
||||||
* (same as virtio-scsi) to determine Express vs. legacy placement
|
|
||||||
*/
|
*/
|
||||||
if (hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST)
|
if (hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST) {
|
||||||
return virtioFlags;
|
switch ((virDomainHostdevSubsysSCSIVHostModelType) hostdev->source.subsys.u.scsi_host.model) {
|
||||||
|
case VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_VHOST_MODEL_TYPE_VIRTIO_TRANSITIONAL:
|
||||||
|
/* Transitional devices only work in conventional PCI slots */
|
||||||
|
return pciFlags;
|
||||||
|
case VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_VHOST_MODEL_TYPE_VIRTIO:
|
||||||
|
case VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_VHOST_MODEL_TYPE_VIRTIO_NON_TRANSITIONAL:
|
||||||
|
case VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_VHOST_MODEL_TYPE_DEFAULT:
|
||||||
|
return virtioFlags;
|
||||||
|
case VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_VHOST_MODEL_TYPE_LAST:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
if (!(pciDev = virPCIDeviceNew(hostAddr->domain,
|
if (!(pciDev = virPCIDeviceNew(hostAddr->domain,
|
||||||
hostAddr->bus,
|
hostAddr->bus,
|
||||||
|
@ -34,8 +34,8 @@ addr=0x0,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
|
|||||||
-netdev user,id=hostnet0 \
|
-netdev user,id=hostnet0 \
|
||||||
-device virtio-net-pci,disable-legacy=on,disable-modern=off,netdev=hostnet0,\
|
-device virtio-net-pci,disable-legacy=on,disable-modern=off,netdev=hostnet0,\
|
||||||
id=net0,mac=00:11:22:33:44:55,bus=pci.1,addr=0x0 \
|
id=net0,mac=00:11:22:33:44:55,bus=pci.1,addr=0x0 \
|
||||||
-device vhost-scsi-pci,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,\
|
-device vhost-scsi-pci,disable-legacy=on,disable-modern=off,\
|
||||||
bus=pci.3,addr=0x0 \
|
wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.3,addr=0x0 \
|
||||||
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
|
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
|
||||||
resourcecontrol=deny \
|
resourcecontrol=deny \
|
||||||
-msg timestamp=on
|
-msg timestamp=on
|
||||||
|
@ -34,8 +34,8 @@ drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
|
|||||||
-netdev user,id=hostnet0 \
|
-netdev user,id=hostnet0 \
|
||||||
-device virtio-net-pci-non-transitional,netdev=hostnet0,id=net0,\
|
-device virtio-net-pci-non-transitional,netdev=hostnet0,id=net0,\
|
||||||
mac=00:11:22:33:44:55,bus=pci.1,addr=0x0 \
|
mac=00:11:22:33:44:55,bus=pci.1,addr=0x0 \
|
||||||
-device vhost-scsi-pci,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,\
|
-device vhost-scsi-pci-non-transitional,wwpn=naa.5123456789abcde0,vhostfd=3,\
|
||||||
bus=pci.3,addr=0x0 \
|
id=hostdev0,bus=pci.3,addr=0x0 \
|
||||||
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
|
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
|
||||||
resourcecontrol=deny \
|
resourcecontrol=deny \
|
||||||
-msg timestamp=on
|
-msg timestamp=on
|
||||||
|
@ -27,15 +27,14 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
|
|||||||
addr=0x1 \
|
addr=0x1 \
|
||||||
-device pcie-pci-bridge,id=pci.2,bus=pci.1,addr=0x0 \
|
-device pcie-pci-bridge,id=pci.2,bus=pci.1,addr=0x0 \
|
||||||
-device pcie-root-port,port=0x9,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x1 \
|
-device pcie-root-port,port=0x9,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x1 \
|
||||||
-device pcie-root-port,port=0xa,chassis=4,id=pci.4,bus=pcie.0,addr=0x1.0x2 \
|
|
||||||
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
|
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
|
||||||
-device virtio-blk-pci,disable-legacy=off,disable-modern=off,scsi=off,\
|
-device virtio-blk-pci,disable-legacy=off,disable-modern=off,scsi=off,\
|
||||||
bus=pci.2,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
|
bus=pci.2,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
|
||||||
-netdev user,id=hostnet0 \
|
-netdev user,id=hostnet0 \
|
||||||
-device virtio-net-pci,disable-legacy=off,disable-modern=off,netdev=hostnet0,\
|
-device virtio-net-pci,disable-legacy=off,disable-modern=off,netdev=hostnet0,\
|
||||||
id=net0,mac=00:11:22:33:44:55,bus=pci.2,addr=0x1 \
|
id=net0,mac=00:11:22:33:44:55,bus=pci.2,addr=0x1 \
|
||||||
-device vhost-scsi-pci,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,\
|
-device vhost-scsi-pci,disable-legacy=off,disable-modern=off,\
|
||||||
bus=pci.3,addr=0x0 \
|
wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.2,addr=0x3 \
|
||||||
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
|
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
|
||||||
resourcecontrol=deny \
|
resourcecontrol=deny \
|
||||||
-msg timestamp=on
|
-msg timestamp=on
|
||||||
|
@ -27,15 +27,14 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
|
|||||||
addr=0x1 \
|
addr=0x1 \
|
||||||
-device pcie-pci-bridge,id=pci.2,bus=pci.1,addr=0x0 \
|
-device pcie-pci-bridge,id=pci.2,bus=pci.1,addr=0x0 \
|
||||||
-device pcie-root-port,port=0x9,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x1 \
|
-device pcie-root-port,port=0x9,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x1 \
|
||||||
-device pcie-root-port,port=0xa,chassis=4,id=pci.4,bus=pcie.0,addr=0x1.0x2 \
|
|
||||||
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
|
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
|
||||||
-device virtio-blk-pci-transitional,scsi=off,bus=pci.2,addr=0x2,\
|
-device virtio-blk-pci-transitional,scsi=off,bus=pci.2,addr=0x2,\
|
||||||
drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
|
drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
|
||||||
-netdev user,id=hostnet0 \
|
-netdev user,id=hostnet0 \
|
||||||
-device virtio-net-pci-transitional,netdev=hostnet0,id=net0,\
|
-device virtio-net-pci-transitional,netdev=hostnet0,id=net0,\
|
||||||
mac=00:11:22:33:44:55,bus=pci.2,addr=0x1 \
|
mac=00:11:22:33:44:55,bus=pci.2,addr=0x1 \
|
||||||
-device vhost-scsi-pci,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,\
|
-device vhost-scsi-pci-transitional,wwpn=naa.5123456789abcde0,vhostfd=3,\
|
||||||
bus=pci.3,addr=0x0 \
|
id=hostdev0,bus=pci.2,addr=0x3 \
|
||||||
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
|
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
|
||||||
resourcecontrol=deny \
|
resourcecontrol=deny \
|
||||||
-msg timestamp=on
|
-msg timestamp=on
|
||||||
|
@ -39,11 +39,6 @@
|
|||||||
<target chassis='3' port='0x9'/>
|
<target chassis='3' port='0x9'/>
|
||||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
|
||||||
</controller>
|
</controller>
|
||||||
<controller type='pci' index='4' model='pcie-root-port'>
|
|
||||||
<model name='pcie-root-port'/>
|
|
||||||
<target chassis='4' port='0xa'/>
|
|
||||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
|
|
||||||
</controller>
|
|
||||||
<interface type='user'>
|
<interface type='user'>
|
||||||
<mac address='00:11:22:33:44:55'/>
|
<mac address='00:11:22:33:44:55'/>
|
||||||
<model type='virtio-transitional'/>
|
<model type='virtio-transitional'/>
|
||||||
@ -53,7 +48,7 @@
|
|||||||
<input type='keyboard' bus='ps2'/>
|
<input type='keyboard' bus='ps2'/>
|
||||||
<hostdev mode='subsystem' type='scsi_host' managed='no' model='virtio-transitional'>
|
<hostdev mode='subsystem' type='scsi_host' managed='no' model='virtio-transitional'>
|
||||||
<source protocol='vhost' wwpn='naa.5123456789abcde0'/>
|
<source protocol='vhost' wwpn='naa.5123456789abcde0'/>
|
||||||
<address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
|
<address type='pci' domain='0x0000' bus='0x02' slot='0x03' function='0x0'/>
|
||||||
</hostdev>
|
</hostdev>
|
||||||
<memballoon model='none'/>
|
<memballoon model='none'/>
|
||||||
</devices>
|
</devices>
|
||||||
|
Loading…
Reference in New Issue
Block a user