qemu_open() allow passing file descriptors to qemu which is used in restricted environments like libvirt where open() is prohibited.
Suggested-by: Eric Blake <ebl...@redhat.com> Signed-off-by: Simon Ruderich <si...@ruderich.org> --- cpus.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/cpus.c b/cpus.c index 125adc4da4..dd8ba36d2f 100644 --- a/cpus.c +++ b/cpus.c @@ -2293,7 +2293,7 @@ CpuInfoFastList *qmp_query_cpus_fast(Error **errp) void qmp_memsave(int64_t addr, int64_t size, const char *filename, bool has_cpu, int64_t cpu_index, Error **errp) { - FILE *f; + int fd; uint32_t l; CPUState *cpu; uint8_t buf[1024]; @@ -2310,8 +2310,8 @@ void qmp_memsave(int64_t addr, int64_t size, const char *filename, return; } - f = fopen(filename, "wb"); - if (!f) { + fd = qemu_open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0600); + if (fd < 0) { error_setg_file_open(errp, errno, filename); return; } @@ -2326,7 +2326,7 @@ void qmp_memsave(int64_t addr, int64_t size, const char *filename, " specified", orig_addr, orig_size); goto exit; } - if (fwrite(buf, 1, l, f) != l) { + if (qemu_write_full(fd, buf, l) != l) { error_setg(errp, QERR_IO_ERROR); goto exit; } @@ -2335,18 +2335,18 @@ void qmp_memsave(int64_t addr, int64_t size, const char *filename, } exit: - fclose(f); + qemu_close(fd); } void qmp_pmemsave(int64_t addr, int64_t size, const char *filename, Error **errp) { - FILE *f; + int fd; uint32_t l; uint8_t buf[1024]; - f = fopen(filename, "wb"); - if (!f) { + fd = qemu_open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0600); + if (fd < 0) { error_setg_file_open(errp, errno, filename); return; } @@ -2357,7 +2357,7 @@ void qmp_pmemsave(int64_t addr, int64_t size, const char *filename, l = size; } cpu_physical_memory_read(addr, buf, l); - if (fwrite(buf, 1, l, f) != l) { + if (qemu_write_full(fd, buf, l) != l) { error_setg(errp, QERR_IO_ERROR); goto exit; } @@ -2366,7 +2366,7 @@ void qmp_pmemsave(int64_t addr, int64_t size, const char *filename, } exit: - fclose(f); + qemu_close(fd); } void qmp_inject_nmi(Error **errp) -- 2.17.1