[libvirt] [PATCH v2] storage: Check stderr when matching parted output
In old version of parted like parted-2.1-25, error message is shown in
stdout when printing a disk info without disk label.
Error: /dev/sda: unrecognised disk label
This line has been moved to stderr in newer version of parted. So we
should check both stdout and stderr when locating this message.
This should fix bug:
https://bugzilla.redhat.com/show_bug.cgi?id=1172468
Signed-off-by: Hao Liu <hliu(a)redhat.com>
---
V2: (Courtesy of Luyang Huang)
Fixed memory leak;
Fixed curly brace style;
src/storage/storage_backend_disk.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c
index 4b05e8c..3f97fd9 100644
--- a/src/storage/storage_backend_disk.c
+++ b/src/storage/storage_backend_disk.c
@@ -370,21 +370,26 @@ virStorageBackendDiskFindLabel(const char* device)
};
virCommandPtr cmd = virCommandNew(PARTED);
char *output = NULL;
+ char *error = NULL;
int ret = -1;
virCommandAddArgSet(cmd, args);
virCommandAddEnvString(cmd, "LC_ALL=C");
virCommandSetOutputBuffer(cmd, &output);
+ virCommandSetErrorBuffer(cmd, &error);
/* if parted succeeds we have a valid partition table */
ret = virCommandRun(cmd, NULL);
if (ret < 0) {
- if (strstr(output, "unrecognised disk label"))
+ if (strstr(output, "unrecognised disk label") ||
+ strstr(error, "unrecognised disk label")) {
ret = 1;
+ }
}
virCommandFree(cmd);
VIR_FREE(output);
+ VIR_FREE(error);
return ret;
}
--
1.8.3.1