NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

domain_conf: move vendor, product and tray checks to domain_validate.c

Browse Source 
The 'tray' check isn't a XML parse specific code and can be pushed
to the validate callback, in virDomainDiskDefValidate().

'vendor' and 'product' string sizes are already checked by the
domaincommon.rng schema, but can be of use in the validate callback
since not all scenarios will go through the XML parsing.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Daniel Henrique Barboza 2020-12-03 13:54:58 -03:00
parent 654e106397
commit 98bc393579
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/conf/domain_conf.c
View File

@ -10227,9 +10227,6 @@ virDomainDiskDefParsePrivateData(xmlXPathContextPtr ctxt,
} }
#define VENDOR_LEN 8
#define PRODUCT_LEN 16
static virDomainDiskDefPtr static virDomainDiskDefPtr
virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
xmlNodePtr node, xmlNodePtr node,
@ -10404,12 +10401,6 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
if (!(vendor = virXMLNodeContentString(cur))) if (!(vendor = virXMLNodeContentString(cur)))
return NULL; return NULL;
if (strlen(vendor) > VENDOR_LEN) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("disk vendor is more than 8 characters"));
return NULL;
}
if (!virStringIsPrintable(vendor)) { if (!virStringIsPrintable(vendor)) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("disk vendor is not printable string")); _("disk vendor is not printable string"));
@ -10420,12 +10411,6 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
if (!(product = virXMLNodeContentString(cur))) if (!(product = virXMLNodeContentString(cur)))
return NULL; return NULL;
if (strlen(product) > PRODUCT_LEN) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("disk product is more than 16 characters"));
return NULL;
}
if (!virStringIsPrintable(product)) { if (!virStringIsPrintable(product)) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("disk product is not printable string")); _("disk product is not printable string"));
@ -10556,13 +10541,6 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
_("unknown disk tray status '%s'"), tray); _("unknown disk tray status '%s'"), tray);
return NULL; return NULL;
} }
if (def->device != VIR_DOMAIN_DISK_DEVICE_FLOPPY &&
def->device != VIR_DOMAIN_DISK_DEVICE_CDROM) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("tray is only valid for cdrom and floppy"));
return NULL;
}
} }
if (removable) { if (removable) {

25
src/conf/domain_validate.c
View File

@ -225,6 +225,9 @@ virSecurityDeviceLabelDefValidateXML(virSecurityDeviceLabelDefPtr *seclabels,
} }
#define VENDOR_LEN 8
#define PRODUCT_LEN 16
int int
virDomainDiskDefValidate(const virDomainDef *def, virDomainDiskDefValidate(const virDomainDef *def,
const virDomainDiskDef *disk) const virDomainDiskDef *disk)
@ -301,5 +304,27 @@ virDomainDiskDefValidate(const virDomainDef *def,
return -1; return -1;
} }
if (disk->tray_status &&
disk->device != VIR_DOMAIN_DISK_DEVICE_FLOPPY &&
disk->device != VIR_DOMAIN_DISK_DEVICE_CDROM) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("tray is only valid for cdrom and floppy"));
return -1;
}
if (disk->vendor && strlen(disk->vendor) > VENDOR_LEN) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("disk vendor is more than %d characters"),
VENDOR_LEN);
return -1;
}
if (disk->product && strlen(disk->product) > PRODUCT_LEN) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("disk product is more than %d characters"),
PRODUCT_LEN);
return -1;
}
return 0; return 0;
} }