External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-12 07:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

domain_conf: Format <defaultiothread/> more often

Browse Source 
The <defaultiothread/> element is formatted inside
virDomainDefaultIOThreadDefFormat() which is called only from
virDomainDefIOThreadsFormat() (so that IOThread related stuff is
formatted calling one function). However, when there are no
<iothreadids/> defined (or only autoallocated ones are present),
then the outer formatting function exits early never calling the
<defaultiothread/> formatter.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2022-07-07 16:29:18 +02:00
parent 430ab88ab1
commit 24fa7004e4
1 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/conf/domain_conf.c
View File

@ -26349,39 +26349,37 @@ static void
virDomainDefIOThreadsFormat(virBuffer *buf,
const virDomainDef *def)
{
g_auto(virBuffer) childrenBuf = VIR_BUFFER_INIT_CHILD(buf);
size_t i;
if (def->niothreadids == 0)
return;
virBufferAsprintf(buf, "<iothreads>%zu</iothreads>\n",
def->niothreadids);
if (!virDomainDefIothreadShouldFormat(def))
return;
for (i = 0; i < def->niothreadids; i++) {
virDomainIOThreadIDDef *iothread = def->iothreadids[i];
g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
virBufferAsprintf(&attrBuf, " id='%u'",
iothread->iothread_id);
if (iothread->thread_pool_min >= 0) {
virBufferAsprintf(&attrBuf, " thread_pool_min='%d'",
iothread->thread_pool_min);
}
if (iothread->thread_pool_max >= 0) {
virBufferAsprintf(&attrBuf, " thread_pool_max='%d'",
iothread->thread_pool_max);
}
virXMLFormatElement(&childrenBuf, "iothread", &attrBuf, NULL);
if (def->niothreadids > 0) {
virBufferAsprintf(buf, "<iothreads>%zu</iothreads>\n",
def->niothreadids);
}
virXMLFormatElement(buf, "iothreadids", NULL, &childrenBuf);
if (virDomainDefIothreadShouldFormat(def)) {
g_auto(virBuffer) childrenBuf = VIR_BUFFER_INIT_CHILD(buf);
size_t i;
for (i = 0; i < def->niothreadids; i++) {
virDomainIOThreadIDDef *iothread = def->iothreadids[i];
g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
virBufferAsprintf(&attrBuf, " id='%u'",
iothread->iothread_id);
if (iothread->thread_pool_min >= 0) {
virBufferAsprintf(&attrBuf, " thread_pool_min='%d'",
iothread->thread_pool_min);
}
if (iothread->thread_pool_max >= 0) {
virBufferAsprintf(&attrBuf, " thread_pool_max='%d'",
iothread->thread_pool_max);
}
virXMLFormatElement(&childrenBuf, "iothread", &attrBuf, NULL);
}
virXMLFormatElement(buf, "iothreadids", NULL, &childrenBuf);
}
virDomainDefaultIOThreadDefFormat(buf, def);
}