From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 24 Apr 2015 13:54:08 +0000 (+0200)
Subject: qemu: Reuse qemuDomainAgentAvailable in qemuDomainInterfaceAddresses
X-Git-Tag: v1.2.15-rc1~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcbb243bbc3470431d15cec4c5bb96d2de89a88b;p=thirdparty%2Flibvirt.git

qemu: Reuse qemuDomainAgentAvailable in qemuDomainInterfaceAddresses
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 611787ad45..6b16441907 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -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);