From nobody Tue Feb 10 02:43:22 2026 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549306440001969.9918326271335; Mon, 4 Feb 2019 10:54:00 -0800 (PST) Received: from localhost ([127.0.0.1]:47500 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqjNR-0001zx-Qj for importer@patchew.org; Mon, 04 Feb 2019 13:53:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59501) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqj6y-0005A7-Iv for qemu-devel@nongnu.org; Mon, 04 Feb 2019 13:36:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqj6w-0003by-SI for qemu-devel@nongnu.org; Mon, 04 Feb 2019 13:36:52 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:44242) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gqj6w-0003bC-Ku for qemu-devel@nongnu.org; Mon, 04 Feb 2019 13:36:50 -0500 Received: by mail-wr1-x42a.google.com with SMTP id z5so914559wrt.11 for ; Mon, 04 Feb 2019 10:36:50 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id s132sm8836236wmf.28.2019.02.04.10.36.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Feb 2019 10:36:48 -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=T3S7IgJ5gG/eQcgFPnGvoZYuIIO6X1V5J4tpA4VD79MHUaQOPjb+6bwCIu4oassV85 I4uCNhNJCUeta0Ufsn0sZHlNmBtnd5+AcBOaD7L0uAhkX1wTJrNuJ2LMo8mBSv2DTtOx 2xuE6fvEmA4jsY1nW68je7MkdvoTkFteGPpQkWGx+2xyWnQuzCidhpBhe9f6+JBc2A2L VoIbm8FRHsLVV3b/DIMBGG3ZhxrnUIBo57StgvS+x7EJCMIazOgGmpEgi8X/CYzQq4lM ecUPtz/LSVRUG9mBF1Yc6koy3+TzIQs6WQyMI+kVbsejjhK7yP0nmTk6HIatIYpSc1U9 8knQ== 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=MlVKi1MJtQdvYZgvPUDNlEihDsEjE0n8lPctz+dLP6gXqJ1r0JJpToXPYJLmtjnH3Z +8Mkw+MW0kFHikwWAzX69Iz5tN6nmxO9z0+9w0qFaCkAyRoCPWL8T4YoCWGgeU38cEXu zH+zqGGo9eP8F7oP+2UQkti66jNLum/bT+bm+J/rPW7dVc4ra/XdH3X5/Lj1YSBfXskB lApSRah7X1C+HNlz5ZVyHvwgFlODaFAXAu5SehiiKwB9qB4UdWhJ5ORs85tyEwoYaGrj f5SloHsFZ21BS+Rkq7N40aQ2UTy3V78NMxdUnbVuyGwJbNROPWOP5B+dlQVRq7jExAnz D9aw== X-Gm-Message-State: AHQUAuaSDF7E5MaqlQ+BY2KFaqwcbERNY5lg3et7cQhy/fNZx7K84gJe cAZjIDJy5JyIYjdIaHfEonjnL89C X-Google-Smtp-Source: AHgI3IYJmwYtpodmr1VL6gvxf4qdotrh2MthkMwoD27mtkAYSSREwweNvixxFGBy4BBa4GXmjN6TYQ== X-Received: by 2002:a5d:4c8a:: with SMTP id z10mr545486wrs.75.1549305409224; Mon, 04 Feb 2019 10:36:49 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Feb 2019 19:35:30 +0100 Message-Id: <1549305379-51117-29-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549305379-51117-1-git-send-email-pbonzini@redhat.com> References: <1549305379-51117-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 28/77] 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