<div class="zcontentRow"> <p>Thank you <span style="line-height: 21px;">Michal</span> </p><p><br></p><div class="zMailSign"><div><div><p>---</p><p>Best wishes</p><p>Yi Wang</p></div></div></div><div><div class="zhistoryRow" style="display:block"><div class="zhistoryDes" style="width: 100%; height: 28px; line-height: 28px; background-color: #E0E5E9; color: #1388FF; text-align: center;" language-data="HistoryOrgTxt">原始邮件</div><div id="zwriteHistoryContainer"><div class="control-group zhistoryPanel"><div class="zhistoryHeader" style="padding: 8px; background-color: #F5F6F8;"><div><strong language-data="HistorySenderTxt">发件人:</strong><span class="zreadUserName"> <mprivozn@redhat.com>;</span></div><div><strong language-data="HistoryTOTxt">收件人:</strong><span class="zreadUserName" style="display: inline-block;">汪翼10129963;</span><span class="zreadUserName" style="display: inline-block;"> <libvir-list@redhat.com>;</span></div><div><strong language-data="HistoryCCTxt">抄送人:</strong><span class="zreadUserName" style="display: inline-block;">刘建军10033482;</span><span class="zreadUserName" style="display: inline-block;">徐熙00121931;</span></div><div><strong language-data="HistoryDateTxt">日 期 :</strong><span class="">2017年05月24日 23:00</span></div><div><strong language-data="HistorySubjectTxt">主 题 :</strong><span class="zreadTitle"><strong>Re: [libvirt] [PATCH] qemu: Fix memory leak inqemuDomainUpdateMemoryDeviceInfo</strong></span></div></div><p class="zhistoryContent"><br></p><div>On 05/25/2017 04:20 AM, Yi Wang wrote:<br>> The @meminfo allocated in qemuMonitorGetMemoryDeviceInfo may be lost when<br>> exit monitor failed. Luckily we can free it according to rc.<br>> <br>> Signed-off-by: Yi Wang <wang.yi59@zte.com.cn><br>> ---<br>>  src/qemu/qemu_domain.c | 5 ++++-<br>>  1 file changed, 4 insertions(+), 1 deletion(-)<br>> <br>> diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c<br>> index c8dc748..c34ec5a 100644<br>> --- a/src/qemu/qemu_domain.c<br>> +++ b/src/qemu/qemu_domain.c<br>> @@ -5767,8 +5767,11 @@ qemuDomainUpdateMemoryDeviceInfo(virQEMUDriverPtr driver,<br>>  <br>>      rc = qemuMonitorGetMemoryDeviceInfo(priv->mon, &meminfo);<br>>  <br>> -    if (qemuDomainObjExitMonitor(driver, vm) < 0)<br>> +    if (qemuDomainObjExitMonitor(driver, vm) < 0) {<br>> +        if (0 == rc)<br><br>We don't use this style in libvirt. Moreover, there's no real need for<br>the check as virHashFree() accepts NULL happily.<br><br>> +            virHashFree(meminfo);<br>>          return -1;<br>> +    }<br>>  <br>>      /* if qemu doesn't support the info request, just carry on */<br>>      if (rc == -2)<br>> <br><br>I've fixed that, ACKed and pushed.<br><br>Michal<br></div><p><br></p></div></div></div></div><p><br></p> </div>