openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

libvirtd: fix bug when shrinking number of clients 

* daemon/libvirtd.c (qemudRunLoop): Pass allocation size, not
current count, to VIR_SHRINK_N.
* docs/hacking.html.in: Update doc example.
* HACKING: Regenerate.
This commit is contained in:
Eric Blake 2010-11-22 12:27:07 -07:00
parent c73bd6f34a
commit 149c492137
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
HACKING
View File

@ -347,13 +347,14 @@ scales better, but requires tracking allocation separately from usage)
- To trim an array of domains to have one less element: - To trim an array of domains from its allocated size down to the actual used
size:
virDomainPtr domains; virDomainPtr domains;
size_t ndomains = x; size_t ndomains = x;
size_t ndomains_max = y; size_t ndomains_max = y;
VIR_SHRINK_N(domains, ndomains_max, 1); VIR_SHRINK_N(domains, ndomains_max, ndomains_max - ndomains);

3
daemon/libvirtd.c
View File

@ -2362,7 +2362,8 @@ static void *qemudRunLoop(void *opaque) {
server->clients + i + 1, server->clients + i + 1,
sizeof (*server->clients) * (server->nclients - i)); sizeof (*server->clients) * (server->nclients - i));
VIR_SHRINK_N(server->clients, server->nclients, 0); VIR_SHRINK_N(server->clients, server->nclients_max,
server->nclients_max - server->nclients);
goto reprocess; goto reprocess;
} }
} }

5
docs/hacking.html.in
View File

@ -426,14 +426,15 @@
</pre> </pre>
</li> </li>
<li><p>To trim an array of domains to have one less element:</p> <li><p>To trim an array of domains from its allocated size down
to the actual used size:</p>
<pre> <pre>
virDomainPtr domains; virDomainPtr domains;
size_t ndomains = x; size_t ndomains = x;
size_t ndomains_max = y; size_t ndomains_max = y;
VIR_SHRINK_N(domains, ndomains_max, 1); VIR_SHRINK_N(domains, ndomains_max, ndomains_max - ndomains);
</pre></li> </pre></li>
<li><p>To free an array of domains:</p> <li><p>To free an array of domains:</p>