External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Validate RNG model

Browse Source 
The aim is to eliminate virDomainCapsDeviceDefValidate(). And in
order to do so, the domain RNG model has to be validated in
qemuValidateDomainRNGDef().

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Michal Privoznik 2020-11-13 20:29:30 +01:00
parent 904e59f43a
commit 5216304bfe
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/conf/domain_capabilities.c
View File

@ -640,20 +640,6 @@ virDomainCapsFormat(const virDomainCaps *caps)
} while (0) } while (0)
static int
virDomainCapsDeviceRNGDefValidate(const virDomainCaps *caps,
const virDomainRNGDef *dev)
{
if (ENUM_VALUE_MISSING(caps->rng.model, dev->model)) {
ENUM_VALUE_ERROR("rng model",
virDomainRNGModelTypeToString(dev->model));
return -1;
}
return 0;
}
static int static int
virDomainCapsDeviceVideoDefValidate(const virDomainCaps *caps, virDomainCapsDeviceVideoDefValidate(const virDomainCaps *caps,
const virDomainVideoDef *dev) const virDomainVideoDef *dev)
@ -676,9 +662,6 @@ virDomainCapsDeviceDefValidate(const virDomainCaps *caps,
int ret = 0; int ret = 0;
switch ((virDomainDeviceType) dev->type) { switch ((virDomainDeviceType) dev->type) {
case VIR_DOMAIN_DEVICE_RNG:
ret = virDomainCapsDeviceRNGDefValidate(caps, dev->data.rng);
break;
case VIR_DOMAIN_DEVICE_VIDEO: case VIR_DOMAIN_DEVICE_VIDEO:
ret = virDomainCapsDeviceVideoDefValidate(caps, dev->data.video); ret = virDomainCapsDeviceVideoDefValidate(caps, dev->data.video);
break; break;
@ -706,6 +689,7 @@ virDomainCapsDeviceDefValidate(const virDomainCaps *caps,
case VIR_DOMAIN_DEVICE_HUB: case VIR_DOMAIN_DEVICE_HUB:
case VIR_DOMAIN_DEVICE_MEMBALLOON: case VIR_DOMAIN_DEVICE_MEMBALLOON:
case VIR_DOMAIN_DEVICE_NVRAM: case VIR_DOMAIN_DEVICE_NVRAM:
case VIR_DOMAIN_DEVICE_RNG:
case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_TPM:
case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_PANIC:
case VIR_DOMAIN_DEVICE_IOMMU: case VIR_DOMAIN_DEVICE_IOMMU:

25
src/qemu/qemu_validate.c
View File

@ -1883,6 +1883,31 @@ qemuValidateDomainRNGDef(const virDomainRNGDef *def,
return -1; return -1;
} }
switch ((virDomainRNGModel) def->model) {
case VIR_DOMAIN_RNG_MODEL_VIRTIO:
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_RNG)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("domain configuration does not support rng model '%s'"),
virDomainRNGModelTypeToString(def->model));
return -1;
}
break;
case VIR_DOMAIN_RNG_MODEL_VIRTIO_TRANSITIONAL:
case VIR_DOMAIN_RNG_MODEL_VIRTIO_NON_TRANSITIONAL:
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL) &&
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("domain configuration does not support rng model '%s'"),
virDomainRNGModelTypeToString(def->model));
return -1;
}
break;
case VIR_DOMAIN_RNG_MODEL_LAST:
break;
}
if (qemuValidateDomainVirtioOptions(def->virtio, qemuCaps) < 0) if (qemuValidateDomainVirtioOptions(def->virtio, qemuCaps) < 0)
return -1; return -1;