From patchwork Mon Sep 5 20:22:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 602755 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp3957796mae; Mon, 5 Sep 2022 13:28:02 -0700 (PDT) X-Google-Smtp-Source: AA6agR5TwkIx6a2xsB6u0MwFnnaaLVJV0g1T590GxcklZMSPnpfsc3a53Ofx9JVfOezFCPPFD0H4 X-Received: by 2002:ac8:7d84:0:b0:344:662d:278c with SMTP id c4-20020ac87d84000000b00344662d278cmr40106659qtd.513.1662409682185; Mon, 05 Sep 2022 13:28:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662409682; cv=none; d=google.com; s=arc-20160816; b=TZ5sOo28oqf84iROIw/Kuq8gmn1k4OzkxyReHwbJfTpPG0gQ0eB+qbQEBfBMyihE5a CJ9oXG1T1tyZgtt7uwW1QnTaBM2AN8ZcV2rc3Qb5T4uVqKhFay7ynvkA3I0jsVoafZhF PyNJCoTI7LRkaf3XBzRgI+g6zfx32LySgm6fOQmm3/w6BJXVIsvmvJt1hWAC9goMdpHy JsbS0O+gTFuG+Ww08tJ6F4xQti5b72tTfUnscf9ppTF8QwuYH4QpvdT9wbDvfROoynH4 F8R3BbLkAKYsqdeGEgl3b67RtFWipuirBZg3bDHnVUpkvNE+cMb1AAOLqobqWMxO93qU AtRg== 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=eGrlsO0BMtQ4NxQnZcrpPpgvXA47KiMUFyTlQ1QqPPg=; b=G/6XwUgkJ8UXtGGvMFGn9lmJuCPA5pjEMCxYk1jh0Wudm913+pegLBsafYUy5lfXT1 dIcWF7svZASrb2XgiKjm3oIEPi9cU7LqKJdb8OzCKuxGddUN2Ij1HLgvgXi4bgZBNPxx mzXBIcJKArAgKjuw1h4GvSTW6j14GphlzQEX822h5kGxbLJYWazCaEZEc+bS1cmih/AY qc2h5P0GTEHI3mJtvke5MbAXNBOtMwS2ncqB1MOmopHYFnH7QlLXJPIU99USzeCxpy5R hedzkQqCn6B5qCSyVkrBytboRs7lH6l7nR3ZurXeHaXS8JwuPBr5YBnff5htFb4Sgksb 3PWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LRp8+N3X; 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 k10-20020ac8074a000000b0031ef8371560si5592912qth.736.2022.09.05.13.28.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 05 Sep 2022 13:28:02 -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=LRp8+N3X; 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]:38824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oVIhN-0004TM-P8 for patch@linaro.org; Mon, 05 Sep 2022 16:28:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVIci-00079G-JT for qemu-devel@nongnu.org; Mon, 05 Sep 2022 16:23:12 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:38604) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oVIcc-0004XN-Gy for qemu-devel@nongnu.org; Mon, 05 Sep 2022 16:23:11 -0400 Received: by mail-wr1-x436.google.com with SMTP id b5so12634517wrr.5 for ; Mon, 05 Sep 2022 13:23:06 -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=eGrlsO0BMtQ4NxQnZcrpPpgvXA47KiMUFyTlQ1QqPPg=; b=LRp8+N3XL1ner0hOP84QK19qNd5NWTnug8fA2epM5FIjqPNiqDmJOIJ/Uh39TY1hWJ xA2llEheBoDn29HR7Ufg2ckrxaW/X0S1Jp1ugrkMKFdIZAtLBdyV7cXJJnFSmWU/aqHC ysgY7wWZocgSs+BqDMQA3l3+6NzmMII00vXVZZEiM+NXfO3cCvMOVxJVuNPng1E6Rg/Z haX6yDnXyntzVVd8uNU+CQTNzcDSIJxoJ0HedphCR5pp6jdgyUJAgSYiSZWwQ1Be79Jj WV/eSgQH2mPeOw9KKuJMfSCii6URm9FADwVYg2nOmUXPMFECrYe4KzTnXSYo+ycYumtd nugA== 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=eGrlsO0BMtQ4NxQnZcrpPpgvXA47KiMUFyTlQ1QqPPg=; b=dY0fDF+YpaQ3sy8usqIl+8SKrzrgRSRc1srchlIOKrDMP6JRwKBiDovoH24oLcQNqc 325zeIYv+JWV67oqISX3TRSweo08bcnVMtd0MmbInr7Sud8W4asLLUedAKSLD3q9xNOd 3p9s9Nul2Qlq1Uk1WQ+SbQlg6hBrhUhX4J33MZl8pkFctZxD7ONdpHRoh/txWo64jWMQ Q6qA/vdV1qhHjXQTHPPUMyLZNpCGMQEkQ8sfVhsK/KkSm6O2/9uDEa4Az2zeR3pvXnz7 hpmcQINx1oC10A4IIwkkgHyCHFoYci/D0oRc89rZzlCcH641SVTGz+/nP8KFrK+o+gfH 0xxg== X-Gm-Message-State: ACgBeo233OdeX660B4jMMqhqrRVoxOm63+T40/2AMGdwLB0Ma1yGccOY /Q/y07iFnvbkRQiPmI16oTqL0RDVYQ1Dn2PE X-Received: by 2002:adf:f8ca:0:b0:226:e456:1896 with SMTP id f10-20020adff8ca000000b00226e4561896mr753191wrq.177.1662409384140; Mon, 05 Sep 2022 13:23:04 -0700 (PDT) Received: from localhost.localdomain ([2a02:8084:a5c0:5a80:d0ad:82b5:d7a4:c0a9]) by smtp.gmail.com with ESMTPSA id m14-20020a5d56ce000000b00226d238be98sm9472404wrw.82.2022.09.05.13.23.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Sep 2022 13:23:03 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: f4bug@amsat.org, qemu-arm@nongnu.org, pbonzini@redhat.com Subject: [PATCH v3 2/6] accel/tcg: Drop addr member from SavedIOTLB Date: Mon, 5 Sep 2022 21:22:55 +0100 Message-Id: <20220905202259.189852-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220905202259.189852-1-richard.henderson@linaro.org> References: <20220905202259.189852-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=richard.henderson@linaro.org; helo=mail-wr1-x436.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, T_SCC_BODY_TEXT_LINE=-0.01 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. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell --- 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();