[PATCH 08/12] domain_conf: move all DeviceDefValidateInternal() helpers to domain_validate

Moving all remaining static helpers of virDomainDeviceDefValidateInternal() will allow the next patch to move the function itself, and virDomainDeviceDefValidate(), to domain_validate.c. Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com&gt; --- src/conf/domain_conf.c | 150 ------------------------------------- src/conf/domain_validate.c | 150 +++++++++++++++++++++++++++++++++++++ src/conf/domain_validate.h | 6 ++ 3 files changed, 156 insertions(+), 150 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a541e7bca6..ebe895948f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6022,156 +6022,6 @@ virDomainDefHasUSB(const virDomainDef *def) } -static int -virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev) -{ - if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) { - switch ((virDomainHostdevSubsysType) hostdev->source.subsys.type) { - case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: - if (hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && - hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNASSIGNED && - hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("PCI host devices must use 'pci' or " - "'unassigned' address type")); - return -1; - } - break; - case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: - if (hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && - hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("SCSI host device must use 'drive' " - "address type")); - return -1; - } - break; - case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST: - if (hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && - hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && - hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("SCSI_host host device must use 'pci' " - "or 'ccw' address type")); - return -1; - } - break; - case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: - if (hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && - hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("USB host device must use 'usb' address type")); - return -1; - } - break; - case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: - case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: - break; - } - } - return 0; -} - - -static int -virDomainMemoryDefValidate(const virDomainMemoryDef *mem, - const virDomainDef *def) -{ - if (mem->model == VIR_DOMAIN_MEMORY_MODEL_NVDIMM) { - if (!mem->nvdimmPath) { - virReportError(VIR_ERR_XML_DETAIL, "%s", - _("path is required for model 'nvdimm'")); - return -1; - } - - if (mem->discard == VIR_TRISTATE_BOOL_YES) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("discard is not supported for nvdimms")); - return -1; - } - - if (ARCH_IS_PPC64(def->os.arch) && mem->labelsize == 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("label size is required for NVDIMM device")); - return -1; - } - } - - return 0; -} - - -static int -virDomainVsockDefValidate(const virDomainVsockDef *vsock) -{ - if (vsock->guest_cid > 0 && vsock->guest_cid <= 2) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("guest CIDs must be >= 3")); - return -1; - } - - return 0; -} - -static int -virDomainInputDefValidate(const virDomainInputDef *input) -{ - switch ((virDomainInputType) input->type) { - case VIR_DOMAIN_INPUT_TYPE_MOUSE: - case VIR_DOMAIN_INPUT_TYPE_TABLET: - case VIR_DOMAIN_INPUT_TYPE_KBD: - if (input->source.evdev) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("setting source evdev path only supported for " - "passthrough input devices")); - return -1; - } - break; - - case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: - if (input->bus != VIR_DOMAIN_INPUT_BUS_VIRTIO) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("only bus 'virtio' is supported for 'passthrough' " - "input devices")); - return -1; - } - break; - - case VIR_DOMAIN_INPUT_TYPE_LAST: - default: - virReportEnumRangeError(virDomainInputType, input->type); - return -1; - } - - return 0; -} - - -static int -virDomainShmemDefValidate(const virDomainShmemDef *shmem) -{ - if (strchr(shmem->name, '/')) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("shmem name cannot include '/' character")); - return -1; - } - - if (STREQ(shmem->name, ".")) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("shmem name cannot be equal to '.'")); - return -1; - } - - if (STREQ(shmem->name, "..")) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("shmem name cannot be equal to '..'")); - return -1; - } - - return 0; -} - - static int virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev, const virDomainDef *def) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 6ca4ebb0ea..ec955daf66 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -1321,3 +1321,153 @@ virDomainNetDefValidate(const virDomainNetDef *net) return 0; } + + +int +virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev) +{ + if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) { + switch ((virDomainHostdevSubsysType) hostdev->source.subsys.type) { + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: + if (hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && + hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNASSIGNED && + hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("PCI host devices must use 'pci' or " + "'unassigned' address type")); + return -1; + } + break; + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: + if (hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && + hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("SCSI host device must use 'drive' " + "address type")); + return -1; + } + break; + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST: + if (hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && + hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && + hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("SCSI_host host device must use 'pci' " + "or 'ccw' address type")); + return -1; + } + break; + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: + if (hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && + hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("USB host device must use 'usb' address type")); + return -1; + } + break; + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: + break; + } + } + return 0; +} + + +int +virDomainMemoryDefValidate(const virDomainMemoryDef *mem, + const virDomainDef *def) +{ + if (mem->model == VIR_DOMAIN_MEMORY_MODEL_NVDIMM) { + if (!mem->nvdimmPath) { + virReportError(VIR_ERR_XML_DETAIL, "%s", + _("path is required for model 'nvdimm'")); + return -1; + } + + if (mem->discard == VIR_TRISTATE_BOOL_YES) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("discard is not supported for nvdimms")); + return -1; + } + + if (ARCH_IS_PPC64(def->os.arch) && mem->labelsize == 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("label size is required for NVDIMM device")); + return -1; + } + } + + return 0; +} + + +int +virDomainVsockDefValidate(const virDomainVsockDef *vsock) +{ + if (vsock->guest_cid > 0 && vsock->guest_cid <= 2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("guest CIDs must be >= 3")); + return -1; + } + + return 0; +} + +int +virDomainInputDefValidate(const virDomainInputDef *input) +{ + switch ((virDomainInputType) input->type) { + case VIR_DOMAIN_INPUT_TYPE_MOUSE: + case VIR_DOMAIN_INPUT_TYPE_TABLET: + case VIR_DOMAIN_INPUT_TYPE_KBD: + if (input->source.evdev) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("setting source evdev path only supported for " + "passthrough input devices")); + return -1; + } + break; + + case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: + if (input->bus != VIR_DOMAIN_INPUT_BUS_VIRTIO) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("only bus 'virtio' is supported for 'passthrough' " + "input devices")); + return -1; + } + break; + + case VIR_DOMAIN_INPUT_TYPE_LAST: + default: + virReportEnumRangeError(virDomainInputType, input->type); + return -1; + } + + return 0; +} + + +int +virDomainShmemDefValidate(const virDomainShmemDef *shmem) +{ + if (strchr(shmem->name, '/')) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("shmem name cannot include '/' character")); + return -1; + } + + if (STREQ(shmem->name, ".")) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("shmem name cannot be equal to '.'")); + return -1; + } + + if (STREQ(shmem->name, "..")) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("shmem name cannot be equal to '..'")); + return -1; + } + + return 0; +} diff --git a/src/conf/domain_validate.h b/src/conf/domain_validate.h index d38d2f4e06..e04ecab065 100644 --- a/src/conf/domain_validate.h +++ b/src/conf/domain_validate.h @@ -51,3 +51,9 @@ int virDomainDefValidate(virDomainDefPtr def, void *parseOpaque); int virDomainActualNetDefValidate(const virDomainNetDef *net); int virDomainNetDefValidate(const virDomainNetDef *net); +int virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev); +int virDomainMemoryDefValidate(const virDomainMemoryDef *mem, + const virDomainDef *def); +int virDomainVsockDefValidate(const virDomainVsockDef *vsock); +int virDomainInputDefValidate(const virDomainInputDef *input); +int virDomainShmemDefValidate(const virDomainShmemDef *shmem); -- 2.26.2