From patchwork Sun Sep 25 10:51:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 609132 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1268477pvb; Sun, 25 Sep 2022 03:59:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7fCbBaQXsINKvYrHSaFspE5zbpC+8Wmk0/Y3lFC1j8W+wHMu0Oytg8VwYmIntrjomnvypm X-Received: by 2002:ac8:58cd:0:b0:35b:af08:a2ff with SMTP id u13-20020ac858cd000000b0035baf08a2ffmr14128477qta.666.1664103599207; Sun, 25 Sep 2022 03:59:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664103599; cv=none; d=google.com; s=arc-20160816; b=wdHoCqqqbcZie/UysjsHmMrrzKGR69MHV40fzp7DJPsQlGQYlgsdTxyMs3hD4oBHbi jwTHds7gSuWDGJPxAY0qispP6CSIKG4okTccpI0IKsKwB6MtUCt+d446fKdUCX1grAsH zamap8zExUy1/+azGlF/Kr57p3bxwMrRrFXAfj0FheEpsIwLFz7UaLtw5ZRkm2B3t8HA O1gXkReaHuyMQPpO9OeYZQIOpJSmuGe4W+6b1trb7QU3LsdP2/da95DMtoFLIPJWiQrj oQ5P1EHZ8YmEulZwNF33hkD/feilSdxn7LO3tH2/nYzgBkBA/beWxZD5IUCxu5eU4Jdq AfsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Lkvq7PbzWDpGS8XnBB4KuXBeV3aSVBxGMsmyqVBXXr4=; b=WPQUXNK0flrrdGwtGOluX5FvFrOln6GjrUwssTEHX8uWJ79wzUDHaGGjLRuzAKS+DM Mvh8a2OfBgrC3eeHbiuxnMkv7RrCEjsl1sPH6+Pxi3TRw+DmBCSmL+FajvXqlMfXxEST ah43cjOZkha1xTmS4WV46Lx+ulQ58ZtUVhRXMQbXnkRz97Wqb7FwzNy5l21ImcNbe9Tu TKfieSExJTSqza+2O0kNjlk65/mW7IxvX4T2uWDILsigmZoY/3ziH7BZa8OLO/n5FNLZ dUN/EZf5mVJZ6P9+DlFLtPLCjur1SChd4af0SlYgnLn3iYoSjdCt3T5CK2VYcb6c+8S+ OoDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mMgKC29q; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p15-20020a0cc3cf000000b004ad874369c9si110076qvi.536.2022.09.25.03.59.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 25 Sep 2022 03:59:59 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mMgKC29q; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocPMc-0001Xw-O6 for patch@linaro.org; Sun, 25 Sep 2022 06:59:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocPEb-0002KH-Eq for qemu-devel@nongnu.org; Sun, 25 Sep 2022 06:51:41 -0400 Received: from mail-qk1-x734.google.com ([2607:f8b0:4864:20::734]:42513) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocPEZ-0000KP-QD for qemu-devel@nongnu.org; Sun, 25 Sep 2022 06:51:41 -0400 Received: by mail-qk1-x734.google.com with SMTP id d15so2633543qka.9 for ; Sun, 25 Sep 2022 03:51:39 -0700 (PDT) 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; bh=Lkvq7PbzWDpGS8XnBB4KuXBeV3aSVBxGMsmyqVBXXr4=; b=mMgKC29q3GSI2sczQdNzk2QkowOZHNeuODNNyxx6dm2uB58vjYhFPopNNJXKCLMSmD WTEkg6b4V+yIP4m6EX8WXf/0uFvyQvCHJuTvqD09re5Hjjmo/DHhfeAqKLnGCvMrgVZj NVwRKCg3+KDepTF9C4zLA0VJ1xd8tbYN/+wiRa57uL3Yd07ieuxuTb1Fj1TiNEUcEeyt B+q86n9VatUOzDANZD/TwnjFD95ekzxYtApWJoreiOQa9V/FWl4EAa7s+P4rupVFmqTI S9yfuqkhw02I8eDz71vH6BYxuYvW/v6w3SHCiFcKfcODMx0dO2YLyf3vNQbvEDtWafbo 3T2g== 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; bh=Lkvq7PbzWDpGS8XnBB4KuXBeV3aSVBxGMsmyqVBXXr4=; b=x4STtUFqog6mtXob9wSNmo6tOfxa0kThtIrJze/QQ1ukxj8uwt8VflhmvwddRV09om wLJSK/wUFVJvtEjwOSJ0lt9LyMASl126B5qBkOLrrG54bv186r18pwG5DcrGxvEiBR/W aW2+5Pd8c6Wft7U9jK6uE2xCAsMSZeB3i+fRyAu3HCjlEl8PF4WdxiAxhCB3givcKiIC H2eD+gpy9YbMePA6krXvchRw0kBNvIF9sGevOyGC/hg6vEZYY/WngXEpsH0ayyCupvvX N1g4pzfIF8khWnCvrTtH0HaRlst3O+jU2FHWbWnD4bTeA4SJvVQ4AFEznfidrOny+2MI rkaw== X-Gm-Message-State: ACrzQf2hthXgt78TydSRftZ3D0c0mwJiJ8oRIqSsf0RcQW6VV9Bbm4o+ Rc26b7SbNml2upxJ27ZU4fIh80WR9wkmyA== X-Received: by 2002:a05:620a:19a5:b0:6cf:4a24:cccb with SMTP id bm37-20020a05620a19a500b006cf4a24cccbmr11017035qkb.376.1664103098777; Sun, 25 Sep 2022 03:51:38 -0700 (PDT) Received: from stoup.. ([2605:ef80:80a9:5c0e:1ec2:d482:4986:8538]) by smtp.gmail.com with ESMTPSA id u15-20020a05620a0c4f00b006cf19068261sm10061132qki.116.2022.09.25.03.51.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Sep 2022 03:51:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Peter Maydell , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= Subject: [PATCH v5 02/17] accel/tcg: Drop addr member from SavedIOTLB Date: Sun, 25 Sep 2022 10:51:09 +0000 Message-Id: <20220925105124.82033-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220925105124.82033-1-richard.henderson@linaro.org> References: <20220925105124.82033-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::734; envelope-from=richard.henderson@linaro.org; helo=mail-qk1-x734.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This field is only written, not read; remove it. Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée --- include/hw/core/cpu.h | 1 - accel/tcg/cputlb.c | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 500503da13..9e47184513 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -218,7 +218,6 @@ struct CPUWatchpoint { * the memory regions get moved around by io_writex. */ typedef struct SavedIOTLB { - hwaddr addr; MemoryRegionSection *section; hwaddr mr_offset; } SavedIOTLB; diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 4585d7c015..03395e725d 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1374,12 +1374,11 @@ static uint64_t io_readx(CPUArchState *env, CPUTLBEntryFull *full, * This is read by tlb_plugin_lookup if the fulltlb entry doesn't match * because of the side effect of io_writex changing memory layout. */ -static void save_iotlb_data(CPUState *cs, hwaddr addr, - MemoryRegionSection *section, hwaddr mr_offset) +static void save_iotlb_data(CPUState *cs, MemoryRegionSection *section, + hwaddr mr_offset) { #ifdef CONFIG_PLUGIN SavedIOTLB *saved = &cs->saved_iotlb; - saved->addr = addr; saved->section = section; saved->mr_offset = mr_offset; #endif @@ -1408,7 +1407,7 @@ static void io_writex(CPUArchState *env, CPUTLBEntryFull *full, * The memory_region_dispatch may trigger a flush/resize * so for plugins we save the iotlb_data just in case. */ - save_iotlb_data(cpu, full->xlat_section, section, mr_offset); + save_iotlb_data(cpu, section, mr_offset); if (!qemu_mutex_iothread_locked()) { qemu_mutex_lock_iothread();