From nobody Fri Nov 7 14:33:35 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548095965471727.9369099909296; Mon, 21 Jan 2019 10:39:25 -0800 (PST) Received: from localhost ([127.0.0.1]:57824 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gleTk-0006kj-C3 for importer@patchew.org; Mon, 21 Jan 2019 13:39:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51982) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gldyP-0004cz-I5 for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:07:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gldyO-0004UF-PW for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:07:01 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:36524) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gldyO-0004Te-Ip for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:07:00 -0500 Received: by mail-wr1-x42a.google.com with SMTP id u4so24489209wrp.3 for ; Mon, 21 Jan 2019 10:07:00 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id 133sm56197732wme.9.2019.01.21.10.06.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jan 2019 10:06:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=UXyS4oytJv/8m9wGAlfBZOKtbRXet6YcGon6c7w/awI=; b=kCLway+tD+5ReEGu6+wBAiEjl7Gg/j9yu9pzeJz3CsborKySTCFnj7eOZQVCs7IW/u 9ExjH9SjK2hUkaI0gmMsAHx3kS6UgmITwa7UbD92/gn5CXvJSugOyQ4sz4+BSkHyFikq uFqnua9Bg2ckx5mHMl4zKxMOIZBmC9zl7pDWMFyMZq14rYQDBuGOdAURjDXv0W9eH9aV 7z4DILvbhSl+RDljm0DnnwWrb8ZTVjA3DHDOluTfns58rYKIJ67J2FSVSCXQwozCAlca g0MAbssbiZnwnDC/Ygta7juMPB3rETtohmhRCtfgPGF3awbtE95z35q7e0ZyIVpixUPe a/bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=UXyS4oytJv/8m9wGAlfBZOKtbRXet6YcGon6c7w/awI=; b=S9CBkrqwOJ3TPoMrFVeFbIbFneMQ1QHzwPzQRA1+UogwKTnWB1r8eaSKLdLz8D/7fw knS4D6WfCDSs1BdDqCuTMreDPV7CxfYK6JFH8KpJk9ddlO8e6CiS1M3aM67nKBsF0Mvu ceZXT148FEqYa9/IxNuQW8mePsXMlicOGVULq4+yN6Vvjo3cNyzq/Xh4XTb200jAEj68 qx6aqkKpLIiywshQXTKkW+YngHOUDmbIxd0F0rttYJXzfUrEo46KxuUP7gO9Du12P14P iHQvCkYSgCJyNOsGebkqlIX1e3m3kM4qKi7PdG4lhk9HGoK7sFql8F0F/YYsATsWXu/n 8y+A== X-Gm-Message-State: AJcUukcvdxJWJJJDfmXP5F/v+5JKrp/UAWPwnoP69qdr0qo0QCz1O7M/ GWxOUV+xmutoxl7y/C/4ulZ7OauJ X-Google-Smtp-Source: ALg8bN4XNb5LKQwZOeMzu/410BowovS+/t3F05VPsBdh2ducqlKsnuI4yDtEHFKnC9wtlGpBJRCE/w== X-Received: by 2002:adf:c612:: with SMTP id n18mr28256978wrg.174.1548094019380; Mon, 21 Jan 2019 10:06:59 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 21 Jan 2019 19:06:08 +0100 Message-Id: <1548093980-43088-38-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548093980-43088-1-git-send-email-pbonzini@redhat.com> References: <1548093980-43088-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a Subject: [Qemu-devel] [PULL 37/49] contrib/elf2dmp: use GLib in ELF processing 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: Viktor Prutyanov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Viktor Prutyanov Replace POSIX mmap with GLib g_mapped_file_new in ELF processing module to make elf2dmp cross-platform. Signed-off-by: Viktor Prutyanov Message-Id: <20181220012441.13694-3-viktor.prutyanov@phystech.edu> Signed-off-by: Paolo Bonzini --- contrib/elf2dmp/qemu_elf.c | 27 ++++++++------------------- contrib/elf2dmp/qemu_elf.h | 2 +- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/contrib/elf2dmp/qemu_elf.c b/contrib/elf2dmp/qemu_elf.c index e9c0d25..0db7816 100644 --- a/contrib/elf2dmp/qemu_elf.c +++ b/contrib/elf2dmp/qemu_elf.c @@ -120,25 +120,17 @@ static void exit_states(QEMU_Elf *qe) =20 int QEMU_Elf_init(QEMU_Elf *qe, const char *filename) { + GError *gerr =3D NULL; int err =3D 0; - struct stat st; =20 - qe->fd =3D open(filename, O_RDONLY, 0); - if (qe->fd =3D=3D -1) { - eprintf("Failed to open ELF dump file \'%s\'\n", filename); + qe->gmf =3D g_mapped_file_new(filename, TRUE, &gerr); + if (gerr) { + eprintf("Failed to map ELF dump file \'%s\'\n", filename); return 1; } =20 - fstat(qe->fd, &st); - qe->size =3D st.st_size; - - qe->map =3D mmap(NULL, qe->size, PROT_READ | PROT_WRITE, - MAP_PRIVATE, qe->fd, 0); - if (qe->map =3D=3D MAP_FAILED) { - eprintf("Failed to map ELF file\n"); - err =3D 1; - goto out_fd; - } + qe->map =3D g_mapped_file_get_contents(qe->gmf); + qe->size =3D g_mapped_file_get_length(qe->gmf); =20 if (init_states(qe)) { eprintf("Failed to extract QEMU CPU states\n"); @@ -149,9 +141,7 @@ int QEMU_Elf_init(QEMU_Elf *qe, const char *filename) return 0; =20 out_unmap: - munmap(qe->map, qe->size); -out_fd: - close(qe->fd); + g_mapped_file_unref(qe->gmf); =20 return err; } @@ -159,6 +149,5 @@ out_fd: void QEMU_Elf_exit(QEMU_Elf *qe) { exit_states(qe); - munmap(qe->map, qe->size); - close(qe->fd); + g_mapped_file_unref(qe->gmf); } diff --git a/contrib/elf2dmp/qemu_elf.h b/contrib/elf2dmp/qemu_elf.h index da70aff..2a79638 100644 --- a/contrib/elf2dmp/qemu_elf.h +++ b/contrib/elf2dmp/qemu_elf.h @@ -33,7 +33,7 @@ typedef struct QEMUCPUState { int is_system(QEMUCPUState *s); =20 typedef struct QEMU_Elf { - int fd; + GMappedFile *gmf; size_t size; void *map; QEMUCPUState **state; --=20 1.8.3.1