]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
qemu: Reuse qemuDomainAgentAvailable in qemuDomainInterfaceAddresses
authorPeter Krempa <pkrempa@redhat.com>
Fri, 24 Apr 2015 13:54:08 +0000 (15:54 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Sun, 26 Apr 2015 15:19:22 +0000 (17:19 +0200)
src/qemu/qemu_driver.c

index 611787ad4559b04a5a8a2d8dc8ec109e309b812a..6b16441907fa39f76d9b86d731d6cac089858bf5 100644 (file)
@@ -19799,27 +19799,11 @@ qemuDomainInterfaceAddresses(virDomainPtr dom,
         break;
 
     case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT:
-        if (priv->agentError) {
-            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                           _("QEMU guest agent is not "
-                             "available due to an error"));
-            goto cleanup;
-        }
-
         if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0)
             goto cleanup;
 
-        if (!virDomainObjIsActive(vm)) {
-            virReportError(VIR_ERR_OPERATION_INVALID, "%s",
-                           _("domain is not running"));
-            goto endjob;
-        }
-
-        if (!priv->agent) {
-            virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
-                           _("QEMU guest agent is not configured"));
+        if (qemuDomainAgentAvailable(vm, true) < 0)
             goto endjob;
-        }
 
         qemuDomainObjEnterAgent(vm);
         ret = qemuAgentGetInterfaces(priv->agent, ifaces);