|
 |
6d3351 |
From 197373d62cfb74faf62e0b1334afcb73fcf25550 Mon Sep 17 00:00:00 2001
|
|
|
6d3351 |
Message-Id: <197373d62cfb74faf62e0b1334afcb73fcf25550@dist-git>
|
|
|
6d3351 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
6d3351 |
Date: Fri, 28 Apr 2017 10:45:17 +0200
|
|
|
6d3351 |
Subject: [PATCH] qemu: process: Don't leak priv->usbaddrs after VM restart
|
|
|
6d3351 |
|
|
|
6d3351 |
Since the private data structure is not freed upon stopping a VM, the
|
|
|
6d3351 |
usbaddrs pointer would be leaked:
|
|
|
6d3351 |
|
|
|
6d3351 |
==15388== 136 (16 direct, 120 indirect) bytes in 1 blocks are definitely lost in loss record 893 of 1,019
|
|
|
6d3351 |
==15388== at 0x4C2CF55: calloc (vg_replace_malloc.c:711)
|
|
|
6d3351 |
==15388== by 0x54BF64A: virAlloc (viralloc.c:144)
|
|
|
6d3351 |
==15388== by 0x5547588: virDomainUSBAddressSetCreate (domain_addr.c:1608)
|
|
|
6d3351 |
==15388== by 0x144D38A2: qemuDomainAssignUSBAddresses (qemu_domain_address.c:2458)
|
|
|
6d3351 |
==15388== by 0x144D38A2: qemuDomainAssignAddresses (qemu_domain_address.c:2515)
|
|
|
6d3351 |
==15388== by 0x144ED1E3: qemuProcessPrepareDomain (qemu_process.c:5398)
|
|
|
6d3351 |
==15388== by 0x144F51FF: qemuProcessStart (qemu_process.c:5979)
|
|
|
6d3351 |
[...]
|
|
|
6d3351 |
|
|
|
6d3351 |
(cherry picked from commit 3ab802d689796ebac6545267d5db248e13a9a0e6)
|
|
|
6d3351 |
https://bugzilla.redhat.com/show_bug.cgi?id=1445627
|
|
|
6d3351 |
|
|
|
6d3351 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6d3351 |
---
|
|
|
6d3351 |
src/qemu/qemu_process.c | 4 ++++
|
|
|
6d3351 |
1 file changed, 4 insertions(+)
|
|
|
6d3351 |
|
|
|
6d3351 |
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
|
|
|
6d3351 |
index 5d2d0662b..c23982db6 100644
|
|
|
6d3351 |
--- a/src/qemu/qemu_process.c
|
|
|
6d3351 |
+++ b/src/qemu/qemu_process.c
|
|
|
6d3351 |
@@ -6439,6 +6439,10 @@ void qemuProcessStop(virQEMUDriverPtr driver,
|
|
|
6d3351 |
virBitmapFree(priv->autoCpuset);
|
|
|
6d3351 |
priv->autoCpuset = NULL;
|
|
|
6d3351 |
|
|
|
6d3351 |
+ /* remove address data */
|
|
|
6d3351 |
+ virDomainUSBAddressSetFree(priv->usbaddrs);
|
|
|
6d3351 |
+ priv->usbaddrs = NULL;
|
|
|
6d3351 |
+
|
|
|
6d3351 |
/* The "release" hook cleans up additional resources */
|
|
|
6d3351 |
if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) {
|
|
|
6d3351 |
char *xml = qemuDomainDefFormatXML(driver, vm->def, 0);
|
|
|
6d3351 |
--
|
|
|
6d3351 |
2.12.2
|
|
|
6d3351 |
|