]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Remove duplicated qemuAgentCheckError
authorJohn Ferlan <jferlan@redhat.com>
Fri, 7 Sep 2018 20:01:27 +0000 (16:01 -0400)
committerJohn Ferlan <jferlan@redhat.com>
Tue, 11 Sep 2018 14:32:01 +0000 (10:32 -0400)
Commit 5b3492fadb moved qemuAgentCheckError calls into
qemuAgentCommand for various reasons; however, subsequent
commit 0977b8aa0 adding a new command made call again
So let's just remove the duplicitous call from
qemuAgentGetInterfaces.

Signed-off-by: John Ferlan <jferlan@redhat.com>
ACKed-by: Michal Privoznik <mprivozn@redhat.com>
src/qemu/qemu_agent.c

index 102ac36f0ffed1c2fe37b5dd2cc2e5dc19387f1d..313362ac0fc17a6afd08855ff1139885ab8b2e0c 100644 (file)
@@ -2035,10 +2035,9 @@ qemuAgentGetInterfaces(qemuAgentPtr mon,
     if (!(cmd = qemuAgentMakeCommand("guest-network-get-interfaces", NULL)))
         goto cleanup;
 
-    if (qemuAgentCommand(mon, cmd, &reply, false, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0 ||
-        qemuAgentCheckError(cmd, reply) < 0) {
+    if (qemuAgentCommand(mon, cmd, &reply, false,
+                         VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0)
         goto cleanup;
-    }
 
     if (!(ret_array = virJSONValueObjectGet(reply, "return"))) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",