[libvirt] [PATCH 1/2] qemuDomainDetachChrDevice: Don't leak @charAlias

Michal Privoznik mprivozn at redhat.com
Thu Jul 18 10:44:15 UTC 2013


Moreover, since virAsprintf now does report OOM error, there's no need
to call virReportOOMError in error path.
---
 src/qemu/qemu_hotplug.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 788ad47..a98de9d 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -3155,10 +3155,8 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver,
     if (qemuBuildChrDeviceStr(&devstr, vm->def, chr, priv->qemuCaps) < 0)
         return ret;
 
-    if (virAsprintf(&charAlias, "char%s", tmpChr->info.alias) < 0) {
-        virReportOOMError();
-        return ret;
-    }
+    if (virAsprintf(&charAlias, "char%s", tmpChr->info.alias) < 0)
+        goto cleanup;
 
     qemuDomainObjEnterMonitor(driver, vm);
     if (devstr && qemuMonitorDelDevice(priv->mon, tmpChr->info.alias) < 0) {
-- 
1.8.1.5




More information about the libvir-list mailing list