From nobody Thu Nov 6 18:12:52 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542288435498246.3974247731618; Thu, 15 Nov 2018 05:27:15 -0800 (PST) Received: from localhost ([::1]:38815 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNHfu-00065m-98 for importer@patchew.org; Thu, 15 Nov 2018 08:27:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41706) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNHbb-0002vi-P7 for qemu-devel@nongnu.org; Thu, 15 Nov 2018 08:22:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gNHbZ-0006v0-Rq for qemu-devel@nongnu.org; Thu, 15 Nov 2018 08:22:47 -0500 Received: from zucker2.schokokeks.org ([178.63.68.90]:34357) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gNHbX-0006tx-Ul for qemu-devel@nongnu.org; Thu, 15 Nov 2018 08:22:45 -0500 Received: from blood-stain-child.lan.ruderich.org (localhost [::1]) (AUTH: PLAIN simon@ruderich.org, TLS: TLSv1/SSLv3, 128bits, ECDHE-RSA-AES128-GCM-SHA256) by zucker.schokokeks.org with ESMTPSA; Thu, 15 Nov 2018 14:22:41 +0100 id 00000000000000F7.000000005BED7321.00004463 From: Simon Ruderich To: qemu-devel@nongnu.org Date: Thu, 15 Nov 2018 14:22:35 +0100 Message-Id: <292e35d1375b7bb87a641a8158a0e6e033070894.1542287931.git.simon@ruderich.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: References: <0e59c79ddc01e195ddc59d77d9df2b95bf89b600.1523395243.git.simon@ruderich.org> Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mime-Autoconverted: from 8bit to 7bit by courier 0.75 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 178.63.68.90 Subject: [Qemu-devel] [PATCH v7 2/7] cpus: convert qmp_memsave/qmp_pmemsave to use qemu_open X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Simon Ruderich , David Alan Gilbert , Markus Armbruster , Peter Crosthwaite , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" qemu_open() allow passing file descriptors to qemu which is used in restricted environments like libvirt where open() is prohibited. Suggested-by: Eric Blake Signed-off-by: Simon Ruderich Reviewed-by: Eric Blake --- cpus.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/cpus.c b/cpus.c index e67efbb58b..c0d796f441 100644 --- a/cpus.c +++ b/cpus.c @@ -2369,7 +2369,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]; @@ -2386,8 +2386,8 @@ void qmp_memsave(int64_t addr, int64_t size, const ch= ar *filename, return; } =20 - f =3D fopen(filename, "wb"); - if (!f) { + fd =3D qemu_open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 06= 00); + if (fd < 0) { error_setg_file_open(errp, errno, filename); return; } @@ -2402,7 +2402,7 @@ void qmp_memsave(int64_t addr, int64_t size, const ch= ar *filename, " specified", orig_addr, orig_size); goto exit; } - if (fwrite(buf, 1, l, f) !=3D l) { + if (qemu_write_full(fd, buf, l) !=3D l) { error_setg(errp, QERR_IO_ERROR); goto exit; } @@ -2411,18 +2411,18 @@ void qmp_memsave(int64_t addr, int64_t size, const = char *filename, } =20 exit: - fclose(f); + qemu_close(fd); } =20 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]; =20 - f =3D fopen(filename, "wb"); - if (!f) { + fd =3D qemu_open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 06= 00); + if (fd < 0) { error_setg_file_open(errp, errno, filename); return; } @@ -2433,7 +2433,7 @@ void qmp_pmemsave(int64_t addr, int64_t size, const c= har *filename, l =3D size; } cpu_physical_memory_read(addr, buf, l); - if (fwrite(buf, 1, l, f) !=3D l) { + if (qemu_write_full(fd, buf, l) !=3D l) { error_setg(errp, QERR_IO_ERROR); goto exit; } @@ -2442,7 +2442,7 @@ void qmp_pmemsave(int64_t addr, int64_t size, const c= har *filename, } =20 exit: - fclose(f); + qemu_close(fd); } =20 void qmp_inject_nmi(Error **errp) --=20 2.19.1