From nobody Fri Nov 7 14:42:53 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 1548095585853331.048974686541; Mon, 21 Jan 2019 10:33:05 -0800 (PST) Received: from localhost ([127.0.0.1]:57729 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gleNa-000158-9P for importer@patchew.org; Mon, 21 Jan 2019 13:33:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52003) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gldyQ-0004eR-Jm for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:07:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gldyP-0004Wc-PW for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:07:02 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:37626) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gldyP-0004UW-J5 for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:07:01 -0500 Received: by mail-wr1-x42f.google.com with SMTP id s12so24495418wrt.4 for ; Mon, 21 Jan 2019 10:07:01 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id 133sm56197732wme.9.2019.01.21.10.06.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jan 2019 10:06:59 -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=sqwQPKdocbDxps8MVWl7rxABk3kmzXXc0ngmbIU+9XQ=; b=KrUwoNfs6IJTlqBt39EsJO0f2l89at1mfTr8l4QwFRy1rUsvObavD9xHwUH80OALDX jIxRs2vgnVhxOItrYjPZGGPOvcOFzUK6Mst0LgbrNuhWmhp2wizfjNgtSnD6iWOV3FrM NTMyN0BmbTUGJfaDbWgb9wdDJMuoiro9eI0rjCpvz5nJn5L2NSrRfDMm2H8jHDQiIV91 ePTPgXGuLGsW6MNl6IqtV6koN8I4yAAwTle/J125yMHq99DlOvdUFdj9rv7Uum17wOmM Hw6YSCxCjJOqpHbalNhVc/fSPCtSgU9Vv0JJiZVlBf35bkZXWOed+rkG9wrENN/LaTMb efyA== 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=sqwQPKdocbDxps8MVWl7rxABk3kmzXXc0ngmbIU+9XQ=; b=c5j8cvn48I8qPqq2X3wwWzhtOnB/26sVEYRoNbRxoZlJDJPHqNdXMHAhTxTxPUfUK/ DhXRiPvns1f2AQRClUorfoqZTFRI0JuTFrgpXcJpEO8lL5d0UOrfJKR8YNblmBX4YvSn GzxkBF3IagPYYw1EUN5mg0IK5zsOvdJWY7q3JF33pZhtPhHyDJydjcVsDdDL8r9/t2qM DFKcON6w0iIf5nUQdmcBaBAsfXVf0qf/75qcjDGXFFJOFQL7yH7w9VtnfpZ3UGo0DlmX gMhv3bGai1eC58ESeH7F7ruL4DLLCHTpRKQCIjXG1Be/iSNAJ7rGAK6iIKR1oP2eX8ZD Szlg== X-Gm-Message-State: AJcUuke4SN+qY7FNoD+A4WpUpFCKQYrLJcjVrAh3sKdxYhkCZZrlIiiV emSNDJaCCD5XAk8tqPAK2e/kQUM5 X-Google-Smtp-Source: ALg8bN53QMLxXrhKsvyA53bAmg7JoZebQe5NffgjWX3w8v7Q1XWpN/gsb9RIBHi0GUKm07RtCI/YgA== X-Received: by 2002:a5d:628a:: with SMTP id k10mr28497642wru.254.1548094020298; Mon, 21 Jan 2019 10:07:00 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 21 Jan 2019 19:06:09 +0100 Message-Id: <1548093980-43088-39-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::42f Subject: [Qemu-devel] [PULL 38/49] contrib/elf2dmp: use GLib in PDB 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 PDB processing stage to make elf2dmp cross-platform. There are no direct POSIX in elf2dmp after this patch. Signed-off-by: Viktor Prutyanov Message-Id: <20181220012441.13694-4-viktor.prutyanov@phystech.edu> Signed-off-by: Paolo Bonzini --- contrib/elf2dmp/pdb.c | 29 ++++++++--------------------- contrib/elf2dmp/pdb.h | 2 +- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/contrib/elf2dmp/pdb.c b/contrib/elf2dmp/pdb.c index bcb01b4..52e352d 100644 --- a/contrib/elf2dmp/pdb.c +++ b/contrib/elf2dmp/pdb.c @@ -277,28 +277,18 @@ static void pdb_reader_exit(struct pdb_reader *r) =20 int pdb_init_from_file(const char *name, struct pdb_reader *reader) { + GError *gerr =3D NULL; int err =3D 0; - int fd; void *map; - struct stat st; =20 - fd =3D open(name, O_RDONLY, 0); - if (fd =3D=3D -1) { - eprintf("Failed to open PDB file \'%s\'\n", name); + reader->gmf =3D g_mapped_file_new(name, TRUE, &gerr); + if (gerr) { + eprintf("Failed to map PDB file \'%s\'\n", name); return 1; } - reader->fd =3D fd; - - fstat(fd, &st); - reader->file_size =3D st.st_size; - - map =3D mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); - if (map =3D=3D MAP_FAILED) { - eprintf("Failed to map PDB file\n"); - err =3D 1; - goto out_fd; - } =20 + reader->file_size =3D g_mapped_file_get_length(reader->gmf); + map =3D g_mapped_file_get_contents(reader->gmf); if (pdb_reader_init(reader, map)) { err =3D 1; goto out_unmap; @@ -307,16 +297,13 @@ int pdb_init_from_file(const char *name, struct pdb_r= eader *reader) return 0; =20 out_unmap: - munmap(map, st.st_size); -out_fd: - close(fd); + g_mapped_file_unref(reader->gmf); =20 return err; } =20 void pdb_exit(struct pdb_reader *reader) { - munmap(reader->ds.header, reader->file_size); - close(reader->fd); + g_mapped_file_unref(reader->gmf); pdb_reader_exit(reader); } diff --git a/contrib/elf2dmp/pdb.h b/contrib/elf2dmp/pdb.h index a3a3cac..1640d54 100644 --- a/contrib/elf2dmp/pdb.h +++ b/contrib/elf2dmp/pdb.h @@ -216,7 +216,7 @@ typedef struct pdb_seg { #define IMAGE_FILE_MACHINE_AMD64 0x8664 =20 struct pdb_reader { - int fd; + GMappedFile *gmf; size_t file_size; struct { PDB_DS_HEADER *header; --=20 1.8.3.1