From 9ad32e5052ecce9ae6a328201c624fe45b7b2dc4 Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Fri, 1 May 2015 07:55:29 -0400 Subject: [PATCH] qemu: Resolve Coverity IDENTICAL_BRANCHES Coverity complains that in the error paths both the < 0 condition and the success path after the qemuDomainObjExitMonitor failure will end up going to cleanup. So just use ignore_value in this error path to resolve the complaint. --- src/qemu/qemu_hotplug.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 613b728bf2..4e9603e88b 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3640,15 +3640,13 @@ int qemuDomainDetachControllerDevice(virQEMUDriverPtr driver, qemuDomainObjEnterMonitor(driver, vm); if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { if (qemuMonitorDelDevice(priv->mon, detach->info.alias)) { - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + ignore_value(qemuDomainObjExitMonitor(driver, vm)); goto cleanup; } } else { if (qemuMonitorRemovePCIDevice(priv->mon, &detach->info.addr.pci) < 0) { - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + ignore_value(qemuDomainObjExitMonitor(driver, vm)); goto cleanup; } } @@ -4136,8 +4134,7 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver, qemuDomainObjEnterMonitor(driver, vm); if (devstr && qemuMonitorDelDevice(priv->mon, tmpChr->info.alias) < 0) { - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + ignore_value(qemuDomainObjExitMonitor(driver, vm)); goto cleanup; } if (qemuDomainObjExitMonitor(driver, vm) < 0) -- 2.39.5