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

virDomainDeviceDefParse: Separate code for parsing type

Browse Source 
Move the code into a new function named virDomainDeviceDefParseType. The
separation will make it easier to change the type of the 'type' field in
side of virDomainDeviceDef.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-12-02 14:46:42 +01:00
parent 6198c44338
commit c9cfc3876e
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/conf/domain_conf.c
View File

@ -13729,6 +13729,32 @@ virDomainCryptoDefParseXML(virDomainXMLOption *xmlopt,
} }
static int
virDomainDeviceDefParseType(const char *typestr,
int *type)
{
int tmp;
/* Mapping of serial, parallel, console and channel to VIR_DOMAIN_DEVICE_CHR. */
if (STREQ(typestr, "channel") ||
STREQ(typestr, "console") ||
STREQ(typestr, "parallel") ||
STREQ(typestr, "serial")) {
*type = VIR_DOMAIN_DEVICE_CHR;
return 0;
}
if ((tmp = virDomainDeviceTypeFromString(typestr)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown device type '%s'"), typestr);
return -1;
}
*type = tmp;
return 0;
}
virDomainDeviceDef * virDomainDeviceDef *
virDomainDeviceDefParse(const char *xmlStr, virDomainDeviceDefParse(const char *xmlStr,
const virDomainDef *def, const virDomainDef *def,
@ -13748,21 +13774,8 @@ virDomainDeviceDefParse(const char *xmlStr,
dev = g_new0(virDomainDeviceDef, 1); dev = g_new0(virDomainDeviceDef, 1);
if ((dev->type = virDomainDeviceTypeFromString((const char *) node->name)) < 0) { if (virDomainDeviceDefParseType((const char *)node->name, &dev->type) < 0)
/* Some crazy mapping of serial, parallel, console and channel to
* VIR_DOMAIN_DEVICE_CHR. */
if (virXMLNodeNameEqual(node, "channel") ||
virXMLNodeNameEqual(node, "console") ||
virXMLNodeNameEqual(node, "parallel") ||
virXMLNodeNameEqual(node, "serial")) {
dev->type = VIR_DOMAIN_DEVICE_CHR;
} else {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown device type '%s'"),
node->name);
return NULL; return NULL;
}
}
switch ((virDomainDeviceType) dev->type) { switch ((virDomainDeviceType) dev->type) {
case VIR_DOMAIN_DEVICE_DISK: case VIR_DOMAIN_DEVICE_DISK: