[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 30/77] contrib/elf2dmp: fix structures definitions
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 30/77] contrib/elf2dmp: fix structures definitions |
Date: |
Mon, 4 Feb 2019 19:35:32 +0100 |
From: Viktor Prutyanov <address@hidden>
Remove duplicate structures definitions in case of build for Windows hosts.
Signed-off-by: Viktor Prutyanov <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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;
+#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
+#ifndef _WIN32
typedef struct GUID {
unsigned int Data1;
unsigned short Data2;
unsigned short Data3;
unsigned char Data4[8];
} GUID;
+#endif
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
+#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;
-#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;
#define IMAGE_DEBUG_TYPE_CODEVIEW 2
+#endif
+
+#define IMAGE_FILE_DEBUG_DIRECTORY 6
typedef struct guid_t {
uint32_t a;
--
1.8.3.1
- [Qemu-devel] [PULL 09/77] cpu-exec: reset BQL after longjmp in cpu_exec_step_atomic, (continued)
- [Qemu-devel] [PULL 09/77] cpu-exec: reset BQL after longjmp in cpu_exec_step_atomic, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 02/77] vhost-user-test: signal data_cond when s->rings changes, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 17/77] linuxboot_dma: remove duplicate definitions of FW_CFG, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 13/77] elf-ops.h: Add get_elf_note_type(), Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 20/77] hw/i386/pc: use PVH option rom, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 01/77] vhost-user-test: use g_cond_broadcast, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 29/77] contrib/elf2dmp: use GLib in PDB processing, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 16/77] pvh: load initrd and expose it through fw_cfg, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 18/77] linuxboot_dma: move common functions in a new header, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 23/77] i386: remove the new CPUID 'PCONFIG' from Icelake-Server CPU model, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 30/77] contrib/elf2dmp: fix structures definitions,
Paolo Bonzini <=
- [Qemu-devel] [PULL 32/77] configure: enable elf2dmp build for Windows hosts, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 12/77] elf: Add optional function ptr to load_elf() to parse ELF notes, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 24/77] i386: remove the 'INTEL_PT' CPUID bit from named CPU models, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 26/77] target-i386: hvf: remove MPX support, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 22/77] hw/i386/pc: enable PVH only for machine type >= 4.0, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 28/77] contrib/elf2dmp: use GLib in ELF processing, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 19/77] optionrom: add new PVH option rom, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 21/77] optionrom/pvh: load initrd from fw_cfg, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 25/77] Revert "i386: Add CPUID bit for PCONFIG", Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 27/77] contrib/elf2dmp: fix elf.h including, Paolo Bonzini, 2019/02/04