Message ID | 1549305379-51117-30-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MWxY8nVG"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43tcFg3SFbz9s4V for <incoming@patchwork.ozlabs.org>; Tue, 5 Feb 2019 05:49:43 +1100 (AEDT) Received: from localhost ([127.0.0.1]:47434 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1gqjJN-0006e7-FK for incoming@patchwork.ozlabs.org; Mon, 04 Feb 2019 13:49:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gqj6z-0005BL-BF for qemu-devel@nongnu.org; Mon, 04 Feb 2019 13:36:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gqj6x-0003cg-RI for qemu-devel@nongnu.org; Mon, 04 Feb 2019 13:36:53 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:33134) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gqj6x-0003bu-HE for qemu-devel@nongnu.org; Mon, 04 Feb 2019 13:36:51 -0500 Received: by mail-wr1-x435.google.com with SMTP id a16so999616wrv.0 for <qemu-devel@nongnu.org>; Mon, 04 Feb 2019 10:36:51 -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=MWxY8nVGva+EB0pZ4+QzHfRkI7qcgwXWw6pAxS1BA9+zRasYDbZ3nwPhA7XBdy7bTS kQ/JA9vgnSEG+OZvw6bpW1UOKd9ABKS3hCAtlQpXIxVZYsJbpmbY9PgfEtwrNPMSz4Pu ibOGVNPMbYK73bHgrAsJQQMOYsTECLYba80uTExy2FRyiJSk3S4d7n4zjQ8KTIdf62yv k+jHbaggMbV3CmiaAXykgZN8QNhrO1jM4NzbXYOXQxEIxJ0qheLD7FBj2YUrrkPbeVXz LMWdEbPLk23Fc5shyUdhjRHAyJVQ7Tcq5YxGOW1Aoo7bSmWF76DiN1qT1DPyihkef5wp HMdw== 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=S/mVYL5x+Wy5LU66tdS4NARkJ+CJf2/H+lQ7dZq+Jw9kKj49rnB1PX+hXWh3K+CRMB 1s2j8y+7OjuyxwViMa8UjAU6k6u2zPwis5EJYlvINyvbfO5GXAE+OexkVZwU500tgTpg zkjmGMDbq9J00v6IMpPjq31kg6Ihf6Zv02YNUu2HZkfWXN5TyoC5OeqzY/61b9TwNI0Y bQmYuNhPzZM0O07SpcGGwsOjYemfuVJng3E/dltTG/RfK3mX1TwSUKNuIggVsqKR0zpH XgWzENCaFXKe4Sd0fHFBBQiVZb23A4eoWx0FmPRI2KyzzaoXTfxDMysHO8wMCOy/wcH1 FSTw== X-Gm-Message-State: AHQUAuY6JMP54aE/lCf5jaXgz5EutesFGQSX472Yocb6zv/B9MIibbmG iE+/x27SS5Du7oV8bGWVHTnLKltO X-Google-Smtp-Source: AHgI3IY7vODwPiDlu7DIK4K9qwWYwRGqJULEOmph/op3BoHw8Cy0GsvkNatlhLnTn1MHwCoGsC3jxg== X-Received: by 2002:a5d:6684:: with SMTP id l4mr641049wru.154.1549305410184; 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.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Feb 2019 10:36:49 -0800 (PST) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Mon, 4 Feb 2019 19:35:31 +0100 Message-Id: <1549305379-51117-30-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::435 Subject: [Qemu-devel] [PULL 29/77] contrib/elf2dmp: use GLib in PDB processing X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Viktor Prutyanov <viktor.prutyanov@phystech.edu> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/77] vhost-user-test: use g_cond_broadcast
|
expand
|
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) int pdb_init_from_file(const char *name, struct pdb_reader *reader) { + GError *gerr = NULL; int err = 0; - int fd; void *map; - struct stat st; - fd = open(name, O_RDONLY, 0); - if (fd == -1) { - eprintf("Failed to open PDB file \'%s\'\n", name); + reader->gmf = g_mapped_file_new(name, TRUE, &gerr); + if (gerr) { + eprintf("Failed to map PDB file \'%s\'\n", name); return 1; } - reader->fd = fd; - - fstat(fd, &st); - reader->file_size = st.st_size; - - map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); - if (map == MAP_FAILED) { - eprintf("Failed to map PDB file\n"); - err = 1; - goto out_fd; - } + reader->file_size = g_mapped_file_get_length(reader->gmf); + map = g_mapped_file_get_contents(reader->gmf); if (pdb_reader_init(reader, map)) { err = 1; goto out_unmap; @@ -307,16 +297,13 @@ int pdb_init_from_file(const char *name, struct pdb_reader *reader) return 0; out_unmap: - munmap(map, st.st_size); -out_fd: - close(fd); + g_mapped_file_unref(reader->gmf); return err; } 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 struct pdb_reader { - int fd; + GMappedFile *gmf; size_t file_size; struct { PDB_DS_HEADER *header;