From nobody Tue Feb 10 07:40:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506036772723909.7863175531095; Thu, 21 Sep 2017 16:32:52 -0700 (PDT) Received: from localhost ([::1]:55929 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvAxR-0001Oq-2P for importer@patchew.org; Thu, 21 Sep 2017 19:32:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37146) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvAiA-0004YM-Pg for qemu-devel@nongnu.org; Thu, 21 Sep 2017 19:16:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvAi9-0003qu-5V for qemu-devel@nongnu.org; Thu, 21 Sep 2017 19:16:50 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:35737) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dvAi8-0003oz-U6 for qemu-devel@nongnu.org; Thu, 21 Sep 2017 19:16:49 -0400 Received: by mail-wm0-x243.google.com with SMTP id e64so6456445wmi.2 for ; Thu, 21 Sep 2017 16:16:48 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-246-117.clienti.tiscali.it. [78.12.246.117]) by smtp.gmail.com with ESMTPSA id u186sm2596278wmd.19.2017.09.21.16.16.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Sep 2017 16:16:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=/6WvjNMjGXJXkaYFuQcZnTxN8cJCUK+yEpTo+gs+dfU=; b=Q1FJ6qGnc2waJLDZ99JL/Mtu0DhcCnxNYPTRYcPwhLbOyCz4Dq8Q9HvpNMnfeO0X6h l0c40EfHrhejlfR94BPqS3LZ4jSaTyQuBNxfok1i/+NV/VjdgKpMmDnVbc04q4Iwkl1Y LJk9gcImf1rJgppYk5gio6olHd3wmdszZr1szO1E9cXT74HISi1hIKEqIcoZhl+L3tBX uKRIiM4IhSIaQfM1GFqCWCUGzUaJism5cYNx8SUy800uYwIvqaPu1pLBqEfidxDp2w5v bcvJImSCZhnaVHE/GcX+yacwa9aBF4VPUfvnepBCQJSoBuMCMMsUKdPKCM75UhZXglld 2ilw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=/6WvjNMjGXJXkaYFuQcZnTxN8cJCUK+yEpTo+gs+dfU=; b=EhDBewDYocv1hbOLAxBNPnUHMX7vcC+O+SQpT+Bib7Y6jbc+Hwb6busZ2xuPJr5Rya VTWigIPFQQO5SMeojTHlPVVr/ArtzrWf13ct2QxGRh0fCCNEhil9tFL3rxW1RUuS30Z7 75K2ZKFS37zqFg3VS1+kcV18ePOMNvkKBdSMyJASIwm1aJ9cObhxozq3vUKB9aa9MEKd IDb6qgcH+cjsFDmW0b4FoqZjW5v60sQ/STC92V6lTELj+YRJMSg0l9aqzfxDpUbyIVDM 1xYR6EtTgnJ3wId62/JgiOub2m2GQuZvD8T07uM0Msr2SLktGnH9U7+EjjwmfH5iDTyr mlEA== X-Gm-Message-State: AHPjjUgVuAoGrLC+v5+W836ZdVMWE8jpmegrLq6jhMtfvp2WmM5X1SR4 k4Nms1VsFr3fQxrYjY7GkB+iwAff X-Google-Smtp-Source: AOwi7QAn29e84+sSv5gsU9RFsOFRsnw29SBeJmMEY/omgvFVsL3yI7IvDmpKXi5pyjU+gFrMvb9dCQ== X-Received: by 10.28.166.135 with SMTP id p129mr2349174wme.147.1506035807661; Thu, 21 Sep 2017 16:16:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 22 Sep 2017 01:16:11 +0200 Message-Id: <1506035800-30509-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1506035800-30509-1-git-send-email-pbonzini@redhat.com> References: <1506035800-30509-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PULL 03/32] memory: avoid a name clash with access macro X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: KONRAD Frederic Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: KONRAD Frederic This avoids a name clash with the access macro on windows 64: make CHK version_gen.h CC aarch64-softmmu/memory.o /home/konrad/qemu/memory.c: In function 'access_with_adjusted_size': /home/konrad/qemu/memory.c:591:73: error: macro "access" passed 7 arguments= , \ but takes just 2 (size - access_size - i) * 8, access_mask, attrs); ^ Signed-off-by: KONRAD Frederic Message-Id: <1505988260-8483-1-git-send-email-frederic.konrad@adacore.com> Signed-off-by: Paolo Bonzini --- memory.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/memory.c b/memory.c index b9920a6..2b90117 100644 --- a/memory.c +++ b/memory.c @@ -560,13 +560,14 @@ static MemTxResult access_with_adjusted_size(hwaddr a= ddr, unsigned size, unsigned access_size_min, unsigned access_size_max, - MemTxResult (*access)(MemoryRegion *= mr, - hwaddr addr, - uint64_t *valu= e, - unsigned size, - unsigned shift, - uint64_t mask, - MemTxAttrs att= rs), + MemTxResult (*access_fn) + (MemoryRegion *mr, + hwaddr addr, + uint64_t *value, + unsigned size, + unsigned shift, + uint64_t mask, + MemTxAttrs attrs), MemoryRegion *mr, MemTxAttrs attrs) { @@ -587,12 +588,12 @@ static MemTxResult access_with_adjusted_size(hwaddr a= ddr, access_mask =3D -1ULL >> (64 - access_size * 8); if (memory_region_big_endian(mr)) { for (i =3D 0; i < size; i +=3D access_size) { - r |=3D access(mr, addr + i, value, access_size, + r |=3D access_fn(mr, addr + i, value, access_size, (size - access_size - i) * 8, access_mask, attrs); } } else { for (i =3D 0; i < size; i +=3D access_size) { - r |=3D access(mr, addr + i, value, access_size, i * 8, + r |=3D access_fn(mr, addr + i, value, access_size, i * 8, access_mask, attrs); } } --=20 1.8.3.1