From nobody Mon Feb 9 23:18:06 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 164824277933697.2856611543707; Fri, 25 Mar 2022 14:12:59 -0700 (PDT) Received: from localhost ([::1]:55820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nXrEw-00029w-BQ for importer@patchew.org; Fri, 25 Mar 2022 17:12:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXpzX-0001tj-3N for qemu-devel@nongnu.org; Fri, 25 Mar 2022 15:52:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:58439) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXpzT-0008Ne-JH for qemu-devel@nongnu.org; Fri, 25 Mar 2022 15:52:57 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-349-1f3YNUHRNZSdKpubkHCb3Q-1; Fri, 25 Mar 2022 15:51:46 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 65C479219AE; Fri, 25 Mar 2022 19:51:46 +0000 (UTC) Received: from vp-pc.redhat.com (unknown [10.40.192.98]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B9C557AE0; Fri, 25 Mar 2022 19:51:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648237974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fQ6PA1bUjWPMRW/KjRFjDaqZH2lh9K2wIQn5SMJNnas=; b=UAd5lOK9fjsuEm+IPT0JTy9hGqtC1w7Pansjs8wBktgwh0EXiWha8XYB1ZK+1cGJYdqGf2 nCiRbD83IjxN3yTRUZIQsetvsrR6KZ+QVYXD7WniB4AYNfjyKHjjNxdEoVmrTAr5f/3ljE zmMbC4kwB+t/TZO82thQo8UdvcUHge0= X-MC-Unique: 1f3YNUHRNZSdKpubkHCb3Q-1 From: Viktor Prutyanov To: marcandre.lureau@redhat.com, f4bug@amsat.org Subject: [PATCH v3 4/4] dump/win_dump: add 32-bit guest Windows support Date: Fri, 25 Mar 2022 22:51:30 +0300 Message-Id: <20220325195130.62090-5-viktor.prutyanov@redhat.com> In-Reply-To: <20220325195130.62090-1-viktor.prutyanov@redhat.com> References: <20220325195130.62090-1-viktor.prutyanov@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=viktor.prutyanov@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=viktor.prutyanov@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Fri, 25 Mar 2022 17:08:08 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yan@daynix.com, qemu-devel@nongnu.org, viktor.prutyanov@phystech.edu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648242780461100001 Before this patch, 'dump-guest-memory -w' was accepting only 64-bit dump header provided by guest through vmcoreinfo and thus was unable to produce 32-bit guest Windows dump. So, add 32-bit guest Windows dumping support. Signed-off-by: Viktor Prutyanov Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- dump/win_dump.c | 245 +++++++++++++++++++++++++++++------------------- 1 file changed, 149 insertions(+), 96 deletions(-) diff --git a/dump/win_dump.c b/dump/win_dump.c index df3b432ca5..fda32da036 100644 --- a/dump/win_dump.c +++ b/dump/win_dump.c @@ -24,18 +24,24 @@ #include "hw/misc/vmcoreinfo.h" #include "win_dump.h" =20 -#define WIN_DUMP_PTR_SIZE sizeof(uint64_t) +static size_t win_dump_ptr_size(bool x64) +{ + return x64 ? sizeof(uint64_t) : sizeof(uint32_t); +} =20 -#define _WIN_DUMP_FIELD(f) (h->f) +#define _WIN_DUMP_FIELD(f) (x64 ? h->x64.f : h->x32.f) #define WIN_DUMP_FIELD(field) _WIN_DUMP_FIELD(field) =20 -#define _WIN_DUMP_FIELD_PTR(f) ((void *)&h->f) +#define _WIN_DUMP_FIELD_PTR(f) (x64 ? (void *)&h->x64.f : (void *)&h->x32.= f) #define WIN_DUMP_FIELD_PTR(field) _WIN_DUMP_FIELD_PTR(field) =20 -#define _WIN_DUMP_FIELD_SIZE(f) sizeof(h->f) +#define _WIN_DUMP_FIELD_SIZE(f) (x64 ? sizeof(h->x64.f) : sizeof(h->x32.f)) #define WIN_DUMP_FIELD_SIZE(field) _WIN_DUMP_FIELD_SIZE(field) =20 -#define WIN_DUMP_CTX_SIZE sizeof(WinContext64) +static size_t win_dump_ctx_size(bool x64) +{ + return x64 ? sizeof(WinContext64) : sizeof(WinContext32); +} =20 static size_t write_run(uint64_t base_page, uint64_t page_count, int fd, Error **errp) @@ -71,7 +77,7 @@ static size_t write_run(uint64_t base_page, uint64_t page= _count, return total; } =20 -static void write_runs(DumpState *s, WinDumpHeader64 *h, Error **errp) +static void write_runs(DumpState *s, WinDumpHeader *h, bool x64, Error **e= rrp) { uint64_t BasePage, PageCount; Error *local_err =3D NULL; @@ -88,22 +94,24 @@ static void write_runs(DumpState *s, WinDumpHeader64 *h= , Error **errp) } } =20 -static int cpu_read_ptr(CPUState *cpu, uint64_t addr, uint64_t *ptr) +static int cpu_read_ptr(bool x64, CPUState *cpu, uint64_t addr, uint64_t *= ptr) { int ret; + uint32_t ptr32; uint64_t ptr64; =20 - ret =3D cpu_memory_rw_debug(cpu, addr, &ptr64, WIN_DUMP_PTR_SIZE, 0); + ret =3D cpu_memory_rw_debug(cpu, addr, x64 ? (void *)&ptr64 : (void *)= &ptr32, + win_dump_ptr_size(x64), 0); =20 - *ptr =3D ptr64; + *ptr =3D x64 ? ptr64 : ptr32; =20 return ret; } =20 -static void patch_mm_pfn_database(WinDumpHeader64 *h, Error **errp) +static void patch_mm_pfn_database(WinDumpHeader *h, bool x64, Error **errp) { if (cpu_memory_rw_debug(first_cpu, - WIN_DUMP_FIELD(KdDebuggerDataBlock) + KDBG_MM_PFN_DATABASE_OFF= SET64, + WIN_DUMP_FIELD(KdDebuggerDataBlock) + KDBG_MM_PFN_DATABASE_OFF= SET, WIN_DUMP_FIELD_PTR(PfnDatabase), WIN_DUMP_FIELD_SIZE(PfnDatabase), 0)) { error_setg(errp, "win-dump: failed to read MmPfnDatabase"); @@ -111,13 +119,12 @@ static void patch_mm_pfn_database(WinDumpHeader64 *h,= Error **errp) } } =20 -static void patch_bugcheck_data(WinDumpHeader64 *h, Error **errp) +static void patch_bugcheck_data(WinDumpHeader *h, bool x64, Error **errp) { uint64_t KiBugcheckData; =20 - if (cpu_read_ptr(first_cpu, - WIN_DUMP_FIELD(KdDebuggerDataBlock) + - KDBG_KI_BUGCHECK_DATA_OFFSET64, + if (cpu_read_ptr(x64, first_cpu, + WIN_DUMP_FIELD(KdDebuggerDataBlock) + KDBG_KI_BUGCHECK_DATA_OF= FSET, &KiBugcheckData)) { error_setg(errp, "win-dump: failed to read KiBugcheckData"); return; @@ -142,30 +149,34 @@ static void patch_bugcheck_data(WinDumpHeader64 *h, E= rror **errp) /* * This routine tries to correct mistakes in crashdump header. */ -static void patch_header(WinDumpHeader64 *h) +static void patch_header(WinDumpHeader *h, bool x64) { Error *local_err =3D NULL; =20 - h->RequiredDumpSpace =3D sizeof(WinDumpHeader64) + - (h->PhysicalMemoryBlock.NumberOfPages << TARGET_PAGE_BITS); - h->PhysicalMemoryBlock.unused =3D 0; - h->unused1 =3D 0; + if (x64) { + h->x64.RequiredDumpSpace =3D sizeof(WinDumpHeader64) + + (h->x64.PhysicalMemoryBlock.NumberOfPages << TARGET_PAGE_BITS); + h->x64.PhysicalMemoryBlock.unused =3D 0; + h->x64.unused1 =3D 0; + } else { + h->x32.RequiredDumpSpace =3D sizeof(WinDumpHeader32) + + (h->x32.PhysicalMemoryBlock.NumberOfPages << TARGET_PAGE_BITS); + } =20 - patch_mm_pfn_database(h, &local_err); + patch_mm_pfn_database(h, x64, &local_err); if (local_err) { warn_report_err(local_err); local_err =3D NULL; } - patch_bugcheck_data(h, &local_err); + patch_bugcheck_data(h, x64, &local_err); if (local_err) { warn_report_err(local_err); } } =20 -static void check_header(WinDumpHeader64 *h, Error **errp) +static void check_header(WinDumpHeader *h, bool *x64, Error **errp) { const char Signature[] =3D "PAGE"; - const char ValidDump[] =3D "DU64"; =20 if (memcmp(h->Signature, Signature, sizeof(h->Signature))) { error_setg(errp, "win-dump: invalid header, expected '%.4s'," @@ -173,14 +184,17 @@ static void check_header(WinDumpHeader64 *h, Error **= errp) return; } =20 - if (memcmp(h->ValidDump, ValidDump, sizeof(h->ValidDump))) { - error_setg(errp, "win-dump: invalid header, expected '%.4s'," - " got '%.4s'", ValidDump, h->ValidDump); - return; + if (!memcmp(h->ValidDump, "DUMP", sizeof(h->ValidDump))) { + *x64 =3D false; + } else if (!memcmp(h->ValidDump, "DU64", sizeof(h->ValidDump))) { + *x64 =3D true; + } else { + error_setg(errp, "win-dump: invalid header, expected 'DUMP' or 'DU= 64'," + " got '%.4s'", h->ValidDump); } } =20 -static void check_kdbg(WinDumpHeader64 *h, Error **errp) +static void check_kdbg(WinDumpHeader *h, bool x64, Error **errp) { const char OwnerTag[] =3D "KDBG"; char read_OwnerTag[4]; @@ -189,7 +203,7 @@ static void check_kdbg(WinDumpHeader64 *h, Error **errp) =20 try_again: if (cpu_memory_rw_debug(first_cpu, - KdDebuggerDataBlock + KDBG_OWNER_TAG_OFFSET64, + KdDebuggerDataBlock + KDBG_OWNER_TAG_OFFSET, (uint8_t *)&read_OwnerTag, sizeof(read_OwnerTag), 0)) { error_setg(errp, "win-dump: failed to read OwnerTag"); return; @@ -214,15 +228,19 @@ try_again: } } =20 - h->KdDebuggerDataBlock =3D KdDebuggerDataBlock; + if (x64) { + h->x64.KdDebuggerDataBlock =3D KdDebuggerDataBlock; + } else { + h->x32.KdDebuggerDataBlock =3D KdDebuggerDataBlock; + } } =20 struct saved_context { - WinContext64 ctx; + WinContext ctx; uint64_t addr; }; =20 -static void patch_and_save_context(WinDumpHeader64 *h, +static void patch_and_save_context(WinDumpHeader *h, bool x64, struct saved_context *saved_ctx, Error **errp) { @@ -232,15 +250,15 @@ static void patch_and_save_context(WinDumpHeader64 *h, CPUState *cpu; int i =3D 0; =20 - if (cpu_read_ptr(first_cpu, - KdDebuggerDataBlock + KDBG_KI_PROCESSOR_BLOCK_OFFSET64, + if (cpu_read_ptr(x64, first_cpu, + KdDebuggerDataBlock + KDBG_KI_PROCESSOR_BLOCK_OFFSET, &KiProcessorBlock)) { error_setg(errp, "win-dump: failed to read KiProcessorBlock"); return; } =20 if (cpu_memory_rw_debug(first_cpu, - KdDebuggerDataBlock + KDBG_OFFSET_PRCB_CONTEXT_OFFSET64, + KdDebuggerDataBlock + KDBG_OFFSET_PRCB_CONTEXT_OFFSET, (uint8_t *)&OffsetPrcbContext, sizeof(OffsetPrcbContext), 0)) { error_setg(errp, "win-dump: failed to read OffsetPrcbContext"); return; @@ -251,17 +269,17 @@ static void patch_and_save_context(WinDumpHeader64 *h, CPUX86State *env =3D &x86_cpu->env; uint64_t Prcb; uint64_t Context; - WinContext64 ctx; + WinContext ctx; =20 - if (cpu_read_ptr(first_cpu, - KiProcessorBlock + i * WIN_DUMP_PTR_SIZE, + if (cpu_read_ptr(x64, first_cpu, + KiProcessorBlock + i * win_dump_ptr_size(x64), &Prcb)) { error_setg(errp, "win-dump: failed to read" " CPU #%d PRCB location", i); return; } =20 - if (cpu_read_ptr(first_cpu, + if (cpu_read_ptr(x64, first_cpu, Prcb + OffsetPrcbContext, &Context)) { error_setg(errp, "win-dump: failed to read" @@ -271,56 +289,88 @@ static void patch_and_save_context(WinDumpHeader64 *h, =20 saved_ctx[i].addr =3D Context; =20 - ctx =3D (WinContext64){ - .ContextFlags =3D WIN_CTX64_ALL, - .MxCsr =3D env->mxcsr, - - .SegEs =3D env->segs[0].selector, - .SegCs =3D env->segs[1].selector, - .SegSs =3D env->segs[2].selector, - .SegDs =3D env->segs[3].selector, - .SegFs =3D env->segs[4].selector, - .SegGs =3D env->segs[5].selector, - .EFlags =3D cpu_compute_eflags(env), - - .Dr0 =3D env->dr[0], - .Dr1 =3D env->dr[1], - .Dr2 =3D env->dr[2], - .Dr3 =3D env->dr[3], - .Dr6 =3D env->dr[6], - .Dr7 =3D env->dr[7], - - .Rax =3D env->regs[R_EAX], - .Rbx =3D env->regs[R_EBX], - .Rcx =3D env->regs[R_ECX], - .Rdx =3D env->regs[R_EDX], - .Rsp =3D env->regs[R_ESP], - .Rbp =3D env->regs[R_EBP], - .Rsi =3D env->regs[R_ESI], - .Rdi =3D env->regs[R_EDI], - .R8 =3D env->regs[8], - .R9 =3D env->regs[9], - .R10 =3D env->regs[10], - .R11 =3D env->regs[11], - .R12 =3D env->regs[12], - .R13 =3D env->regs[13], - .R14 =3D env->regs[14], - .R15 =3D env->regs[15], - - .Rip =3D env->eip, - .FltSave =3D { + if (x64) { + ctx.x64 =3D (WinContext64){ + .ContextFlags =3D WIN_CTX64_ALL, .MxCsr =3D env->mxcsr, - }, - }; + + .SegEs =3D env->segs[0].selector, + .SegCs =3D env->segs[1].selector, + .SegSs =3D env->segs[2].selector, + .SegDs =3D env->segs[3].selector, + .SegFs =3D env->segs[4].selector, + .SegGs =3D env->segs[5].selector, + .EFlags =3D cpu_compute_eflags(env), + + .Dr0 =3D env->dr[0], + .Dr1 =3D env->dr[1], + .Dr2 =3D env->dr[2], + .Dr3 =3D env->dr[3], + .Dr6 =3D env->dr[6], + .Dr7 =3D env->dr[7], + + .Rax =3D env->regs[R_EAX], + .Rbx =3D env->regs[R_EBX], + .Rcx =3D env->regs[R_ECX], + .Rdx =3D env->regs[R_EDX], + .Rsp =3D env->regs[R_ESP], + .Rbp =3D env->regs[R_EBP], + .Rsi =3D env->regs[R_ESI], + .Rdi =3D env->regs[R_EDI], + .R8 =3D env->regs[8], + .R9 =3D env->regs[9], + .R10 =3D env->regs[10], + .R11 =3D env->regs[11], + .R12 =3D env->regs[12], + .R13 =3D env->regs[13], + .R14 =3D env->regs[14], + .R15 =3D env->regs[15], + + .Rip =3D env->eip, + .FltSave =3D { + .MxCsr =3D env->mxcsr, + }, + }; + } else { + ctx.x32 =3D (WinContext32){ + .ContextFlags =3D WIN_CTX32_FULL | WIN_CTX_DBG, + + .SegEs =3D env->segs[0].selector, + .SegCs =3D env->segs[1].selector, + .SegSs =3D env->segs[2].selector, + .SegDs =3D env->segs[3].selector, + .SegFs =3D env->segs[4].selector, + .SegGs =3D env->segs[5].selector, + .EFlags =3D cpu_compute_eflags(env), + + .Dr0 =3D env->dr[0], + .Dr1 =3D env->dr[1], + .Dr2 =3D env->dr[2], + .Dr3 =3D env->dr[3], + .Dr6 =3D env->dr[6], + .Dr7 =3D env->dr[7], + + .Eax =3D env->regs[R_EAX], + .Ebx =3D env->regs[R_EBX], + .Ecx =3D env->regs[R_ECX], + .Edx =3D env->regs[R_EDX], + .Esp =3D env->regs[R_ESP], + .Ebp =3D env->regs[R_EBP], + .Esi =3D env->regs[R_ESI], + .Edi =3D env->regs[R_EDI], + + .Eip =3D env->eip, + }; + } =20 if (cpu_memory_rw_debug(first_cpu, Context, - &saved_ctx[i].ctx, WIN_DUMP_CTX_SIZE, 0)) { + &saved_ctx[i].ctx, win_dump_ctx_size(x64), 0)) { error_setg(errp, "win-dump: failed to save CPU #%d context", i= ); return; } =20 if (cpu_memory_rw_debug(first_cpu, Context, - &ctx, WIN_DUMP_CTX_SIZE, 1)) { + &ctx, win_dump_ctx_size(x64), 1)) { error_setg(errp, "win-dump: failed to write CPU #%d context", = i); return; } @@ -329,14 +379,14 @@ static void patch_and_save_context(WinDumpHeader64 *h, } } =20 -static void restore_context(WinDumpHeader64 *h, +static void restore_context(WinDumpHeader *h, bool x64, struct saved_context *saved_ctx) { int i; =20 for (i =3D 0; i < WIN_DUMP_FIELD(NumberProcessors); i++) { if (cpu_memory_rw_debug(first_cpu, saved_ctx[i].addr, - &saved_ctx[i].ctx, WIN_DUMP_CTX_SIZE, 1)) { + &saved_ctx[i].ctx, win_dump_ctx_size(x64), 1)) { warn_report("win-dump: failed to restore CPU #%d context", i); } } @@ -344,25 +394,28 @@ static void restore_context(WinDumpHeader64 *h, =20 void create_win_dump(DumpState *s, Error **errp) { - WinDumpHeader64 *h =3D (WinDumpHeader64 *)(s->guest_note + - VMCOREINFO_ELF_NOTE_HDR_SIZE); + WinDumpHeader *h =3D (void *)(s->guest_note + VMCOREINFO_ELF_NOTE_HDR_= SIZE); X86CPU *first_x86_cpu =3D X86_CPU(first_cpu); uint64_t saved_cr3 =3D first_x86_cpu->env.cr[3]; struct saved_context *saved_ctx =3D NULL; Error *local_err =3D NULL; + bool x64; + size_t hdr_size; =20 - if (s->guest_note_size !=3D sizeof(WinDumpHeader64) + - VMCOREINFO_ELF_NOTE_HDR_SIZE) { + if (s->guest_note_size !=3D VMCOREINFO_WIN_DUMP_NOTE_SIZE32 && + s->guest_note_size !=3D VMCOREINFO_WIN_DUMP_NOTE_SIZE64) { error_setg(errp, "win-dump: invalid vmcoreinfo note size"); return; } =20 - check_header(h, &local_err); + check_header(h, &x64, &local_err); if (local_err) { error_propagate(errp, local_err); return; } =20 + hdr_size =3D x64 ? sizeof(WinDumpHeader64) : sizeof(WinDumpHeader32); + /* * Further access to kernel structures by virtual addresses * should be made from system context. @@ -370,13 +423,13 @@ void create_win_dump(DumpState *s, Error **errp) =20 first_x86_cpu->env.cr[3] =3D WIN_DUMP_FIELD(DirectoryTableBase); =20 - check_kdbg(h, &local_err); + check_kdbg(h, x64, &local_err); if (local_err) { error_propagate(errp, local_err); goto out_cr3; } =20 - patch_header(h); + patch_header(h, x64); =20 saved_ctx =3D g_new(struct saved_context, WIN_DUMP_FIELD(NumberProcess= ors)); =20 @@ -385,7 +438,7 @@ void create_win_dump(DumpState *s, Error **errp) * to determine if the system-saved context is valid */ =20 - patch_and_save_context(h, saved_ctx, &local_err); + patch_and_save_context(h, x64, saved_ctx, &local_err); if (local_err) { error_propagate(errp, local_err); goto out_free; @@ -393,20 +446,20 @@ void create_win_dump(DumpState *s, Error **errp) =20 s->total_size =3D WIN_DUMP_FIELD(RequiredDumpSpace); =20 - s->written_size =3D qemu_write_full(s->fd, h, sizeof(*h)); - if (s->written_size !=3D sizeof(*h)) { + s->written_size =3D qemu_write_full(s->fd, h, hdr_size); + if (s->written_size !=3D hdr_size) { error_setg(errp, QERR_IO_ERROR); goto out_restore; } =20 - write_runs(s, h, &local_err); + write_runs(s, h, x64, &local_err); if (local_err) { error_propagate(errp, local_err); goto out_restore; } =20 out_restore: - restore_context(h, saved_ctx); + restore_context(h, x64, saved_ctx); out_free: g_free(saved_ctx); out_cr3: --=20 2.35.1