[libvirt] [PATCH v5 4/4] qemu: unlink the error report from VIR_STRDUP.
The function to retrieve the file system info using QEMU-GA is using
some conditionals to retrieve the info. This is wrong because the error
of some conditionals will be raised if VIR_STRDUP return errors and not
if some problem occurred with JSON.
Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com>
---
src/qemu/qemu_agent.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index ac728becef..36dc18d72f 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -1836,6 +1836,7 @@ qemuAgentGetFSInfo(qemuAgentPtr mon, virDomainFSInfoPtr **info,
virJSONValuePtr data;
virDomainFSInfoPtr *info_ret = NULL;
virPCIDeviceAddress pci_address;
+ const char *result = NULL;
cmd = qemuAgentMakeCommand("guest-get-fsinfo", NULL);
if (!cmd)
@@ -1881,28 +1882,34 @@ qemuAgentGetFSInfo(qemuAgentPtr mon, virDomainFSInfoPtr **info,
if (VIR_ALLOC(info_ret[i]) < 0)
goto cleanup;
- if (VIR_STRDUP(info_ret[i]->mountpoint,
- virJSONValueObjectGetString(entry, "mountpoint")) <
0) {
+ if (!(result = virJSONValueObjectGetString(entry, "mountpoint"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("'mountpoint' missing in reply of "
"guest-get-fsinfo"));
goto cleanup;
}
- if (VIR_STRDUP(info_ret[i]->name,
- virJSONValueObjectGetString(entry, "name")) < 0) {
+ if (VIR_STRDUP(info_ret[i]->mountpoint, result) < 0)
+ goto cleanup;
+
+ if (!(result = virJSONValueObjectGetString(entry, "name"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("'name' missing in reply of
guest-get-fsinfo"));
goto cleanup;
}
- if (VIR_STRDUP(info_ret[i]->fstype,
- virJSONValueObjectGetString(entry, "type")) < 0) {
+ if (VIR_STRDUP(info_ret[i]->name, result) < 0)
+ goto cleanup;
+
+ if (!(result = virJSONValueObjectGetString(entry, "type"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("'type' missing in reply of
guest-get-fsinfo"));
goto cleanup;
}
+ if (VIR_STRDUP(info_ret[i]->fstype, result) < 0)
+ goto cleanup;
+
if (!(entry = virJSONValueObjectGet(entry, "disk"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("'disk' missing in reply of
guest-get-fsinfo"));
--
2.17.1