[libvirt] [PATCH 3/5] qemu: Reuse qemuDomainAgentAvailable in qemuDomainInterfaceAddresses

Friday, 24 April 2015

---
 src/qemu/qemu_driver.c | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 7d2c5ed..ce38e36 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -19750,27 +19750,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);
-- 
2.3.5


    