3:01 p.m.
Followup to review comments I made for recent agent series.
John Ferlan (2):
qemu: Remove duplicated qemuAgentCheckError
qemu: Remove duplicated qemuAgentCheckError
src/qemu/qemu_agent.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
--
2.17.1
3:01 p.m.
New subject: [libvirt] [PATCH 1/2] qemu: Remove duplicated qemuAgentCheckError
Commit 5b3492fadb moved qemuAgentCheckError calls into
qemuAgentCommand for various reasons; however, subsequent
commit b1aa91e14 restored the call. So let's just remove
the duplicitous call from qemuAgentSetVCPUsCommand.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/qemu/qemu_agent.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index 0a1f3195dd..102ac36f0f 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -1544,9 +1544,6 @@ qemuAgentSetVCPUsCommand(qemuAgentPtr mon,
VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0)
goto cleanup;
- if (qemuAgentCheckError(cmd, reply) < 0)
- goto cleanup;
-
/* All negative values are invalid. Return of 0 is bogus since we wouldn't
* call the guest agent so that 0 cpus would be set successfully. Reporting
* more successfully set vcpus that we've asked for is invalid. */
--
2.17.1
3:01 p.m.
New subject: [libvirt] [PATCH 2/2] qemu: Remove duplicated qemuAgentCheckError
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(a)redhat.com>
---
src/qemu/qemu_agent.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index 102ac36f0f..313362ac0f 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -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",
--
2.17.1
6:23 a.m.
On 09/07/2018 10:01 PM, John Ferlan wrote:
Followup to review comments I made for recent agent series.
John Ferlan (2):
qemu: Remove duplicated qemuAgentCheckError
qemu: Remove duplicated qemuAgentCheckError
src/qemu/qemu_agent.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
ACK
Although the patches can be merged into one. But IDC either.
Michal
2264
days inactive
2268
days old
3 comments
2 participants
participants (2)
-
John Ferlan -
Michal Privoznik