mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
Merge tag 'dump-pull-request' of gitlab.com:marcandre.lureau/qemu into staging
dump queue Hi The "dump" queue, with: - [PATCH v3/v4 0/9] dump: Cleanup and consolidation - [PATCH v4 0/4] dump: add 32-bit guest Windows support v2: - fix compiler warning in "dump/win_dump: add 32-bit guest Windows support" # -----BEGIN PGP SIGNATURE----- # # iQJQBAABCAA6FiEEh6m9kz+HxgbSdvYt2ujhCXWWnOUFAmJigBkcHG1hcmNhbmRy # ZS5sdXJlYXVAcmVkaGF0LmNvbQAKCRDa6OEJdZac5T92EACNSdzJTeXmoGV3yzyq # oVQAH9ViuH6nINH04KZvS6gPoFvm6h/0pj2A2n9iy9ULcc0hNNKDtDkiYoIyLWTE # 34ywOpWUNbRNEefifo2wcKqebpyeSS+0Y2fttHzIwVl+t5qFZt7JwXdbmo4Xpf6a # MY4LS7WfmQkXZvg0nkv3nw32vAJK4VvSKhnbSTE1m0AYEkrBTntexDby9XDoDyWL # QPzDemyLi6A9HO/NeB6sdKwwXd4g4mfIKy0WI+T5M1Ped0BpBoKrQpJ/KNYrZuJE # 0IJJFXA8D+tIfYdGD3MAO2X7IHVR6Ld2GV10pPmzLFHt06MFlDua360cFYohB2ua # 2Hk0syqwuEDRZSES5eQPbwu3sXGAZAw3kth32tlGFawTVwXLEw9YTU1ZwHhnwvG0 # Uocu44v2+x0Swtuw2Dw1J5PBLH1ebYdQozpA4U4TibCKzRTjnO6idZIFh/64oA4q # RdpEvrQ1nnJTnIgkllZ9KxAcOZECjREEB33UAxcpKxtJbann6bv/Gz754qqiNVZv # LOMcgZJ7HItChRV+dFQQRgyeX+IrGeq+N4zoLRZehib5+kYi50UKQIPIc9TUgzbw # CwOESkyipmljjx9016pmY8LYipnm0hDVMoxzdKPsdYbagxWC/JFPxvqlB+7xQBud # ez/xPfN8799O+mlwZ7zgXwYaUg== # =QWiq # -----END PGP SIGNATURE----- # gpg: Signature made Fri 22 Apr 2022 03:14:49 AM PDT # gpg: using RSA key 87A9BD933F87C606D276F62DDAE8E10975969CE5 # gpg: issuer "marcandre.lureau@redhat.com" # gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>" [full] # gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>" [full] * tag 'dump-pull-request' of gitlab.com:marcandre.lureau/qemu: dump/win_dump: add 32-bit guest Windows support include/qemu: add 32-bit Windows dump structures dump/win_dump: add helper macros for Windows dump header access include/qemu: rename Windows context definitions to expose bitness dump: Consolidate elf note function dump: Cleanup dump_begin write functions dump: Consolidate phdr note writes dump: Introduce dump_is_64bit() helper function dump: Add more offset variables dump: Remove the section if when calculating the memory offset dump: Introduce shdr_num to decrease complexity dump: Remove the sh_info variable dump: Use ERRP_GUARD() Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson
@@ -141,10 +141,10 @@ static KDDEBUGGER_DATA64 *get_kdbg(uint64_t KernBase, struct pdb_reader *pdb,
|
||||
return kdbg;
|
||||
}
|
||||
|
||||
static void win_context_init_from_qemu_cpu_state(WinContext *ctx,
|
||||
static void win_context_init_from_qemu_cpu_state(WinContext64 *ctx,
|
||||
QEMUCPUState *s)
|
||||
{
|
||||
WinContext win_ctx = (WinContext){
|
||||
WinContext64 win_ctx = (WinContext64){
|
||||
.ContextFlags = WIN_CTX_X64 | WIN_CTX_INT | WIN_CTX_SEG | WIN_CTX_CTL,
|
||||
.MxCsr = INITIAL_MXCSR,
|
||||
|
||||
@@ -302,7 +302,7 @@ static int fill_context(KDDEBUGGER_DATA64 *kdbg,
|
||||
for (i = 0; i < qe->state_nr; i++) {
|
||||
uint64_t Prcb;
|
||||
uint64_t Context;
|
||||
WinContext ctx;
|
||||
WinContext64 ctx;
|
||||
QEMUCPUState *s = qe->state[i];
|
||||
|
||||
if (va_space_rw(vs, kdbg->KiProcessorBlock + sizeof(Prcb) * i,
|
||||
|
||||
+166
-206
File diff suppressed because it is too large
Load Diff
+195
-110
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -1064,7 +1064,7 @@ ERST
|
||||
"-l: dump in kdump-compressed format, with lzo compression.\n\t\t\t"
|
||||
"-s: dump in kdump-compressed format, with snappy compression.\n\t\t\t"
|
||||
"-w: dump in Windows crashdump format (can be used instead of ELF-dump converting),\n\t\t\t"
|
||||
" for Windows x64 guests with vmcoreinfo driver only.\n\t\t\t"
|
||||
" for Windows x86 and x64 guests with vmcoreinfo driver only.\n\t\t\t"
|
||||
"begin: the starting physical address.\n\t\t\t"
|
||||
"length: the memory size, in bytes.",
|
||||
.cmd = hmp_dump_guest_memory,
|
||||
|
||||
@@ -11,11 +11,22 @@
|
||||
#ifndef QEMU_WIN_DUMP_DEFS_H
|
||||
#define QEMU_WIN_DUMP_DEFS_H
|
||||
|
||||
typedef struct WinDumpPhyMemRun32 {
|
||||
uint32_t BasePage;
|
||||
uint32_t PageCount;
|
||||
} QEMU_PACKED WinDumpPhyMemRun32;
|
||||
|
||||
typedef struct WinDumpPhyMemRun64 {
|
||||
uint64_t BasePage;
|
||||
uint64_t PageCount;
|
||||
} QEMU_PACKED WinDumpPhyMemRun64;
|
||||
|
||||
typedef struct WinDumpPhyMemDesc32 {
|
||||
uint32_t NumberOfRuns;
|
||||
uint32_t NumberOfPages;
|
||||
WinDumpPhyMemRun32 Run[86];
|
||||
} QEMU_PACKED WinDumpPhyMemDesc32;
|
||||
|
||||
typedef struct WinDumpPhyMemDesc64 {
|
||||
uint32_t NumberOfRuns;
|
||||
uint32_t unused;
|
||||
@@ -33,6 +44,39 @@ typedef struct WinDumpExceptionRecord {
|
||||
uint64_t ExceptionInformation[15];
|
||||
} QEMU_PACKED WinDumpExceptionRecord;
|
||||
|
||||
typedef struct WinDumpHeader32 {
|
||||
char Signature[4];
|
||||
char ValidDump[4];
|
||||
uint32_t MajorVersion;
|
||||
uint32_t MinorVersion;
|
||||
uint32_t DirectoryTableBase;
|
||||
uint32_t PfnDatabase;
|
||||
uint32_t PsLoadedModuleList;
|
||||
uint32_t PsActiveProcessHead;
|
||||
uint32_t MachineImageType;
|
||||
uint32_t NumberProcessors;
|
||||
union {
|
||||
struct {
|
||||
uint32_t BugcheckCode;
|
||||
uint32_t BugcheckParameter1;
|
||||
uint32_t BugcheckParameter2;
|
||||
uint32_t BugcheckParameter3;
|
||||
uint32_t BugcheckParameter4;
|
||||
};
|
||||
uint8_t BugcheckData[20];
|
||||
};
|
||||
uint8_t VersionUser[32];
|
||||
uint32_t reserved0;
|
||||
uint32_t KdDebuggerDataBlock;
|
||||
union {
|
||||
WinDumpPhyMemDesc32 PhysicalMemoryBlock;
|
||||
uint8_t PhysicalMemoryBlockBuffer[700];
|
||||
};
|
||||
uint8_t reserved1[3200];
|
||||
uint32_t RequiredDumpSpace;
|
||||
uint8_t reserved2[92];
|
||||
} QEMU_PACKED WinDumpHeader32;
|
||||
|
||||
typedef struct WinDumpHeader64 {
|
||||
char Signature[4];
|
||||
char ValidDump[4];
|
||||
@@ -81,24 +125,48 @@ typedef struct WinDumpHeader64 {
|
||||
uint8_t reserved[4018];
|
||||
} QEMU_PACKED WinDumpHeader64;
|
||||
|
||||
typedef union WinDumpHeader {
|
||||
struct {
|
||||
char Signature[4];
|
||||
char ValidDump[4];
|
||||
};
|
||||
WinDumpHeader32 x32;
|
||||
WinDumpHeader64 x64;
|
||||
} WinDumpHeader;
|
||||
|
||||
#define KDBG_OWNER_TAG_OFFSET64 0x10
|
||||
#define KDBG_MM_PFN_DATABASE_OFFSET64 0xC0
|
||||
#define KDBG_KI_BUGCHECK_DATA_OFFSET64 0x88
|
||||
#define KDBG_KI_PROCESSOR_BLOCK_OFFSET64 0x218
|
||||
#define KDBG_OFFSET_PRCB_CONTEXT_OFFSET64 0x338
|
||||
|
||||
#define KDBG_OWNER_TAG_OFFSET KDBG_OWNER_TAG_OFFSET64
|
||||
#define KDBG_MM_PFN_DATABASE_OFFSET KDBG_MM_PFN_DATABASE_OFFSET64
|
||||
#define KDBG_KI_BUGCHECK_DATA_OFFSET KDBG_KI_BUGCHECK_DATA_OFFSET64
|
||||
#define KDBG_KI_PROCESSOR_BLOCK_OFFSET KDBG_KI_PROCESSOR_BLOCK_OFFSET64
|
||||
#define KDBG_OFFSET_PRCB_CONTEXT_OFFSET KDBG_OFFSET_PRCB_CONTEXT_OFFSET64
|
||||
|
||||
#define VMCOREINFO_ELF_NOTE_HDR_SIZE 24
|
||||
#define VMCOREINFO_WIN_DUMP_NOTE_SIZE64 (sizeof(WinDumpHeader64) + \
|
||||
VMCOREINFO_ELF_NOTE_HDR_SIZE)
|
||||
#define VMCOREINFO_WIN_DUMP_NOTE_SIZE32 (sizeof(WinDumpHeader32) + \
|
||||
VMCOREINFO_ELF_NOTE_HDR_SIZE)
|
||||
|
||||
#define WIN_CTX_X64 0x00100000L
|
||||
#define WIN_CTX_X86 0x00010000L
|
||||
|
||||
#define WIN_CTX_CTL 0x00000001L
|
||||
#define WIN_CTX_INT 0x00000002L
|
||||
#define WIN_CTX_SEG 0x00000004L
|
||||
#define WIN_CTX_FP 0x00000008L
|
||||
#define WIN_CTX_DBG 0x00000010L
|
||||
#define WIN_CTX_EXT 0x00000020L
|
||||
|
||||
#define WIN_CTX_FULL (WIN_CTX_X64 | WIN_CTX_CTL | WIN_CTX_INT | WIN_CTX_FP)
|
||||
#define WIN_CTX_ALL (WIN_CTX_FULL | WIN_CTX_SEG | WIN_CTX_DBG)
|
||||
#define WIN_CTX64_FULL (WIN_CTX_X64 | WIN_CTX_CTL | WIN_CTX_INT | WIN_CTX_FP)
|
||||
#define WIN_CTX64_ALL (WIN_CTX64_FULL | WIN_CTX_SEG | WIN_CTX_DBG)
|
||||
|
||||
#define WIN_CTX32_FULL (WIN_CTX_X86 | WIN_CTX_CTL | WIN_CTX_INT | WIN_CTX_SEG)
|
||||
#define WIN_CTX32_ALL (WIN_CTX32_FULL | WIN_CTX_FP | WIN_CTX_DBG | WIN_CTX_EXT)
|
||||
|
||||
#define LIVE_SYSTEM_DUMP 0x00000161
|
||||
|
||||
@@ -107,7 +175,41 @@ typedef struct WinM128A {
|
||||
int64_t high;
|
||||
} QEMU_ALIGNED(16) WinM128A;
|
||||
|
||||
typedef struct WinContext {
|
||||
typedef struct WinContext32 {
|
||||
uint32_t ContextFlags;
|
||||
|
||||
uint32_t Dr0;
|
||||
uint32_t Dr1;
|
||||
uint32_t Dr2;
|
||||
uint32_t Dr3;
|
||||
uint32_t Dr6;
|
||||
uint32_t Dr7;
|
||||
|
||||
uint8_t FloatSave[112];
|
||||
|
||||
uint32_t SegGs;
|
||||
uint32_t SegFs;
|
||||
uint32_t SegEs;
|
||||
uint32_t SegDs;
|
||||
|
||||
uint32_t Edi;
|
||||
uint32_t Esi;
|
||||
uint32_t Ebx;
|
||||
uint32_t Edx;
|
||||
uint32_t Ecx;
|
||||
uint32_t Eax;
|
||||
|
||||
uint32_t Ebp;
|
||||
uint32_t Eip;
|
||||
uint32_t SegCs;
|
||||
uint32_t EFlags;
|
||||
uint32_t Esp;
|
||||
uint32_t SegSs;
|
||||
|
||||
uint8_t ExtendedRegisters[512];
|
||||
} QEMU_ALIGNED(16) WinContext32;
|
||||
|
||||
typedef struct WinContext64 {
|
||||
uint64_t PHome[6];
|
||||
|
||||
uint32_t ContextFlags;
|
||||
@@ -174,6 +276,11 @@ typedef struct WinContext {
|
||||
uint64_t LastBranchFromRip;
|
||||
uint64_t LastExceptionToRip;
|
||||
uint64_t LastExceptionFromRip;
|
||||
} QEMU_ALIGNED(16) WinContext;
|
||||
} QEMU_ALIGNED(16) WinContext64;
|
||||
|
||||
typedef union WinContext {
|
||||
WinContext32 x32;
|
||||
WinContext64 x64;
|
||||
} WinContext;
|
||||
|
||||
#endif /* QEMU_WIN_DUMP_DEFS_H */
|
||||
|
||||
@@ -154,12 +154,15 @@ typedef struct DumpState {
|
||||
GuestPhysBlockList guest_phys_blocks;
|
||||
ArchDumpInfo dump_info;
|
||||
MemoryMappingList list;
|
||||
uint16_t phdr_num;
|
||||
uint32_t sh_info;
|
||||
bool have_section;
|
||||
uint32_t phdr_num;
|
||||
uint32_t shdr_num;
|
||||
bool resume;
|
||||
bool detached;
|
||||
ssize_t note_size;
|
||||
hwaddr shdr_offset;
|
||||
hwaddr phdr_offset;
|
||||
hwaddr section_offset;
|
||||
hwaddr note_offset;
|
||||
hwaddr memory_offset;
|
||||
int fd;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user