Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt
提交 928508f6 编写于 作者: C Cole Robinson
浏览文件
操作

qemu: capabilities: fill in domcaps <rng> 

The model logic is taken from qemuDomainRNGDefValidate
Reviewed-by: NReviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: NMichal Privoznik <mprivozn@redhat.com>
Signed-off-by: NCole Robinson <crobinso@redhat.com>
上级 9828b6e7
隐藏空白更改
内联 并排
Showing with 259 addition and 0 deletion
src/qemu/qemu_capabilities.c
浏览文件 @ 928508f6
...@@ -5370,6 +5370,34 @@ virQEMUCapsFillDomainDeviceHostdevCaps(virQEMUCapsPtr qemuCaps, ...@@ -5370,6 +5370,34 @@ virQEMUCapsFillDomainDeviceHostdevCaps(virQEMUCapsPtr qemuCaps,
} }
static int
virQEMUCapsFillDomainDeviceRNGCaps(virQEMUCapsPtr qemuCaps,
virDomainCapsDeviceRNGPtr rng)
{
rng->supported = VIR_TRISTATE_BOOL_YES;
rng->model.report = true;
rng->backendModel.report = true;
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_RNG)) {
VIR_DOMAIN_CAPS_ENUM_SET(rng->model, VIR_DOMAIN_RNG_MODEL_VIRTIO);
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL) ||
virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY)) {
VIR_DOMAIN_CAPS_ENUM_SET(rng->model,
VIR_DOMAIN_RNG_MODEL_VIRTIO_TRANSITIONAL,
VIR_DOMAIN_RNG_MODEL_VIRTIO_NON_TRANSITIONAL);
}
}
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_RNG_EGD))
VIR_DOMAIN_CAPS_ENUM_SET(rng->backendModel, VIR_DOMAIN_RNG_BACKEND_EGD);
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_RNG_RANDOM))
VIR_DOMAIN_CAPS_ENUM_SET(rng->backendModel, VIR_DOMAIN_RNG_BACKEND_RANDOM);
return 0;
}
/** /**
* virQEMUCapsSupportsGICVersion: * virQEMUCapsSupportsGICVersion:
* @qemuCaps: QEMU capabilities * @qemuCaps: QEMU capabilities
...@@ -5512,6 +5540,7 @@ virQEMUCapsFillDomainCaps(virCapsPtr caps, ...@@ -5512,6 +5540,7 @@ virQEMUCapsFillDomainCaps(virCapsPtr caps,
virDomainCapsDeviceHostdevPtr hostdev = &domCaps->hostdev; virDomainCapsDeviceHostdevPtr hostdev = &domCaps->hostdev;
virDomainCapsDeviceGraphicsPtr graphics = &domCaps->graphics; virDomainCapsDeviceGraphicsPtr graphics = &domCaps->graphics;
virDomainCapsDeviceVideoPtr video = &domCaps->video; virDomainCapsDeviceVideoPtr video = &domCaps->video;
virDomainCapsDeviceRNGPtr rng = &domCaps->rng;
domCaps->maxvcpus = virQEMUCapsGetMachineMaxCpus(qemuCaps, domCaps->maxvcpus = virQEMUCapsGetMachineMaxCpus(qemuCaps,
domCaps->machine); domCaps->machine);
...@@ -5542,6 +5571,7 @@ virQEMUCapsFillDomainCaps(virCapsPtr caps, ...@@ -5542,6 +5571,7 @@ virQEMUCapsFillDomainCaps(virCapsPtr caps,
virQEMUCapsFillDomainDeviceGraphicsCaps(qemuCaps, graphics) < 0 || virQEMUCapsFillDomainDeviceGraphicsCaps(qemuCaps, graphics) < 0 ||
virQEMUCapsFillDomainDeviceVideoCaps(qemuCaps, video) < 0 || virQEMUCapsFillDomainDeviceVideoCaps(qemuCaps, video) < 0 ||
virQEMUCapsFillDomainDeviceHostdevCaps(qemuCaps, hostdev) < 0 || virQEMUCapsFillDomainDeviceHostdevCaps(qemuCaps, hostdev) < 0 ||
virQEMUCapsFillDomainDeviceRNGCaps(qemuCaps, rng) < 0 ||
virQEMUCapsFillDomainFeatureGICCaps(qemuCaps, domCaps) < 0 || virQEMUCapsFillDomainFeatureGICCaps(qemuCaps, domCaps) < 0 ||
virQEMUCapsFillDomainFeatureSEVCaps(qemuCaps, domCaps) < 0) virQEMUCapsFillDomainFeatureSEVCaps(qemuCaps, domCaps) < 0)
return -1; return -1;
......
tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml
浏览文件 @ 928508f6
...@@ -116,6 +116,15 @@ ...@@ -116,6 +116,15 @@
<value>vfio</value> <value>vfio</value>
</enum> </enum>
</hostdev> </hostdev>
<rng supported='yes'>
<enum name='model'>
<value>virtio</value>
</enum>
<enum name='backendModel'>
<value>random</value>
<value>egd</value>
</enum>
</rng>
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
......
tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml
浏览文件 @ 928508f6
...@@ -120,6 +120,17 @@ ...@@ -120,6 +120,17 @@
<value>vfio</value> <value>vfio</value>
</enum> </enum>
</hostdev> </hostdev>
<rng supported='yes'>
<enum name='model'>
<value>virtio</value>
<value>virtio-transitional</value>
<value>virtio-non-transitional</value>
</enum>
<enum name='backendModel'>
<value>random</value>
<value>egd</value>
</enum>
</rng>
</devices> </devices>
<features> <features>
<gic supported='yes'> <gic supported='yes'>
......
tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml
浏览文件 @ 928508f6
...@@ -84,6 +84,17 @@ ...@@ -84,6 +84,17 @@
<value>vfio</value> <value>vfio</value>
</enum> </enum>
</hostdev> </hostdev>
<rng supported='yes'>
<enum name='model'>
<value>virtio</value>
<value>virtio-transitional</value>
<value>virtio-non-transitional</value>
</enum>
<enum name='backendModel'>
<value>random</value>
<value>egd</value>
</enum>
</rng>
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
......
tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
浏览文件 @ 928508f6
...@@ -176,6 +176,17 @@ ...@@ -176,6 +176,17 @@
<value>vfio</value> <value>vfio</value>
</enum> </enum>
</hostdev> </hostdev>
<rng supported='yes'>
<enum name='model'>
<value>virtio</value>
<value>virtio-transitional</value>
<value>virtio-non-transitional</value>
</enum>
<enum name='backendModel'>
<value>random</value>
<value>egd</value>
</enum>
</rng>
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
......
tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml
浏览文件 @ 928508f6
...@@ -149,6 +149,17 @@ ...@@ -149,6 +149,17 @@
<value>vfio</value> <value>vfio</value>
</enum> </enum>
</hostdev> </hostdev>
<rng supported='yes'>
<enum name='model'>
<value>virtio</value>
<value>virtio-transitional</value>
<value>virtio-non-transitional</value>
</enum>
<enum name='backendModel'>
<value>random</value>
<value>egd</value>
</enum>
</rng>
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
......
tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml
浏览文件 @ 928508f6
...@@ -117,6 +117,17 @@ ...@@ -117,6 +117,17 @@
<value>vfio</value> <value>vfio</value>
</enum> </enum>
</hostdev> </hostdev>
<rng supported='yes'>
<enum name='model'>
<value>virtio</value>
<value>virtio-transitional</value>
<value>virtio-non-transitional</value>
</enum>
<enum name='backendModel'>
<value>random</value>
<value>egd</value>
</enum>
</rng>
</devices> </devices>
<features> <features>
<gic supported='yes'> <gic supported='yes'>
......
tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml
浏览文件 @ 928508f6
...@@ -115,6 +115,17 @@ ...@@ -115,6 +115,17 @@
<value>vfio</value> <value>vfio</value>
</enum> </enum>
</hostdev> </hostdev>
<rng supported='yes'>
<enum name='model'>
<value>virtio</value>
<value>virtio-transitional</value>
<value>virtio-non-transitional</value>
</enum>
<enum name='backendModel'>
<value>random</value>
<value>egd</value>
</enum>
</rng>
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
......
tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml
浏览文件 @ 928508f6
...@@ -88,6 +88,17 @@ ...@@ -88,6 +88,17 @@
<value>vfio</value> <value>vfio</value>
</enum> </enum>
</hostdev> </hostdev>
<rng supported='yes'>
<enum name='model'>
<value>virtio</value>
<value>virtio-transitional</value>
<value>virtio-non-transitional</value>
</enum>
<enum name='backendModel'>
<value>random</value>
<value>egd</value>
</enum>
</rng>
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
......
tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml
浏览文件 @ 928508f6
...@@ -123,6 +123,17 @@ ...@@ -123,6 +123,17 @@
<value>vfio</value> <value>vfio</value>
</enum> </enum>
</hostdev> </hostdev>
<rng supported='yes'>
<enum name='model'>
<value>virtio</value>
<value>virtio-transitional</value>
<value>virtio-non-transitional</value>
</enum>
<enum name='backendModel'>
<value>random</value>
<value>egd</value>
</enum>
</rng>
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
......
tests/domaincapsschemadata/qemu_2.7.0.s390x.xml
浏览文件 @ 928508f6
...@@ -81,6 +81,17 @@ ...@@ -81,6 +81,17 @@
<value>vfio</value> <value>vfio</value>
</enum> </enum>
</hostdev> </hostdev>
<rng supported='yes'>
<enum name='model'>
<value>virtio</value>
<value>virtio-transitional</value>
<value>virtio-non-transitional</value>
</enum>
<enum name='backendModel'>
<value>random</value>
<value>egd</value>
</enum>
</rng>
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
......
tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml
浏览文件 @ 928508f6
...@@ -124,6 +124,17 @@ ...@@ -124,6 +124,17 @@
<value>vfio</value> <value>vfio</value>
</enum> </enum>
</hostdev> </hostdev>
<rng supported='yes'>
<enum name='model'>
<value>virtio</value>
<value>virtio-transitional</value>
<value>virtio-non-transitional</value>
</enum>
<enum name='backendModel'>
<value>random</value>
<value>egd</value>
</enum>
</rng>
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
......
tests/domaincapsschemadata/qemu_2.8.0.s390x.xml
浏览文件 @ 928508f6
...@@ -162,6 +162,17 @@ ...@@ -162,6 +162,17 @@
<value>vfio</value> <value>vfio</value>
</enum> </enum>
</hostdev> </hostdev>
<rng supported='yes'>
<enum name='model'>
<value>virtio</value>
<value>virtio-transitional</value>
<value>virtio-non-transitional</value>
</enum>
<enum name='backendModel'>
<value>random</value>
<value>egd</value>
</enum>
</rng>
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
......
tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml
浏览文件 @ 928508f6
...@@ -124,6 +124,17 @@ ...@@ -124,6 +124,17 @@
<value>vfio</value> <value>vfio</value>
</enum> </enum>
</hostdev> </hostdev>
<rng supported='yes'>
<enum name='model'>
<value>virtio</value>
<value>virtio-transitional</value>
<value>virtio-non-transitional</value>
</enum>
<enum name='backendModel'>
<value>random</value>
<value>egd</value>
</enum>
</rng>
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
......
tests/domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml
浏览文件 @ 928508f6
...@@ -133,6 +133,17 @@ ...@@ -133,6 +133,17 @@
<value>vfio</value> <value>vfio</value>
</enum> </enum>
</hostdev> </hostdev>
<rng supported='yes'>
<enum name='model'>
<value>virtio</value>
<value>virtio-transitional</value>
<value>virtio-non-transitional</value>
</enum>
<enum name='backendModel'>
<value>random</value>
<value>egd</value>
</enum>
</rng>
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
......
tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml
浏览文件 @ 928508f6
...@@ -156,6 +156,17 @@ ...@@ -156,6 +156,17 @@
<value>vfio</value> <value>vfio</value>
</enum> </enum>
</hostdev> </hostdev>
<rng supported='yes'>
<enum name='model'>
<value>virtio</value>
<value>virtio-transitional</value>
<value>virtio-non-transitional</value>
</enum>
<enum name='backendModel'>
<value>random</value>
<value>egd</value>
</enum>
</rng>
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
......
tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml
浏览文件 @ 928508f6
...@@ -133,6 +133,17 @@ ...@@ -133,6 +133,17 @@
<value>vfio</value> <value>vfio</value>
</enum> </enum>
</hostdev> </hostdev>
<rng supported='yes'>
<enum name='model'>
<value>virtio</value>
<value>virtio-transitional</value>
<value>virtio-non-transitional</value>
</enum>
<enum name='backendModel'>
<value>random</value>
<value>egd</value>
</enum>
</rng>
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
......
tests/domaincapsschemadata/qemu_3.0.0.s390x.xml
浏览文件 @ 928508f6
...@@ -182,6 +182,17 @@ ...@@ -182,6 +182,17 @@
<value>vfio</value> <value>vfio</value>
</enum> </enum>
</hostdev> </hostdev>
<rng supported='yes'>
<enum name='model'>
<value>virtio</value>
<value>virtio-transitional</value>
<value>virtio-non-transitional</value>
</enum>
<enum name='backendModel'>
<value>random</value>
<value>egd</value>
</enum>
</rng>
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
......
tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml
浏览文件 @ 928508f6
...@@ -151,6 +151,17 @@ ...@@ -151,6 +151,17 @@
<value>vfio</value> <value>vfio</value>
</enum> </enum>
</hostdev> </hostdev>
<rng supported='yes'>
<enum name='model'>
<value>virtio</value>
<value>virtio-transitional</value>
<value>virtio-non-transitional</value>
</enum>
<enum name='backendModel'>
<value>random</value>
<value>egd</value>
</enum>
</rng>
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
......
tests/domaincapsschemadata/qemu_4.0.0.s390x.xml
浏览文件 @ 928508f6
...@@ -188,6 +188,17 @@ ...@@ -188,6 +188,17 @@
<value>vfio</value> <value>vfio</value>
</enum> </enum>
</hostdev> </hostdev>
<rng supported='yes'>
<enum name='model'>
<value>virtio</value>
<value>virtio-transitional</value>
<value>virtio-non-transitional</value>
</enum>
<enum name='backendModel'>
<value>random</value>
<value>egd</value>
</enum>
</rng>
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
......
tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml
浏览文件 @ 928508f6
...@@ -151,6 +151,17 @@ ...@@ -151,6 +151,17 @@
<value>vfio</value> <value>vfio</value>
</enum> </enum>
</hostdev> </hostdev>
<rng supported='yes'>
<enum name='model'>
<value>virtio</value>
<value>virtio-transitional</value>
<value>virtio-non-transitional</value>
</enum>
<enum name='backendModel'>
<value>random</value>
<value>egd</value>
</enum>
</rng>
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
......
tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml
浏览文件 @ 928508f6
...@@ -155,6 +155,17 @@ ...@@ -155,6 +155,17 @@
<value>vfio</value> <value>vfio</value>
</enum> </enum>
</hostdev> </hostdev>
<rng supported='yes'>
<enum name='model'>
<value>virtio</value>
<value>virtio-transitional</value>
<value>virtio-non-transitional</value>
</enum>
<enum name='backendModel'>
<value>random</value>
<value>egd</value>
</enum>
</rng>
</devices> </devices>
<features> <features>
<gic supported='no'/> <gic supported='no'/>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或