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 1548096122696365.1563625110473; Mon, 21 Jan 2019 10:42:02 -0800 (PST) Received: from localhost ([127.0.0.1]:57886 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gleWH-0000qh-JU for importer@patchew.org; Mon, 21 Jan 2019 13:42:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gldyR-0004fE-DU for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:07:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gldyQ-0004XR-Lj for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:07:03 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:52609) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gldyQ-0004Wl-El for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:07:02 -0500 Received: by mail-wm1-x341.google.com with SMTP id m1so11726200wml.2 for ; Mon, 21 Jan 2019 10:07:02 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id 133sm56197732wme.9.2019.01.21.10.07.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jan 2019 10:07:00 -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=ZCAjxndc1SI1yasRKgzJAMBm7PQddIm2dg2oDVwxfD0=; b=j4i4pgwGx7sOF3BD84Yyf2qlmUjapJBqAaIad2LTmtyZOVPxUx8FqqOjkPQR16NuWa rpOueDdP3U3AY7KlDkF/qApYo6NFz0cB+zxkFLgSc2ww0beA9JleCquzvgeZgfWCDV7I WfqzQoLbqK1r4hHRlugPsZQhAvcxvAynP5FOy43japNf05xwB+YN2KPULhuL08VApP2+ m5XuoiF6lCkaEZWGlKZmXM0f0N7+wNjxwQ+smMTl5VElj3e5MHq6eREGXreBT7ivTlGO Na02BZgeQZUuYGndldz/Xog5t5rxQDbbG17It6wCOmg0usBMeuALD6PcsZPQSH1Bq1Lt awjw== 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=ZCAjxndc1SI1yasRKgzJAMBm7PQddIm2dg2oDVwxfD0=; b=XT9mMH5SBwLxTi7GnaJiUrtHBAEX7rPPJjEpgH3qmMyYcAt3+xY3Qd366yUpMUbOHp 5k8FrKyCOe58EvYBB2caNkMLvoYI5cMgCQS0qtww9kibCM28y7kQVGvGp1v4E0OoyerP CBvkrArhZv/uSx+iwZVcFXz7bs/TN5RuklMXC9vEW6h8BWwLk5ggwJ9ZhifMzoEmse/f 9YKDSd42+ozMxd9ZPDyChyJbFZzeWGv88sJbfbfhHRlOaZOIWUJMVFDKkD6QoYkCj0YD yr7ko1dRHD/zoAuMREnIbYc1ElfjPBaKso8Z2rvZujGGvMl9zhKyilbuAD6813Oqa1LL NBkQ== X-Gm-Message-State: AJcUukeNFeqcmPvRfh/CGH10qDj+nO3WBOoOsqRkm0HNXFnwHK6XnDqs 0Y24OXVMtXSw9QxfIsReGx41jKwI X-Google-Smtp-Source: ALg8bN4NrRioCzsXQ6gaKGymBH/MT751qn52/9poxj2TW/hF5/eL6b7qWxsd0ZiyzcAkwPeZsBaabA== X-Received: by 2002:a1c:9855:: with SMTP id a82mr432781wme.20.1548094021218; Mon, 21 Jan 2019 10:07:01 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 21 Jan 2019 19:06:10 +0100 Message-Id: <1548093980-43088-40-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::341 Subject: [Qemu-devel] [PULL 39/49] contrib/elf2dmp: fix structures definitions 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 Remove duplicate structures definitions in case of build for Windows hosts. Signed-off-by: Viktor Prutyanov Message-Id: <20181220012441.13694-5-viktor.prutyanov@phystech.edu> Signed-off-by: Paolo Bonzini --- contrib/elf2dmp/kdbg.h | 12 ++++++++---- contrib/elf2dmp/pdb.h | 2 ++ contrib/elf2dmp/pe.h | 6 ++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/contrib/elf2dmp/kdbg.h b/contrib/elf2dmp/kdbg.h index 851b57c..002e3d0 100644 --- a/contrib/elf2dmp/kdbg.h +++ b/contrib/elf2dmp/kdbg.h @@ -25,11 +25,15 @@ typedef struct DBGKD_GET_VERSION64 { uint64_t DebuggerDataList; } DBGKD_GET_VERSION64; =20 +#ifndef _WIN32 +typedef struct LIST_ENTRY64 { + struct LIST_ENTRY64 *Flink; + struct LIST_ENTRY64 *Blink; +} LIST_ENTRY64; +#endif + typedef struct DBGKD_DEBUG_DATA_HEADER64 { - struct LIST_ENTRY64 { - struct LIST_ENTRY64 *Flink; - struct LIST_ENTRY64 *Blink; - } List; + LIST_ENTRY64 List; uint32_t OwnerTag; uint32_t Size; } DBGKD_DEBUG_DATA_HEADER64; diff --git a/contrib/elf2dmp/pdb.h b/contrib/elf2dmp/pdb.h index 1640d54..4ea8925 100644 --- a/contrib/elf2dmp/pdb.h +++ b/contrib/elf2dmp/pdb.h @@ -9,12 +9,14 @@ #define PDB_H =20 =20 +#ifndef _WIN32 typedef struct GUID { unsigned int Data1; unsigned short Data2; unsigned short Data3; unsigned char Data4[8]; } GUID; +#endif =20 struct PDB_FILE { uint32_t size; diff --git a/contrib/elf2dmp/pe.h b/contrib/elf2dmp/pe.h index dafb26a..c2a4a6b 100644 --- a/contrib/elf2dmp/pe.h +++ b/contrib/elf2dmp/pe.h @@ -9,6 +9,7 @@ #define PE_H =20 =20 +#ifndef _WIN32 typedef struct IMAGE_DOS_HEADER { uint16_t e_magic; /* 0x00: MZ Header signature */ uint16_t e_cblp; /* 0x02: Bytes on last page of file */ @@ -87,8 +88,6 @@ typedef struct IMAGE_NT_HEADERS64 { IMAGE_OPTIONAL_HEADER64 OptionalHeader; } __attribute__ ((packed)) IMAGE_NT_HEADERS64; =20 -#define IMAGE_FILE_DEBUG_DIRECTORY 6 - typedef struct IMAGE_DEBUG_DIRECTORY { uint32_t Characteristics; uint32_t TimeDateStamp; @@ -101,6 +100,9 @@ typedef struct IMAGE_DEBUG_DIRECTORY { } __attribute__ ((packed)) IMAGE_DEBUG_DIRECTORY; =20 #define IMAGE_DEBUG_TYPE_CODEVIEW 2 +#endif + +#define IMAGE_FILE_DEBUG_DIRECTORY 6 =20 typedef struct guid_t { uint32_t a; --=20 1.8.3.1