]> xenbits.xensource.com Git - libvirt.git/commitdiff
(qemu|lxc)DomainGetCPUStats: Clean up
authorPeter Krempa <pkrempa@redhat.com>
Mon, 7 Dec 2015 04:48:46 +0000 (05:48 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Mon, 25 Jan 2016 16:45:09 +0000 (17:45 +0100)
Remove unnecessary condition and variable.

src/lxc/lxc_driver.c
src/qemu/qemu_driver.c

index 24b96226809db5c80c0c980a246d7c9fec4ec9ee..67088c8fab8cad3f43d09269fdee79fa27d850f6 100644 (file)
@@ -5704,8 +5704,7 @@ lxcDomainGetCPUStats(virDomainPtr dom,
         ret = virCgroupGetPercpuStats(priv->cgroup, params,
                                       nparams, start_cpu, ncpus, 0);
  cleanup:
-    if (vm)
-        virObjectUnlock(vm);
+    virObjectUnlock(vm);
     return ret;
 }
 
index e46404b82ef57b98d57f2de7d8e02c2c02009e3e..18118343885a6df75cab0fd227ac846c38c7ac70 100644 (file)
@@ -18081,7 +18081,6 @@ qemuDomainGetCPUStats(virDomainPtr domain,
 {
     virDomainObjPtr vm = NULL;
     int ret = -1;
-    bool isActive;
     qemuDomainObjPrivatePtr priv;
 
     virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1);
@@ -18094,8 +18093,7 @@ qemuDomainGetCPUStats(virDomainPtr domain,
     if (virDomainGetCPUStatsEnsureACL(domain->conn, vm->def) < 0)
         goto cleanup;
 
-    isActive = virDomainObjIsActive(vm);
-    if (!isActive) {
+    if (!virDomainObjIsActive(vm)) {
         virReportError(VIR_ERR_OPERATION_INVALID, "%s",
                        _("domain is not running"));
         goto cleanup;