]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Use virDomainObjCheckActive() more
authorMichal Privoznik <mprivozn@redhat.com>
Mon, 21 Feb 2022 13:04:43 +0000 (14:04 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Mon, 21 Feb 2022 14:25:32 +0000 (15:25 +0100)
Using the following spatch, I've identified two places which
could be switched from explicit virDomainObjIsActive() +
virReportError() to virDomainObjCheckActive():

  @@
  expression dom;
  @@
      if (
  -        !virDomainObjIsActive(dom)
  +        virDomainObjCheckActive(dom) < 0
      ) {
  -        virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running"));
          ...
      }

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/qemu/qemu_driver.c

index 70d51855b27f08066eb837b4fa0fdc7d251fdd4b..e417d358cd8a0d99abec28520c1f82bdcc64aa1e 100644 (file)
@@ -19924,9 +19924,7 @@ qemuDomainGetSEVInfo(virQEMUDriver *driver,
     if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0)
         return -1;
 
-    if (!virDomainObjIsActive(vm)) {
-        virReportError(VIR_ERR_OPERATION_INVALID,
-                       "%s", _("domain is not running"));
+    if (virDomainObjCheckActive(vm) < 0) {
         goto endjob;
     }
 
@@ -20744,9 +20742,7 @@ qemuDomainStartDirtyRateCalc(virDomainPtr dom,
     if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
         goto cleanup;
 
-    if (!virDomainObjIsActive(vm)) {
-        virReportError(VIR_ERR_OPERATION_INVALID,
-                       "%s", _("domain is not running"));
+    if (virDomainObjCheckActive(vm) < 0) {
         goto endjob;
     }