ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dump/win_dump: Improve error messages on write error 

create_win_dump() and write_run report qemu_write_full() failure to
their callers as

    An IO error has occurred

The errno set by qemu_write_full() is lost.

Improve this to

    win-dump: failed to write header: <description of errno>

and

    win-dump: failed to save memory: <description of errno>

This matches how dump.c reports similar errors.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240513141703.549874-3-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Markus Armbruster 2024-05-13 16:16:59 +02:00
parent 540d91b40c
commit 21c06f5780
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dump/win_dump.c
View File

@ -12,7 +12,6 @@
#include "sysemu/dump.h" #include "sysemu/dump.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qapi/qmp/qerror.h"
#include "exec/cpu-defs.h" #include "exec/cpu-defs.h"
#include "hw/core/cpu.h" #include "hw/core/cpu.h"
#include "qemu/win_dump_defs.h" #include "qemu/win_dump_defs.h"
@ -52,6 +51,7 @@ static size_t write_run(uint64_t base_page, uint64_t page_count,
uint64_t addr = base_page << TARGET_PAGE_BITS; uint64_t addr = base_page << TARGET_PAGE_BITS;
uint64_t size = page_count << TARGET_PAGE_BITS; uint64_t size = page_count << TARGET_PAGE_BITS;
uint64_t len, l; uint64_t len, l;
int eno;
size_t total = 0; size_t total = 0;
while (size) { while (size) {
@ -65,9 +65,10 @@ static size_t write_run(uint64_t base_page, uint64_t page_count,
} }
l = qemu_write_full(fd, buf, len); l = qemu_write_full(fd, buf, len);
eno = errno;
cpu_physical_memory_unmap(buf, addr, false, len); cpu_physical_memory_unmap(buf, addr, false, len);
if (l != len) { if (l != len) {
error_setg(errp, QERR_IO_ERROR); error_setg_errno(errp, eno, "win-dump: failed to save memory");
return 0; return 0;
} }
@ -459,7 +460,7 @@ void create_win_dump(DumpState *s, Error **errp)
s->written_size = qemu_write_full(s->fd, h, hdr_size); s->written_size = qemu_write_full(s->fd, h, hdr_size);
if (s->written_size != hdr_size) { if (s->written_size != hdr_size) {
error_setg(errp, QERR_IO_ERROR); error_setg_errno(errp, errno, "win-dump: failed to write header");
goto out_restore; goto out_restore;
} }