3:35 a.m.
Use qemuAgentCommandFull so that callers of qemuAgentGetFSInfo can
suppress error reports if the function is not supported by the guest
agent.
Since this patch removes the last use of
qemuAgentErrorCommandUnsupported the whole function is deleted as well.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_agent.c | 42 +++++++++---------------------------------
src/qemu/qemu_agent.h | 4 +++-
src/qemu/qemu_driver.c | 4 ++--
tests/qemuagenttest.c | 4 ++--
4 files changed, 16 insertions(+), 38 deletions(-)
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index efb6c52f96..358be30fa1 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -993,31 +993,6 @@ qemuAgentStringifyErrorClass(const char *klass)
return "unknown QEMU command error";
}
-/* Checks whether the agent reply msg is an error caused by an unsupported
- * command.
- *
- * Returns true when reply is CommandNotFound or CommandDisabled
- * false otherwise
- */
-static bool
-qemuAgentErrorCommandUnsupported(virJSONValuePtr reply)
-{
- const char *klass;
- virJSONValuePtr error;
-
- if (!reply)
- return false;
-
- error = virJSONValueObjectGet(reply, "error");
-
- if (!error)
- return false;
-
- klass = virJSONValueObjectGetString(error, "class");
- return STREQ_NULLABLE(klass, "CommandNotFound") ||
- STREQ_NULLABLE(klass, "CommandDisabled");
-}
-
/* Ignoring OOM in this method, since we're already reporting
* a more important error
*
@@ -1959,12 +1934,14 @@ qemuAgentGetFSInfoFillDisks(virJSONValuePtr jsondisks,
}
/* Returns: number of entries in '@info' on success
- * -2 when agent command is not supported by the agent
- * -1 otherwise
+ * -2 when agent command is not supported by the agent and
+ * 'report_unsupported' is false (libvirt error is not reported)
+ * -1 otherwise (libvirt error is reported)
*/
int
qemuAgentGetFSInfo(qemuAgentPtr agent,
- qemuAgentFSInfoPtr **info)
+ qemuAgentFSInfoPtr **info,
+ bool report_unsupported)
{
size_t i;
int ret = -1;
@@ -1973,16 +1950,15 @@ qemuAgentGetFSInfo(qemuAgentPtr agent,
virJSONValuePtr data;
size_t ndata = 0;
qemuAgentFSInfoPtr *info_ret = NULL;
+ int rc;
cmd = qemuAgentMakeCommand("guest-get-fsinfo", NULL);
if (!cmd)
return ret;
- if (qemuAgentCommand(agent, cmd, &reply, agent->timeout) < 0) {
- if (qemuAgentErrorCommandUnsupported(reply))
- ret = -2;
- goto cleanup;
- }
+ if ((rc = qemuAgentCommandFull(agent, cmd, &reply, agent->timeout,
+ report_unsupported)) < 0)
+ return rc;
if (!(data = virJSONValueObjectGet(reply, "return"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h
index 361a67aaee..2eeb376a68 100644
--- a/src/qemu/qemu_agent.h
+++ b/src/qemu/qemu_agent.h
@@ -98,7 +98,9 @@ int qemuAgentShutdown(qemuAgentPtr mon,
int qemuAgentFSFreeze(qemuAgentPtr mon,
const char **mountpoints, unsigned int nmountpoints);
int qemuAgentFSThaw(qemuAgentPtr mon);
-int qemuAgentGetFSInfo(qemuAgentPtr mon, qemuAgentFSInfoPtr **info);
+int qemuAgentGetFSInfo(qemuAgentPtr mon,
+ qemuAgentFSInfoPtr **info,
+ bool report_unsupported);
int qemuAgentSuspend(qemuAgentPtr mon,
unsigned int target);
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 1b1fa5e209..2f043e3ad9 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -21774,7 +21774,7 @@ qemuDomainGetFSInfoAgent(virQEMUDriverPtr driver,
goto endjob;
agent = qemuDomainObjEnterAgent(vm);
- ret = qemuAgentGetFSInfo(agent, info);
+ ret = qemuAgentGetFSInfo(agent, info, true);
qemuDomainObjExitAgent(vm, agent);
endjob:
@@ -22932,7 +22932,7 @@ qemuDomainGetGuestInfo(virDomainPtr dom,
goto exitagent;
if (supportedTypes & VIR_DOMAIN_GUEST_INFO_FILESYSTEM) {
- rc = qemuAgentGetFSInfo(agent, &agentfsinfo);
+ rc = qemuAgentGetFSInfo(agent, &agentfsinfo, true);
if (rc < 0) {
if (!(rc == -2 && types == 0))
goto exitagent;
diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c
index 7ea330892b..42ef81ac9a 100644
--- a/tests/qemuagenttest.c
+++ b/tests/qemuagenttest.c
@@ -254,7 +254,7 @@ testQemuAgentGetFSInfo(const void *data)
goto cleanup;
if ((ninfo = qemuAgentGetFSInfo(qemuMonitorTestGetAgent(test),
- &info)) < 0)
+ &info, true)) < 0)
goto cleanup;
if (ninfo != 3) {
@@ -326,7 +326,7 @@ testQemuAgentGetFSInfo(const void *data)
"}") < 0)
goto cleanup;
- if (qemuAgentGetFSInfo(qemuMonitorTestGetAgent(test), &info) >= 0) {
+ if (qemuAgentGetFSInfo(qemuMonitorTestGetAgent(test), &info, true) >= 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
"agent get-fsinfo command should have failed");
goto cleanup;
--
2.24.1