External/libvirt
1
0
Fork 0
Code

qemu: domain: Move video device validation into separate function

Browse Source
This commit is contained in:
Peter Krempa 2017-11-14 14:38:14 +01:00
parent a6936ec098
commit ab948b6299
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/qemu/qemu_domain.c
View File

@ -3701,6 +3701,29 @@ qemuDomainDeviceDefValidateHostdev(const virDomainHostdevDef *hostdev,
} }
static int
qemuDomainDeviceDefValidateVideo(const virDomainVideoDef *video)
{
if (video->type == VIR_DOMAIN_VIDEO_TYPE_QXL &&
video->vgamem) {
if (video->vgamem < 1024) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("value for 'vgamem' must be at least 1 MiB "
"(1024 KiB)"));
return -1;
}
if (video->vgamem != VIR_ROUND_UP_POWER_OF_TWO(video->vgamem)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("value for 'vgamem' must be power of two"));
return -1;
}
}
return 0;
}
static int static int
qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev,
const virDomainDef *def, const virDomainDef *def,
@ -3729,23 +3752,9 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev,
} else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { } else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) {
if (qemuDomainDeviceDefValidateHostdev(dev->data.hostdev, def) < 0) if (qemuDomainDeviceDefValidateHostdev(dev->data.hostdev, def) < 0)
goto cleanup; goto cleanup;
} } else if (dev->type == VIR_DOMAIN_DEVICE_VIDEO) {
if (qemuDomainDeviceDefValidateVideo(dev->data.video) < 0)
if (dev->type == VIR_DOMAIN_DEVICE_VIDEO) { goto cleanup;
if (dev->data.video->type == VIR_DOMAIN_VIDEO_TYPE_QXL &&
dev->data.video->vgamem) {
if (dev->data.video->vgamem < 1024) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("value for 'vgamem' must be at least 1 MiB "
"(1024 KiB)"));
goto cleanup;
}
if (dev->data.video->vgamem != VIR_ROUND_UP_POWER_OF_TWO(dev->data.video->vgamem)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("value for 'vgamem' must be power of two"));
goto cleanup;
}
}
} }
ret = 0; ret = 0;