From patchwork Tue Oct 4 19:52:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 612307 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp401361pvb; Tue, 4 Oct 2022 13:06:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4O+1SSFv0fbkt4/kfx5ttl516Lr7F/ng8zIKLCCdD6rtSQeQffHOpF8cGKtHZ+QOR241Yq X-Received: by 2002:a05:620a:2a0c:b0:6cf:9085:683b with SMTP id o12-20020a05620a2a0c00b006cf9085683bmr17981357qkp.159.1664914016923; Tue, 04 Oct 2022 13:06:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664914016; cv=none; d=google.com; s=arc-20160816; b=BTRrZvDdxsGEME4yJ1HPzBpFGrfaE88Qq043ZOqaMBjVgD4SeothR+OpNYRgdPpfqx mBPzACtGKf7EKA/8bzv2euf3Ku3hIwtP3bc1L9sbaioXa820kYqzoEKW6liogWFnxJib 4LW0yzjpNO8ND5GlCu5kUOHQwuohSK39JPSHWR8+gS9J9vPYRoIUtuqIsNrYYAmxy996 gipkXAOS2VYfqk7IMmFdtteAHsc6EiPC7qG4hBHb1fQfDGoXjx+79dWIv84DBhfQE++z vVSwLKn6sUgST6kREDhWvGph4Vhh4drjr5fGD7N7NmZ6y/HrdTxUfKYfxpcXp1bgTUUn 1vAw== 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=z6NCzPC6tE1OG0rvY3WzwqtBapUdS48hi6o10eMrDQY=; b=XmLmqDbWFI9Xk4+zF/YEDiSKW9+oAC6gl2chFl53rOKXP3oz3o8Q/QW+fUnPB6L9hQ 111kzmqfHlrJGiJZWgx1vrngrWM9p6i6U2LI3VhUoHtdr98Ag6/5Uwj3aMcYIeEXfpjN UQFtmAvRlc7bBUzjvxwEz8eJrlfh/gy9Q+ozXNpepR4+fcinUWP0sRghc3Nn40Xf6xEm +dTEc9FfeosdD1ub85b1qmWgp7QwD6hf9ZHmMvXQVSxDT3AJvrefB8WEEuYVdjQNphb6 mbunktUdDvKfAlr+GxRrN8DIxfaU05wwdUYJ5rLlzKY7hR7BWHtlT9sUy8EiLvXbTG2a vEyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sB2O+93J; 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 s1-20020a05622a018100b0031ee8d156cesi918352qtw.359.2022.10.04.13.06.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Oct 2022 13:06:56 -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=sB2O+93J; 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]:32794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ofoBs-0005sH-Bw for patch@linaro.org; Tue, 04 Oct 2022 16:06:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41264) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ofnyE-0001hx-Mu for qemu-devel@nongnu.org; Tue, 04 Oct 2022 15:52:51 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]:43943) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ofnyD-0000Fv-4N for qemu-devel@nongnu.org; Tue, 04 Oct 2022 15:52:50 -0400 Received: by mail-pl1-x629.google.com with SMTP id z20so7029124plb.10 for ; Tue, 04 Oct 2022 12:52:48 -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=z6NCzPC6tE1OG0rvY3WzwqtBapUdS48hi6o10eMrDQY=; b=sB2O+93JRgNMyj3Q75ejeAZhVarfc/per4TQUzgVCnuPhBUa8RbVmNPDDGeRyqdce5 /FozoEVDJ7CGhApviHqWXmoIyxFOqPacGWHR86qJXYmuMkko7QlMFtap7rXlQlYOaWkv zyjRpInB+YbcJRenK3hTnAZ3jkZHqDrcUJA5cUk90ZF6nfsJaECPIZFnRg8LjIC1Ey6R oLNnY8UI2BxUKK4hcxLaVtTsiuBUVGEkl94MOOyOGkXYbQQAdUNtWZI7Gqw+rTUVzIL4 nJ9pePrnzrS63MucUK8JAi6SbN+2x1H9SSpoQPHXlSJRuH5TMJtA7plAC8EJwO1jv1md Y2Rw== 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=z6NCzPC6tE1OG0rvY3WzwqtBapUdS48hi6o10eMrDQY=; b=Zi4uQFSLiqlnhMetJ3KQnm9nDOkLSiJI7J4swX8Et8t5fBoYvBtddBqLfELeBn10gJ 4kPf/JcVtLQrPo8kDqNaP8C9rW9n95kqiRv6EzCrvrN7M17OUqhiFQvMak98ttmazdTD SfOkQVIkIz88rXWeLLDIw/Ioaj755f8SwII3o60Tn0gRM68/y/SSHXdqWREoB46pikWf tgXE34rR0xymAR8QM6GdxijFr4mbutOVa3i/E/yCUR81PYcvtSOWu/Ltu5BZReyGKQr1 nNGZwC/kVY22xmbCXe7uppHbJYRm0VftfABzw3fd7iLHkHnfcOyvQ2CfAKj2wzjq1NRZ JPYQ== X-Gm-Message-State: ACrzQf3qxNC3l2+jWHqRDsV3iAFGW0bwdWXWFsf+2vKyRz5BfEy1DO75 urk6RSbCzhsRvZCdEjbjZbBatzDbWzZfSQ== X-Received: by 2002:a17:902:8548:b0:179:e4db:42e0 with SMTP id d8-20020a170902854800b00179e4db42e0mr28561649plo.0.1664913167660; Tue, 04 Oct 2022 12:52:47 -0700 (PDT) Received: from stoup.. ([2602:47:d49d:ec01:526e:3326:a84e:e5e3]) by smtp.gmail.com with ESMTPSA id u23-20020a1709026e1700b00172973d3cd9sm9293406plk.55.2022.10.04.12.52.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Oct 2022 12:52:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PULL 05/20] accel/tcg: Drop addr member from SavedIOTLB Date: Tue, 4 Oct 2022 12:52:26 -0700 Message-Id: <20221004195241.46491-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221004195241.46491-1-richard.henderson@linaro.org> References: <20221004195241.46491-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::629; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x629.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: Alex Bennée Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- 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 1a7e1a9380..009dc0d336 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -225,7 +225,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 aa22f578cb..d06ff44ce9 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1372,12 +1372,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 @@ -1406,7 +1405,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();