From patchwork Tue May 1 08:59:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 134741 Delivered-To: patches@linaro.org Received: by 10.46.151.6 with SMTP id r6csp4726994lji; Tue, 1 May 2018 01:59:44 -0700 (PDT) X-Google-Smtp-Source: AB8JxZr7uS3xWNzjrsB/fWMQBLsxqVJTxutSxFBZVxc6IPck+RiLTNyR96J67zsXEkEKyNdggAxR X-Received: by 10.28.125.74 with SMTP id y71mr8966564wmc.89.1525165184631; Tue, 01 May 2018 01:59:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525165184; cv=none; d=google.com; s=arc-20160816; b=E0xLEGr2hEX5Nbgn8lv4VqxTkOps7VbOJY1mhBOgWjsIxe03QKqLHlDaraoeeg27yc oeYzzCacGFJtLG3xQk2RWa2E5zrnCzK8Eq5g/gGSlDyx9XVlm+4qPiEaVBFcu5yWkrCV nOM9W1SaVYds+AM9dNRGhxlfSgoqpQiBpmA0MOmk+NulMloyv6SOcMYus0THnorRhHnR FLUj+aPePVJh/PpUGmYT2ZKoSNq2UKPWMz3cG7x+D38rjB+ZyMkQe+JrCvXy9zdr3WLs hd/UTwgvDzXTQ308Oilvc5AGcBC3OglezH4bzF3wvLYWjoEJqk+Zi43R0y1v/8NKFYv5 awbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=3TeXuL6VqfVGwfaUblOMO5MSA1zDllE393cEcp06tk8=; b=uQOqAfJUYQGtNX8bW2tRko66U2PcN/yShErlvd8Jg5G0EDugZI4TTtifWfwFQGA7hS u9U7LHiFwpc8HkwO4LVhejs0D9iscFHtDvTlAUy46QrQeWFpnNCmjtvAdg1vuvYz0EGu gqFNZ6nng/2ufpWY2QUA80t+CnG6wiKHeI38Ridr6bP7BYdrkMdJ5a03g2FBLckKlEF3 IKL3iwCc9bHSFcNewg1RexTTGjiQrtU6dINLXmbLHgvTrt9oAfB7Vpt3N5n/cMq478LM EftI2XMHLq//CwIqyWYHrJ2LADkGvdlJSgZQ8oyEC2DtBjdjRsQQxaKTBvjmGdmawrGO rVOw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id a204si6790040wmf.129.2018.05.01.01.59.44 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 May 2018 01:59:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fDR8S-0007N9-68; Tue, 01 May 2018 09:59:44 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Paolo Bonzini , Eric Auger Subject: [RFC PATCH v2 05/12] Make flatview_extend_translation() take a MemTxAttrs argument Date: Tue, 1 May 2018 09:59:32 +0100 Message-Id: <20180501085939.6201-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180501085939.6201-1-peter.maydell@linaro.org> References: <20180501085939.6201-1-peter.maydell@linaro.org> As part of plumbing MemTxAttrs down to the IOMMU translate method, add MemTxAttrs as an argument to flatview_extend_translation(). Its callers either have an attrs value to hand, or don't care and can use MEMTXATTRS_UNSPECIFIED. Signed-off-by: Peter Maydell --- exec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.17.0 diff --git a/exec.c b/exec.c index 87650dc7ed..e56c3442c7 100644 --- a/exec.c +++ b/exec.c @@ -3460,9 +3460,9 @@ bool address_space_access_valid(AddressSpace *as, hwaddr addr, static hwaddr flatview_extend_translation(FlatView *fv, hwaddr addr, - hwaddr target_len, - MemoryRegion *mr, hwaddr base, hwaddr len, - bool is_write) + hwaddr target_len, + MemoryRegion *mr, hwaddr base, hwaddr len, + bool is_write, MemTxAttrs attrs) { hwaddr done = 0; hwaddr xlat; @@ -3539,7 +3539,7 @@ void *address_space_map(AddressSpace *as, memory_region_ref(mr); *plen = flatview_extend_translation(fv, addr, len, mr, xlat, - l, is_write); + l, is_write, attrs); ptr = qemu_ram_ptr_length(mr->ram_block, xlat, plen, true); rcu_read_unlock();