mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-11-03 11:51:11 +00:00
conf: Expose iothreadids when delete non sequential iothreadids
Since 'autofill'd iothreadid entries are not written during XML format processing, it is possible that if an iothreadid in the middle of an autofilled list would then change it's id on a subsequent restart. Thus during the iothreadid deletion, if we determine the delete is not the "last" thread, then clear the autofill bit for all iothreadid's following the one being deleted (either the first or one in the middle). This way, iothreadid's will be printed/saved.
This commit is contained in:
parent
60107346a4
commit
375c185ca8
@ -17476,12 +17476,21 @@ void
|
|||||||
virDomainIOThreadIDDel(virDomainDefPtr def,
|
virDomainIOThreadIDDel(virDomainDefPtr def,
|
||||||
unsigned int iothread_id)
|
unsigned int iothread_id)
|
||||||
{
|
{
|
||||||
int n;
|
size_t i, j;
|
||||||
|
|
||||||
|
for (i = 0; i < def->niothreadids; i++) {
|
||||||
|
if (def->iothreadids[i]->iothread_id == iothread_id) {
|
||||||
|
/* If we were sequential and removed a threadid in the
|
||||||
|
* beginning or middle of the list, then unconditionally
|
||||||
|
* clear the autofill flag so we don't lose these
|
||||||
|
* definitions for XML formatting.
|
||||||
|
*/
|
||||||
|
for (j = i + 1; j < def->niothreadids; j++)
|
||||||
|
def->iothreadids[j]->autofill = false;
|
||||||
|
|
||||||
|
virDomainIOThreadIDDefFree(def->iothreadids[i]);
|
||||||
|
VIR_DELETE_ELEMENT(def->iothreadids, i, def->niothreadids);
|
||||||
|
|
||||||
for (n = 0; n < def->niothreadids; n++) {
|
|
||||||
if (def->iothreadids[n]->iothread_id == iothread_id) {
|
|
||||||
virDomainIOThreadIDDefFree(def->iothreadids[n]);
|
|
||||||
VIR_DELETE_ELEMENT(def->iothreadids, n, def->niothreadids);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user