External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-28 22:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: domain: Extract code for parsing and formatting iothread mapping definition

Browse Source 
The code will be also needed for 'virtio-scsi' controller definitions.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2025-02-14 12:13:02 +01:00
parent 4b651cf890
commit 79c68ae313
1 changed files with 81 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
src/conf/domain_conf.c
View File

@ -7938,12 +7938,57 @@ virDomainDiskDefGeometryParse(virDomainDiskDef *def,
} }
static int
virDomainIothreadMappingDefParse(xmlNodePtr driverNode,
GSList **iothreads)
{
xmlNodePtr iothreadsNode;
g_autoslist(virDomainIothreadMappingDef) ioth = NULL;
g_autoptr(GPtrArray) iothreadNodes = NULL;
size_t i;
if (!(iothreadsNode = virXMLNodeGetSubelement(driverNode, "iothreads")))
return 0;
if (!(iothreadNodes = virXMLNodeGetSubelementList(iothreadsNode, "iothread")))
return 0;
for (i = 0; i < iothreadNodes->len; i++) {
xmlNodePtr iothNode = g_ptr_array_index(iothreadNodes, i);
g_autoptr(virDomainIothreadMappingDef) iothdef = g_new0(virDomainIothreadMappingDef, 1);
g_autoptr(GPtrArray) queueNodes = NULL;
if (virXMLPropUInt(iothNode, "id", 10, VIR_XML_PROP_REQUIRED,
&iothdef->id) < 0)
return -1;
if ((queueNodes = virXMLNodeGetSubelementList(iothNode, "queue"))) {
size_t q;
iothdef->queues = g_new0(unsigned int, queueNodes->len);
iothdef->nqueues = queueNodes->len;
for (q = 0; q < queueNodes->len; q++) {
xmlNodePtr queueNode = g_ptr_array_index(queueNodes, q);
if (virXMLPropUInt(queueNode, "id", 10, VIR_XML_PROP_REQUIRED,
&(iothdef->queues[q])) < 0)
return -1;
}
}
ioth = g_slist_prepend(ioth, g_steal_pointer(&iothdef));
}
*iothreads = g_slist_reverse(g_steal_pointer(&ioth));
return 0;
}
static int static int
virDomainDiskDefDriverParseXML(virDomainDiskDef *def, virDomainDiskDefDriverParseXML(virDomainDiskDef *def,
xmlNodePtr cur) xmlNodePtr cur)
{ {
xmlNodePtr iothreadsNode;
def->driverName = virXMLPropString(cur, "name"); def->driverName = virXMLPropString(cur, "name");
if (virXMLPropEnum(cur, "cache", virDomainDiskCacheTypeFromString, if (virXMLPropEnum(cur, "cache", virDomainDiskCacheTypeFromString,
@ -7990,44 +8035,9 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *def,
if (virXMLPropUInt(cur, "iothread", 10, VIR_XML_PROP_NONZERO, &def->iothread) < 0) if (virXMLPropUInt(cur, "iothread", 10, VIR_XML_PROP_NONZERO, &def->iothread) < 0)
return -1; return -1;
if ((iothreadsNode = virXMLNodeGetSubelement(cur, "iothreads"))) { if (virDomainIothreadMappingDefParse(cur, &def->iothreads) < 0)
g_autoslist(virDomainIothreadMappingDef) ioth = NULL;
g_autoptr(GPtrArray) iothreadNodes = NULL;
if ((iothreadNodes = virXMLNodeGetSubelementList(iothreadsNode, "iothread"))) {
size_t i;
for (i = 0; i < iothreadNodes->len; i++) {
xmlNodePtr iothNode = g_ptr_array_index(iothreadNodes, i);
g_autoptr(virDomainIothreadMappingDef) iothdef = g_new0(virDomainIothreadMappingDef, 1);
g_autoptr(GPtrArray) queueNodes = NULL;
if (virXMLPropUInt(iothNode, "id", 10, VIR_XML_PROP_REQUIRED,
&iothdef->id) < 0)
return -1; return -1;
if ((queueNodes = virXMLNodeGetSubelementList(iothNode, "queue"))) {
size_t q;
iothdef->queues = g_new0(unsigned int, queueNodes->len);
iothdef->nqueues = queueNodes->len;
for (q = 0; q < queueNodes->len; q++) {
xmlNodePtr queueNode = g_ptr_array_index(queueNodes, q);
if (virXMLPropUInt(queueNode, "id", 10, VIR_XML_PROP_REQUIRED,
&(iothdef->queues[q])) < 0)
return -1;
}
}
ioth = g_slist_prepend(ioth, g_steal_pointer(&iothdef));
}
def->iothreads = g_slist_reverse(g_steal_pointer(&ioth));
}
}
if (virXMLPropEnum(cur, "detect_zeroes", if (virXMLPropEnum(cur, "detect_zeroes",
virDomainDiskDetectZeroesTypeFromString, virDomainDiskDetectZeroesTypeFromString,
VIR_XML_PROP_NONZERO, &def->detect_zeroes) < 0) VIR_XML_PROP_NONZERO, &def->detect_zeroes) < 0)
@ -23152,6 +23162,37 @@ virDomainDiskDefFormatIotune(virBuffer *buf,
#undef FORMAT_IOTUNE #undef FORMAT_IOTUNE
static void
virDomainIothreadMappingDefFormat(virBuffer *buf,
GSList *iothreads)
{
g_auto(virBuffer) iothreadsChildBuf = VIR_BUFFER_INIT_CHILD(buf);
GSList *n;
if (!iothreads)
return;
for (n = iothreads; n; n = n->next) {
virDomainIothreadMappingDef *iothDef = n->data;
g_auto(virBuffer) iothreadAttrBuf = VIR_BUFFER_INITIALIZER;
g_auto(virBuffer) iothreadChildBuf = VIR_BUFFER_INIT_CHILD(&iothreadsChildBuf);
virBufferAsprintf(&iothreadAttrBuf, " id='%u'", iothDef->id);
if (iothDef->queues) {
size_t q;
for (q = 0; q < iothDef->nqueues; q++)
virBufferAsprintf(&iothreadChildBuf, "<queue id='%u'/>\n", iothDef->queues[q]);
}
virXMLFormatElement(&iothreadsChildBuf, "iothread", &iothreadAttrBuf, &iothreadChildBuf);
}
virXMLFormatElement(buf, "iothreads", NULL, &iothreadsChildBuf);
}
static void static void
virDomainDiskDefFormatDriver(virBuffer *buf, virDomainDiskDefFormatDriver(virBuffer *buf,
virDomainDiskDef *disk) virDomainDiskDef *disk)
@ -23226,29 +23267,7 @@ virDomainDiskDefFormatDriver(virBuffer *buf,
virXMLFormatElement(&childBuf, "metadata_cache", NULL, &metadataCacheChildBuf); virXMLFormatElement(&childBuf, "metadata_cache", NULL, &metadataCacheChildBuf);
} }
if (disk->iothreads) { virDomainIothreadMappingDefFormat(&childBuf, disk->iothreads);
g_auto(virBuffer) iothreadsChildBuf = VIR_BUFFER_INIT_CHILD(&childBuf);
GSList *n;
for (n = disk->iothreads; n; n = n->next) {
virDomainIothreadMappingDef *iothDef = n->data;
g_auto(virBuffer) iothreadAttrBuf = VIR_BUFFER_INITIALIZER;
g_auto(virBuffer) iothreadChildBuf = VIR_BUFFER_INIT_CHILD(&iothreadsChildBuf);
virBufferAsprintf(&iothreadAttrBuf, " id='%u'", iothDef->id);
if (iothDef->queues) {
size_t q;
for (q = 0; q < iothDef->nqueues; q++)
virBufferAsprintf(&iothreadChildBuf, "<queue id='%u'/>\n", iothDef->queues[q]);
}
virXMLFormatElement(&iothreadsChildBuf, "iothread", &iothreadAttrBuf, &iothreadChildBuf);
}
virXMLFormatElement(&childBuf, "iothreads", NULL, &iothreadsChildBuf);
}
virXMLFormatElement(buf, "driver", &attrBuf, &childBuf); virXMLFormatElement(buf, "driver", &attrBuf, &childBuf);
} }