From patchwork Sat Feb 25 09:48:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1747947 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=nVdAtlkX; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PP27P3R5Qz245s for ; Sat, 25 Feb 2023 20:50:25 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVrB8-0008I6-1T; Sat, 25 Feb 2023 04:49:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVrB6-0008HP-7l for qemu-devel@nongnu.org; Sat, 25 Feb 2023 04:49:16 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVrB4-0000M8-LV for qemu-devel@nongnu.org; Sat, 25 Feb 2023 04:49:16 -0500 Received: by mail-wm1-x336.google.com with SMTP id p16so1284670wmq.5 for ; Sat, 25 Feb 2023 01:49:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=246xagcTsnQ1kTR2FWcWjuRTykOQzJVC1A3AAvRLwWQ=; b=nVdAtlkXPxM3OTiTLluZqNrT9rsJrlRpDUlsPdLxxr/oi9GEUwB7p8iaPwZAeg4hvR MCrPBAfbj5mI+XwrwIdCwfjJh3/k1Vc6RyM5Gx9IzW2R928zYz8EHz8fTN+uzxJc8PKj ZNvKn77NdUbOibDbUZpPEajIegG7gXUA3DhjwxL1FproHY9LuzNvraMYTnT6Lm7+5+/+ YYhUmR9TdZtcKaxcAq6n/nqokxF3nfT2IaPMOa+eaYOR4OADOphqBam+oaoRAiZgzAaZ Z3DPpcnVfV/p1mOVvQMT1NdgTg7ppfbtx0zFQ5i+DY+OlvK87OxyNVzc+76S/PzPddD9 FwuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=246xagcTsnQ1kTR2FWcWjuRTykOQzJVC1A3AAvRLwWQ=; b=bfgt8V9n9M9ybId79bItnS6k/4Xzf0Sfka9OKJ3y1FE3Nimojr8cVWqbs+ATE7Fapb SxE4U0XmOcqI/IvTkXOWPUUKHHpTAydz1+GcK+eRORMlVd8hldOg4qGRFyy8dLsvs0NF KgS7ns1hXj1zQH+3DBV1QiqWvR4vNFDphUyHKGwBiiiNzvv4jk/Z6/2+dcuGxYoP3fxz eYyegSdCMS3xjSr9jXi5RyYMXRuqM0chpEnWoaY3TB0Wr5VNnNlFSb0ntR4oVfKs+hZz 5QU2dj5zqMMkKvL8mGZuBipeulfNL/HbNYYeWHMzz7IZWVaMhnB0JYwqPLZUh98mSLPO 8kew== X-Gm-Message-State: AO0yUKW1GYvsDJWue+k/5MeR8Y22A0mOC0S3RzRV6z+1z1PHD2bpOgH+ KLkNCnJ/kg7DbDDmdoGiho/gj3OuIb+qoFrvNoc= X-Google-Smtp-Source: AK7set9rCp7dqPI5No4yuV0IplIxKkzlg7c0GOmXWQmhludGyGo3kw3/UA3UP1WDZgbcEjzWCQ1sXA== X-Received: by 2002:a05:600c:44d2:b0:3ea:4af0:3475 with SMTP id f18-20020a05600c44d200b003ea4af03475mr7090621wmo.1.1677318553043; Sat, 25 Feb 2023 01:49:13 -0800 (PST) Received: from localhost.localdomain (120.red-95-127-35.staticip.rima-tde.net. [95.127.35.120]) by smtp.gmail.com with ESMTPSA id r14-20020adff70e000000b002c567881dbcsm1292986wrp.48.2023.02.25.01.49.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 25 Feb 2023 01:49:12 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Janosch Frank , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v6 1/5] dump: Replace tswapN() -> cpu_to_dumpN() Date: Sat, 25 Feb 2023 10:48:59 +0100 Message-Id: <20230225094903.53167-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230225094903.53167-1-philmd@linaro.org> References: <20230225094903.53167-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org All uses of tswap in that file are wrong, and should be using cpu_to_dumpN, which correctly tests the endianness of the output. Reported-by: Richard Henderson Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- dump/dump.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dump/dump.c b/dump/dump.c index 1362810991..0ab229e5e9 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -907,13 +907,13 @@ static void get_note_sizes(DumpState *s, const void *note, if (dump_is_64bit(s)) { const Elf64_Nhdr *hdr = note; note_head_sz = sizeof(Elf64_Nhdr); - name_sz = tswap64(hdr->n_namesz); - desc_sz = tswap64(hdr->n_descsz); + name_sz = cpu_to_dump64(s, hdr->n_namesz); + desc_sz = cpu_to_dump64(s, hdr->n_descsz); } else { const Elf32_Nhdr *hdr = note; note_head_sz = sizeof(Elf32_Nhdr); - name_sz = tswap32(hdr->n_namesz); - desc_sz = tswap32(hdr->n_descsz); + name_sz = cpu_to_dump32(s, hdr->n_namesz); + desc_sz = cpu_to_dump32(s, hdr->n_descsz); } if (note_head_size) { From patchwork Sat Feb 25 09:49:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1747945 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=CDqLZRel; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PP26h1xR5z2466 for ; Sat, 25 Feb 2023 20:49:48 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVrBD-0008Iu-Lf; Sat, 25 Feb 2023 04:49:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVrBC-0008Id-F1 for qemu-devel@nongnu.org; Sat, 25 Feb 2023 04:49:22 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVrBA-0000N7-TJ for qemu-devel@nongnu.org; Sat, 25 Feb 2023 04:49:22 -0500 Received: by mail-wr1-x431.google.com with SMTP id 6so1536685wrb.11 for ; Sat, 25 Feb 2023 01:49:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CfMvlZ8pAKruenJ/ugwQdJE7H5ZPrvj71nw3+8tK1yc=; b=CDqLZRel53fBCuqBD5TvO1kIRRfT06GYX4K5bGYyc3XhsQfsqTVMwAgfNztGX2CqEE x0N4+Shg2G/iLa4fHC5G2G/aqXXWtxCwVuUU6EgdxvcjDqCkX77lrccQIVFKl0U38ubH aOpJpKKUeZNNe0FHEbhQtghC29hPnVEr38anju5uSqApRmALeHwlD2HplUv6zcwTjss9 iroL/OpLabskX72v8fKku1+UygyJS6+rfGqNRU/3YyqBiM9/4dyYDzK/pNtTm+tHT6av vIJEBirumoP0Ueb611abK+UBLjtdEBm2q0QkdaVSvQTpuFttE8VBlWXRxQSihICU8LeW t0wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CfMvlZ8pAKruenJ/ugwQdJE7H5ZPrvj71nw3+8tK1yc=; b=D/Vp+U/Y+n4aatQAcngs+aS3AI9kae3sXH/WdsK9tjWprZzaTUm48Zyv0soHN7wC9a dqdZF72rZNZXyhcYcBC1BtOLRXkYBjPoq4SXVaxS5NbRCWyQ/c7oEozqAteMdNVUvkmQ DT/CPyygAP4xyurk8T3BA2uh3YSNFoGjbZthfj24KFjHj0E9l5e6vbAsI/UcgfgmLAPb XkQRv7eH/G6ULfP5GPsh1wg4PdA7TecKOK1Zaon1rrMDUx7BET4nX9rOzYz+1pwvblb9 MlZiSB4QJ9lZAi1LSS1PQSLZXvN4U8THPB9MDeSwKwwN6J1+HnZ5pRQJcgqgoi0Lfjn/ V6Rg== X-Gm-Message-State: AO0yUKUN2WibpLuP96X06MReFtqA69TtP9e4B/wtuK6famzaraqGZrez WBccqjsxNQILBzloBq6+W9Cl0g7dPvWIUFmNs1M= X-Google-Smtp-Source: AK7set+qRXHa9LmeGBinGYsrNsXILyHFJknGjr1sOFaxPfqmopeTqEu/1kn48ZBX3rhJkLk78RPl/w== X-Received: by 2002:adf:e64d:0:b0:2c5:6cfe:aabf with SMTP id b13-20020adfe64d000000b002c56cfeaabfmr16522143wrn.9.1677318559382; Sat, 25 Feb 2023 01:49:19 -0800 (PST) Received: from localhost.localdomain (120.red-95-127-35.staticip.rima-tde.net. [95.127.35.120]) by smtp.gmail.com with ESMTPSA id k18-20020a056000005200b002c54c7153f0sm1344425wrx.1.2023.02.25.01.49.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 25 Feb 2023 01:49:19 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Janosch Frank , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v6 2/5] dump: Replace TARGET_PAGE_SIZE -> qemu_target_page_size() Date: Sat, 25 Feb 2023 10:49:00 +0100 Message-Id: <20230225094903.53167-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230225094903.53167-1-philmd@linaro.org> References: <20230225094903.53167-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org TARGET_PAGE_SIZE is target specific. In preparation of making dump.c target-agnostic, replace the compile-time TARGET_PAGE_SIZE definition by runtime qemu_target_page_size(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- dump/dump.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dump/dump.c b/dump/dump.c index 0ab229e5e9..4d68a74ffa 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -15,6 +15,7 @@ #include "qemu/cutils.h" #include "elf.h" #include "exec/hwaddr.h" +#include "exec/target_page.h" #include "monitor/monitor.h" #include "sysemu/kvm.h" #include "sysemu/dump.h" @@ -1860,7 +1861,7 @@ static void dump_init(DumpState *s, int fd, bool has_format, } if (!s->dump_info.page_size) { - s->dump_info.page_size = TARGET_PAGE_SIZE; + s->dump_info.page_size = qemu_target_page_size(); } s->note_size = cpu_get_note_size(s->dump_info.d_class, From patchwork Sat Feb 25 09:49:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1747948 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=FBuJLECQ; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PP27V6GYYz245s for ; Sat, 25 Feb 2023 20:50:30 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVrBN-0008Sk-1O; Sat, 25 Feb 2023 04:49:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVrBK-0008MO-8P for qemu-devel@nongnu.org; Sat, 25 Feb 2023 04:49:30 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVrBI-0000Pf-JM for qemu-devel@nongnu.org; Sat, 25 Feb 2023 04:49:30 -0500 Received: by mail-wm1-x332.google.com with SMTP id m25-20020a7bcb99000000b003e7842b75f2so983770wmi.3 for ; Sat, 25 Feb 2023 01:49:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hUi5JZWgtGe/HPtd1a91JzPK7NOPEzO7wKibYvhikkw=; b=FBuJLECQflDxkDWSI7MQjY/AkSukimuaLC4B+b4opw6gTkCHqcSOUOvAALKqfU0G2B OJ/WkrUfYNFFeg+/pZl79M7KxhtapXH9ynLjh3z+FiH/xQTj22KBxYmgBCLFMwfo6OTo 57ewjg2vAUry5gjzQPCJuvz3hRnf0uhU3GruD/OGhlTB76CR5EVcZTgySeRaVVGEmbwE LuUbrNB+2+jcqCbCkx45YbuVowUyiumRhEiEAjq/30qxhuVNTmrWj4ThNxEb6fuGTG3k giil+7gi6DizPdMOtzyN6FK0ETvvzY0I4vt89vc36H7KPefU8CbGSIy1L/kl3wyLevOS IK4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hUi5JZWgtGe/HPtd1a91JzPK7NOPEzO7wKibYvhikkw=; b=luHMIm7ED9CiYSQb787aBwhFD9ir/qlfg+I2OAPxi9VLPFWzrdhTCiyJhCjccqqwrR 7+dYdfJg53oJuOpGVVBsnDySxtm9c8pgjX7GIIyxnUJIolkiIO0XeO5gIQEJU6/HHsGo 54MTDRoCYy0z8YV/eVBrINx6mdK3tolN9HS6icRavnVm3YVZQvy9NBpH7hsf1QyOmtun +RMTNdZ2MhMFVokMTBsED3OyD3c8DVYtUswznzA9fwzZ/Pfg6NSRqe1EfVKn2vNz9J9G ittX6kXIrqbvtr9cS/U1V7ASI8L2mn0MfQnhvSHXlg8lfcoS1x1uLXvL1+QUTwDjQ487 Cldw== X-Gm-Message-State: AO0yUKV/SPb4ZmMvHnyQxZnCSpS6WepJYdJDBmv9AI3yh+2mWps/SEOo CfjozzQPL7F3sX1wHYvABy7L0DDPbQ8is4Mlnl8= X-Google-Smtp-Source: AK7set+5Az+ziufYzlmX/dcvWatUvqnyLhKVR0Z9DQG7UaGW83kqZXkq6AHZYyBaxvndlXeozNmNcg== X-Received: by 2002:a05:600c:1898:b0:3e2:20c7:6553 with SMTP id x24-20020a05600c189800b003e220c76553mr14829622wmp.13.1677318567000; Sat, 25 Feb 2023 01:49:27 -0800 (PST) Received: from localhost.localdomain (120.red-95-127-35.staticip.rima-tde.net. [95.127.35.120]) by smtp.gmail.com with ESMTPSA id s17-20020adff811000000b002c758fe9689sm1288801wrp.52.2023.02.25.01.49.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 25 Feb 2023 01:49:26 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Janosch Frank , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v6 3/5] dump: Clean included headers Date: Sat, 25 Feb 2023 10:49:01 +0100 Message-Id: <20230225094903.53167-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230225094903.53167-1-philmd@linaro.org> References: <20230225094903.53167-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org "qemu/win_dump_defs.h" is only required by win_dump.c, but win_dump.h requires "sysemu/dump.h" which declares the DumpState type. Remove various unused headers. Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé --- dump/dump-hmp-cmds.c | 2 +- dump/dump.c | 6 ++---- dump/win_dump.c | 15 +++++---------- dump/win_dump.h | 2 +- 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dump/dump-hmp-cmds.c b/dump/dump-hmp-cmds.c index e5053b04cd..b038785fee 100644 --- a/dump/dump-hmp-cmds.c +++ b/dump/dump-hmp-cmds.c @@ -1,5 +1,5 @@ /* - * Human Monitor Interface commands + * Windows crashdump (Human Monitor Interface commands) * * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. diff --git a/dump/dump.c b/dump/dump.c index 4d68a74ffa..da63129825 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -14,22 +14,20 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" #include "elf.h" -#include "exec/hwaddr.h" +#include "qemu/bswap.h" #include "exec/target_page.h" #include "monitor/monitor.h" -#include "sysemu/kvm.h" #include "sysemu/dump.h" -#include "sysemu/memory_mapping.h" #include "sysemu/runstate.h" #include "sysemu/cpus.h" #include "qapi/error.h" #include "qapi/qapi-commands-dump.h" #include "qapi/qapi-events-dump.h" #include "qapi/qmp/qerror.h" -#include "qemu/error-report.h" #include "qemu/main-loop.h" #include "hw/misc/vmcoreinfo.h" #include "migration/blocker.h" +#include "hw/core/cpu.h" #ifdef TARGET_X86_64 #include "win_dump.h" diff --git a/dump/win_dump.c b/dump/win_dump.c index f20b6051b6..ba7fa404fe 100644 --- a/dump/win_dump.c +++ b/dump/win_dump.c @@ -1,5 +1,5 @@ /* - * Windows crashdump + * Windows crashdump (target specific implementations) * * Copyright (c) 2018 Virtuozzo International GmbH * @@ -9,19 +9,14 @@ */ #include "qemu/osdep.h" -#include "qemu/cutils.h" -#include "elf.h" -#include "exec/hwaddr.h" -#include "monitor/monitor.h" -#include "sysemu/kvm.h" #include "sysemu/dump.h" -#include "sysemu/memory_mapping.h" -#include "sysemu/cpus.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qemu/error-report.h" -#include "hw/misc/vmcoreinfo.h" +#include "exec/cpu-defs.h" +#include "hw/core/cpu.h" +#include "qemu/win_dump_defs.h" #include "win_dump.h" +#include "cpu.h" static size_t win_dump_ptr_size(bool x64) { diff --git a/dump/win_dump.h b/dump/win_dump.h index b8c25348f4..56f63683c3 100644 --- a/dump/win_dump.h +++ b/dump/win_dump.h @@ -11,7 +11,7 @@ #ifndef WIN_DUMP_H #define WIN_DUMP_H -#include "qemu/win_dump_defs.h" +#include "sysemu/dump.h" void create_win_dump(DumpState *s, Error **errp); From patchwork Sat Feb 25 09:49:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1747946 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=wzGN95Aa; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PP2701Yngz2466 for ; Sat, 25 Feb 2023 20:50:04 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVrBT-0000Sn-9m; Sat, 25 Feb 2023 04:49:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVrBQ-0000Pn-RQ for qemu-devel@nongnu.org; Sat, 25 Feb 2023 04:49:37 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVrBP-0000Qd-5V for qemu-devel@nongnu.org; Sat, 25 Feb 2023 04:49:36 -0500 Received: by mail-wm1-x330.google.com with SMTP id bg16-20020a05600c3c9000b003eb34e21bdfso487844wmb.0 for ; Sat, 25 Feb 2023 01:49:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ctL4KXUjEttAEhfjTfJB9VEH6H9wRZDJy/S9HVcuPtg=; b=wzGN95Aa/1MT179TjccGrtswYIaifT77hyyEyX0+nMR3NlGsilC20tufTphpC57Vdc IzfCOoEdv0vfbe8NYv+J9v2nPnVPxiWwHSpGbgXhiVV9hqelFDY5tHRWSVtEcYFPdvVq qZ1CPww4pkAVmngAT56shoIQVjXkgYA0VVUo5MjcHKC5t+zaPgRno5EEjL3nDJa1pjsV ii22IQxW+qSRcvSyeGBOdL+LAoQb8fF2z/w9KQPZ5bKMfvDXLNsW5OZNAVDIMjePeqth WBfYsErfXjX4yC/Kp2TbEi7KzpFtp3T8WaLDnzNPNX3E7StJFMZNfs7SGytUqxKOtwCB 9+rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ctL4KXUjEttAEhfjTfJB9VEH6H9wRZDJy/S9HVcuPtg=; b=YV4BDOR7oX+ztOzwZRO5Zw9xxad4MarQiO5rNWFIBUOR9D4Jf1B17mynWTIGLl6FT/ tozhyamKnR1yGXh4r3ewqYbC2eyOd5yAWydYRqA9uU60eVbmSw3xelmObAlVwBmVvz1l fKaz5EXjBv/16h+VBgOukFy3PeroQ2/RaIeWasneoCfOhkWP1Z2iqnl9hMyp0GxisCMV k0pds6nJZplshOazmNQI78XIPkUyodQqhUF1Qq43Fz1qjrBrJ3PZc3AjssZlx+Dq8pCk beL1xXoC7DFSM2I8YeKexg1IOeX9B50nP3Z39mg90KEQkkBtSdcjbQS0NhyOygBeTWvG lIGA== X-Gm-Message-State: AO0yUKVIdW8DTt3ydXDp1RpU37+3FBo5MHf8SrgDDpO15sKUB7uJ/yWI T0swFYNtY2fZh7Z28ZkX51qGpB3oIZNY6xp8o4I= X-Google-Smtp-Source: AK7set/RFRnW2i3+S00dTSUt1kUsrisNiireVGi1za7x+QPEadxC08ZA3qf8+hR4gHko2srzAFdZIw== X-Received: by 2002:a05:600c:1716:b0:3dc:5302:ad9 with SMTP id c22-20020a05600c171600b003dc53020ad9mr9320958wmn.27.1677318573284; Sat, 25 Feb 2023 01:49:33 -0800 (PST) Received: from localhost.localdomain (120.red-95-127-35.staticip.rima-tde.net. [95.127.35.120]) by smtp.gmail.com with ESMTPSA id t1-20020a5d6a41000000b002c70a68111asm1287864wrw.83.2023.02.25.01.49.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 25 Feb 2023 01:49:32 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Janosch Frank , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v6 4/5] dump: Simplify compiling win_dump.o by introducing win_dump_available() Date: Sat, 25 Feb 2023 10:49:02 +0100 Message-Id: <20230225094903.53167-5-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230225094903.53167-1-philmd@linaro.org> References: <20230225094903.53167-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org To make dump.c less target dependent, move the TARGET_X86_64 #ifdef'ry from dump.c to win_dump.c (introducing a win_dump_available() method there). By doing so we can build win_dump.c on any target, and simplify the meson rule. Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé --- dump/dump.c | 16 +++++----------- dump/meson.build | 2 +- dump/win_dump.c | 18 ++++++++++++++++++ dump/win_dump.h | 3 +++ 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dump/dump.c b/dump/dump.c index da63129825..fa650980d8 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -28,10 +28,7 @@ #include "hw/misc/vmcoreinfo.h" #include "migration/blocker.h" #include "hw/core/cpu.h" - -#ifdef TARGET_X86_64 #include "win_dump.h" -#endif #include #ifdef CONFIG_LZO @@ -2126,12 +2123,10 @@ void qmp_dump_guest_memory(bool paging, const char *file, } #endif -#ifndef TARGET_X86_64 - if (has_format && format == DUMP_GUEST_MEMORY_FORMAT_WIN_DMP) { - error_setg(errp, "Windows dump is only available for x86-64"); + if (has_format && format == DUMP_GUEST_MEMORY_FORMAT_WIN_DMP + && !win_dump_available(errp)) { return; } -#endif #if !defined(WIN32) if (strstart(file, "fd:", &p)) { @@ -2213,10 +2208,9 @@ DumpGuestMemoryCapability *qmp_query_dump_guest_memory_capability(Error **errp) QAPI_LIST_APPEND(tail, DUMP_GUEST_MEMORY_FORMAT_KDUMP_SNAPPY); #endif - /* Windows dump is available only if target is x86_64 */ -#ifdef TARGET_X86_64 - QAPI_LIST_APPEND(tail, DUMP_GUEST_MEMORY_FORMAT_WIN_DMP); -#endif + if (win_dump_available(NULL)) { + QAPI_LIST_APPEND(tail, DUMP_GUEST_MEMORY_FORMAT_WIN_DMP); + } return cap; } diff --git a/dump/meson.build b/dump/meson.build index 2eff29c3ea..f13b29a849 100644 --- a/dump/meson.build +++ b/dump/meson.build @@ -1,4 +1,4 @@ softmmu_ss.add(files('dump-hmp-cmds.c')) specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files('dump.c'), snappy, lzo]) -specific_ss.add(when: ['CONFIG_SOFTMMU', 'TARGET_X86_64'], if_true: files('win_dump.c')) +specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files('win_dump.c')) diff --git a/dump/win_dump.c b/dump/win_dump.c index ba7fa404fe..ff9c5bd339 100644 --- a/dump/win_dump.c +++ b/dump/win_dump.c @@ -18,6 +18,13 @@ #include "win_dump.h" #include "cpu.h" +#if defined(TARGET_X86_64) + +bool win_dump_available(Error **errp) +{ + return true; +} + static size_t win_dump_ptr_size(bool x64) { return x64 ? sizeof(uint64_t) : sizeof(uint32_t); @@ -470,3 +477,14 @@ out_cr3: return; } + +#else /* !TARGET_X86_64 */ + +bool win_dump_available(Error **errp) +{ + error_setg(errp, "Windows dump is only available for x86-64"); + + return false; +} + +#endif diff --git a/dump/win_dump.h b/dump/win_dump.h index 56f63683c3..c9b49f87dc 100644 --- a/dump/win_dump.h +++ b/dump/win_dump.h @@ -13,6 +13,9 @@ #include "sysemu/dump.h" +/* Check Windows dump availability for the current target */ +bool win_dump_available(Error **errp); + void create_win_dump(DumpState *s, Error **errp); #endif /* WIN_DUMP_H */ From patchwork Sat Feb 25 09:49:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1747949 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=h95h92uL; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PP27W15dbz2466 for ; Sat, 25 Feb 2023 20:50:31 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVrBc-0000cG-T6; Sat, 25 Feb 2023 04:49:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVrBV-0000TU-VB for qemu-devel@nongnu.org; Sat, 25 Feb 2023 04:49:42 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVrBU-0000Pf-CF for qemu-devel@nongnu.org; Sat, 25 Feb 2023 04:49:41 -0500 Received: by mail-wm1-x332.google.com with SMTP id m25-20020a7bcb99000000b003e7842b75f2so983948wmi.3 for ; Sat, 25 Feb 2023 01:49:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dHwEoMi3MEImb9Gq1/MR47PuMg0pIyHWlD7SUPk6AuQ=; b=h95h92uLFlFw1V3bNCihM9QJHeANSD6LhfNBL9C3rB/Z2+ZKR3hoOJ0PNgslW4bDjq QeSFw8AxHHTaRu7xo72I0YUmZ6iekZkxPovUExWkUJtihouM6R14d7EBOM/qZYiY+2tr 4l8dPVPws6P8lRHYZiOgsFJD68fykHbkdAQYhgUcF9GS2hKPpSOns7jOS2/chRFHLnhL GootXhh/HODPMpdLPXUmq5X8FfTMRfPUlx8lI2sRM3Gyl//eZvrZiWWNEWhLpRrSwtQO 2bv3+QDwKN5dfTY08yOJxYaSHhuJkB1j8nqDDUkK8aojhtPNoYX91ND9LJvMbKIiWAQo 88Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dHwEoMi3MEImb9Gq1/MR47PuMg0pIyHWlD7SUPk6AuQ=; b=eU1kaIYYqAoiOdE6X2I/2psHBVVURpPNKBtyVFhGQDpC9SVzDF9LJYeKnmrqbkMvRp iOODc+SGIX/B1i6/tURKGKeZhhjjno9U55hKIYQ9ZrrHhOxhegjId2zr5mOoHDZyFo++ ZDxxcwIUvH4bmlG6Oev/I5y9MVSY1w0NAW8LkAElkWDRYuuYcLCKIfpY4TZzscglu9ZX W6/lZFUu8m6/uxFAGc829TB4XaTB/FCTrqCW3CVipzyvPla/Vc9g0+Q8DLbLmJnzuYvw rapEDGZTuXSW/SN6vhlstlmgVjKD/Xcn1uh8bvyJWceYQxO6o7nl3T1hxQd9/JfxVJ5C wJjA== X-Gm-Message-State: AO0yUKWNfdbSjJdZVPSwv4FLyTvj93jtaN9vfPiG2Lfg0PgdWylj/Ypr HKxiPZe1HyT8BDitiAGkQPbgRqeYxTv5rHZB5Wc= X-Google-Smtp-Source: AK7set+5/hhkY949mmCID/ycird+TD6bBQk8q4TT9/YIOhirgTQ3axh2WGPqKRCJjgNQnryKuFSAPg== X-Received: by 2002:a05:600c:a698:b0:3e2:1e31:36bc with SMTP id ip24-20020a05600ca69800b003e21e3136bcmr13408091wmb.12.1677318579469; Sat, 25 Feb 2023 01:49:39 -0800 (PST) Received: from localhost.localdomain (120.red-95-127-35.staticip.rima-tde.net. [95.127.35.120]) by smtp.gmail.com with ESMTPSA id t23-20020a1c7717000000b003daf672a616sm1976931wmi.22.2023.02.25.01.49.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 25 Feb 2023 01:49:39 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Janosch Frank , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v6 5/5] dump: Add create_win_dump() stub for non-x86 targets Date: Sat, 25 Feb 2023 10:49:03 +0100 Message-Id: <20230225094903.53167-6-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230225094903.53167-1-philmd@linaro.org> References: <20230225094903.53167-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Implement the non-x86 create_win_dump(). We can remove the last TARGET_X86_64 #ifdef'ry in dump.c, which thus becomes target-independent. Update meson accordingly. Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé --- dump/dump.c | 2 -- dump/meson.build | 4 +--- dump/win_dump.c | 5 +++++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dump/dump.c b/dump/dump.c index fa650980d8..544d5bce3a 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -2018,9 +2018,7 @@ static void dump_process(DumpState *s, Error **errp) DumpQueryResult *result = NULL; if (s->has_format && s->format == DUMP_GUEST_MEMORY_FORMAT_WIN_DMP) { -#ifdef TARGET_X86_64 create_win_dump(s, errp); -#endif } else if (s->has_format && s->format != DUMP_GUEST_MEMORY_FORMAT_ELF) { create_kdump_vmcore(s, errp); } else { diff --git a/dump/meson.build b/dump/meson.build index f13b29a849..df52ee4268 100644 --- a/dump/meson.build +++ b/dump/meson.build @@ -1,4 +1,2 @@ -softmmu_ss.add(files('dump-hmp-cmds.c')) - -specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files('dump.c'), snappy, lzo]) +softmmu_ss.add([files('dump.c', 'dump-hmp-cmds.c'), snappy, lzo]) specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files('win_dump.c')) diff --git a/dump/win_dump.c b/dump/win_dump.c index ff9c5bd339..0152f7330a 100644 --- a/dump/win_dump.c +++ b/dump/win_dump.c @@ -487,4 +487,9 @@ bool win_dump_available(Error **errp) return false; } +void create_win_dump(DumpState *s, Error **errp) +{ + win_dump_available(errp); +} + #endif