mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/create.c: Capture and raise qemu-img stderr

Browse Source 
https://issues.redhat.com/browse/RHEL-92239

After this, output looks like

   $ ./run guestfish --ro --format=qcow2 -a test.img
   libguestfs: error: qemu-img: qemu-img: /home/crobinso/src/libguestfs/tmp/libguestfsFlxnb0/overlay1.qcow2: Image is not in qcow2 format Could not open backing image. : qemu-img exited with error status 1.
   To see full error messages you may need to enable debugging.
   ...

Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson
2025-05-19 13:42:12 -04:00
committed by rwmjones
parent 406588d4a0
commit 606aa1d182
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/create.c
View File

@@ -241,6 +241,14 @@ is_power_of_2 (unsigned v)
return v && ((v & (v - 1)) == 0);
}
static void
read_all (guestfs_h *g, void *retv, const char *buf, size_t len)
{
char **ret = retv;
*ret = safe_strndup (g, buf, len);
}
/**
* Check for valid backing format. Allow any C<^[[:alnum]]+$>
* (in C locale), but limit the length to something reasonable.
@@ -256,6 +264,7 @@ disk_create_qcow2 (guestfs_h *g, const char *filename, int64_t size,
{
const char *backingformat = NULL;
CLEANUP_FREE char *backingformat_free = NULL;
CLEANUP_FREE char *cmd_stdout = NULL;
const char *preallocation = NULL;
const char *compat = NULL;
int clustersize = -1;
@@ -351,10 +360,16 @@ disk_create_qcow2 (guestfs_h *g, const char *filename, int64_t size,
if (size >= 0)
guestfs_int_cmd_add_arg_format (cmd, "%" PRIi64, size);
guestfs_int_cmd_clear_capture_errors (cmd);
guestfs_int_cmd_set_stderr_to_stdout (cmd);
guestfs_int_cmd_set_stdout_callback (cmd, read_all, &cmd_stdout,
CMD_STDOUT_FLAG_WHOLE_BUFFER);
r = guestfs_int_cmd_run (cmd);
if (!WIFEXITED (r) || WEXITSTATUS (r) != 0) {
guestfs_int_external_command_failed (g, r, "qemu-img", filename);
guestfs_int_external_command_failed (g, r, "qemu-img", cmd_stdout);
return -1;
} else {
debug (g, cmd_stdout);
}
return 0;