From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:cb43:0:0:0:0:0 with SMTP id b64csp543185lfg; Thu, 20 Feb 2020 05:06:14 -0800 (PST) X-Google-Smtp-Source: APXvYqwFXxy5MQXm1XRZD5AATtMARqzCiSYLwhMSEdGn1ChiXywzgxDNbAS55G9EKGXQ6Xd7lSfk X-Received: by 2002:aca:5083:: with SMTP id e125mr1933404oib.96.1582203974720; Thu, 20 Feb 2020 05:06:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582203974; cv=none; d=google.com; s=arc-20160816; b=tR75FiTYpuf/FOV+ilDLoOnTJ9M4CNC8WzbFmW0NWkVUaIXY09lv1YM8Jub1C93OUT W7V3AMDrO72Yy87N/eQZn86jkj5KlnAOpYwxUvumM93EoWceaF2YSFSSHZOVwW9rOQVb PqSeILrtJUFiDdZ3vmqNTM9Y6R9GQRwiVuXxz0YXqQx/iNCfGTDH3rpYriKxrMX5gFKJ 13t3ZkMh8l3v7cb+0/QuPSJOP1wXCunjml93MTGUWKJ/b2+e2pA3hAkOlI4UptSGhQPb xAUqSursNMHdWCCFLBAl9iPAQwn6PiFp+M/JShHXUvsdy2VCew+3E3ZjUtfUpj5W4PSg 6PQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=uQu7r5A36ZEekF4m32GxNBlLjnOkqxofIVmsz5VZ5cY=; b=gh7ZnxszcMnnFbh/ss6qMIW2yOLxW6iNQ+F2819BLivzmyqGBNU5TrqZThiYulPhfz v6iewujl1XAYdytdhZJTIIz3fHTEeHwZsrfWgkBiH6gx3/s+8RKw8SSZ14khLGn6eYVU uozgukV0lAVe6LasgV+sBlHEwDfa4nDlRiMdDHTe8DGVTCfEtSdTkDTnmj4BcLNDUu/O MPlA1OlVVNLkp/lzUR3h08QD/+1x1HjVFjeBxeEMpo5Do0finhjmaec1vS6V8w4gZdrj 3i1GU1pMKoB7+3tDZLth41MJOlLAmyXVr7/d+/Gw/zYGKNm47adwyq4i4/444l7cN4mk 46bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=VYOjczAh; spf=pass (google.com: best guess record for domain of kvm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=kvm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b2si1957201ots.284.2020.02.20.05.06.14; Thu, 20 Feb 2020 05:06:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of kvm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=VYOjczAh; spf=pass (google.com: best guess record for domain of kvm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=kvm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728144AbgBTNGN (ORCPT + 5 others); Thu, 20 Feb 2020 08:06:13 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:48108 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728115AbgBTNGN (ORCPT ); Thu, 20 Feb 2020 08:06:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582203971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uQu7r5A36ZEekF4m32GxNBlLjnOkqxofIVmsz5VZ5cY=; b=VYOjczAhoyfjENpnkFRJX5Wml7hoySmxVXQpEBqnaGRHBTBY30Y70LJYlGg7jU/yr2aRki XqedvkvPUejJc4ViFA7OzjeMJ84NzhbfiPLLeDrkM/R0tvh3RASyvgmBR/qAQYCxH6aet4 80fKU1wGeb/fG5DsmNyPmjSGUtmhqXE= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-154-9MFw2SXjNISwkSxPnlzfKg-1; Thu, 20 Feb 2020 08:06:10 -0500 X-MC-Unique: 9MFw2SXjNISwkSxPnlzfKg-1 Received: by mail-wr1-f72.google.com with SMTP id m15so1682861wrs.22 for ; Thu, 20 Feb 2020 05:06:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uQu7r5A36ZEekF4m32GxNBlLjnOkqxofIVmsz5VZ5cY=; b=mFuYZta4I19T1rqF4EJzt3Bn+3Hc8i+4bV/Lx7Zi/yHO+/o+cWoYL+/bE9KOyVR72Q m5qWCaaPv7VYow1ZgpOl5wmxDG1NQErr3KmKHidTtiYLvzHpeE53k82X8EvhUBeuD+uo 0C84JHkhHhIJgmyzcParEsi/mecPzBcn4+IcSkn7oLpDTekMv3U0+VEGieCkH8ccO9w0 Grn2mFaAEw/xzMUsUMeUViuG6n1YHsM/y5ElJdALfMsrQZMRfVQKekxKH5nkFGNXfJ8T 7fSfDGq6oF+qg2VwC666oL3Rb9wUkPMjb5NmJlK8T9lvVMNpLGUoLT29PEdw1645HW+X f9pQ== X-Gm-Message-State: APjAAAUS+otV6lqm86lGI+AYkWKMyQdY6PIw/5PjDOzCyouQUiLjyes1 UukJUQ4WRPG6X+px76WPALIc6424OXVawgyneXEDHD9BdchfTh5Ry+Z7Nf9FYtUGyQKVrveBZRB gYBxeXf5CPeIH X-Received: by 2002:a7b:c19a:: with SMTP id y26mr4784707wmi.152.1582203968766; Thu, 20 Feb 2020 05:06:08 -0800 (PST) X-Received: by 2002:a7b:c19a:: with SMTP id y26mr4784676wmi.152.1582203968575; Thu, 20 Feb 2020 05:06:08 -0800 (PST) Received: from localhost.localdomain (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id b67sm4594690wmc.38.2020.02.20.05.06.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:08 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , Anthony Perard , Fam Zheng , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, Laurent Vivier , Thomas Huth , Stefan Weil , Eric Auger , Halil Pasic , Marcel Apfelbaum , qemu-s390x@nongnu.org, Aleksandar Rikalo , David Gibson , Michael Walle , qemu-ppc@nongnu.org, Gerd Hoffmann , Cornelia Huck , qemu-arm@nongnu.org, Alistair Francis , qemu-block@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Jason Wang , xen-devel@lists.xenproject.org, Christian Borntraeger , Dmitry Fleytman , Matthew Rosato , Eduardo Habkost , Richard Henderson , "Michael S. Tsirkin" , David Hildenbrand , Paolo Bonzini , Stefano Stabellini , Igor Mitsyanko , Paul Durrant , Richard Henderson , John Snow Subject: [PATCH v3 04/20] exec: Rename ram_ptr variable Date: Thu, 20 Feb 2020 14:05:32 +0100 Message-Id: <20200220130548.29974-5-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200220130548.29974-1-philmd@redhat.com> References: <20200220130548.29974-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-TUID: 91V4pQ1P5jLf As we are going to use a different 'ptr' variable, rename the 'ram pointer' variable. Signed-off-by: Philippe Mathieu-Daudé --- exec.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/exec.c b/exec.c index 02b4e6ea41..06e386dc72 100644 --- a/exec.c +++ b/exec.c @@ -3151,7 +3151,7 @@ static MemTxResult flatview_write_continue(FlatView *fv, hwaddr addr, hwaddr len, hwaddr addr1, hwaddr l, MemoryRegion *mr) { - uint8_t *ptr; + uint8_t *ram_ptr; uint64_t val; MemTxResult result = MEMTX_OK; bool release_lock = false; @@ -3167,8 +3167,8 @@ static MemTxResult flatview_write_continue(FlatView *fv, hwaddr addr, size_memop(l), attrs); } else { /* RAM case */ - ptr = qemu_ram_ptr_length(mr->ram_block, addr1, &l, false); - memcpy(ptr, buf, l); + ram_ptr = qemu_ram_ptr_length(mr->ram_block, addr1, &l, false); + memcpy(ram_ptr, buf, l); invalidate_and_set_dirty(mr, addr1, l); } @@ -3215,7 +3215,7 @@ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr, hwaddr len, hwaddr addr1, hwaddr l, MemoryRegion *mr) { - uint8_t *ptr; + uint8_t *ram_ptr; uint64_t val; MemTxResult result = MEMTX_OK; bool release_lock = false; @@ -3230,8 +3230,8 @@ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr, stn_he_p(buf, l, val); } else { /* RAM case */ - ptr = qemu_ram_ptr_length(mr->ram_block, addr1, &l, false); - memcpy(buf, ptr, l); + ram_ptr = qemu_ram_ptr_length(mr->ram_block, addr1, &l, false); + memcpy(buf, ram_ptr, l); } if (release_lock) { @@ -3329,7 +3329,7 @@ static inline MemTxResult address_space_write_rom_internal(AddressSpace *as, enum write_rom_type type) { hwaddr l; - uint8_t *ptr; + uint8_t *ram_ptr; hwaddr addr1; MemoryRegion *mr; @@ -3343,14 +3343,14 @@ static inline MemTxResult address_space_write_rom_internal(AddressSpace *as, l = memory_access_size(mr, l, addr1); } else { /* ROM/RAM case */ - ptr = qemu_map_ram_ptr(mr->ram_block, addr1); + ram_ptr = qemu_map_ram_ptr(mr->ram_block, addr1); switch (type) { case WRITE_DATA: - memcpy(ptr, buf, l); + memcpy(ram_ptr, buf, l); invalidate_and_set_dirty(mr, addr1, l); break; case FLUSH_CACHE: - flush_icache_range((uintptr_t)ptr, (uintptr_t)ptr + l); + flush_icache_range((uintptr_t)ram_ptr, (uintptr_t)ram_ptr + l); break; } } -- 2.21.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49ED2C11D05 for ; Thu, 20 Feb 2020 13:06:32 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2046D206ED for ; Thu, 20 Feb 2020 13:06:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Fwo9Jh23" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2046D206ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j4lX1-000151-Dt; Thu, 20 Feb 2020 13:06:19 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j4lWz-00014S-SF for xen-devel@lists.xenproject.org; Thu, 20 Feb 2020 13:06:17 +0000 X-Inumbo-ID: c4b40f1a-53e1-11ea-8526-12813bfff9fa Received: from us-smtp-1.mimecast.com (unknown [207.211.31.120]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id c4b40f1a-53e1-11ea-8526-12813bfff9fa; Thu, 20 Feb 2020 13:06:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582203972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3U8RUDrkQxMnVOOW0OCE6S37E2RIVx9bINi/XXS02Y4=; b=Fwo9Jh234B3yva3Ogz728Qp6nOd0PrJhS5mphIcNxw3I1jRz2yMlv5jtOyCgJpSRSl9TLc ZdIBfmilZWj/QJ/e+iduhSP/LGpgBctWilKzxyLYLwvBArqCgoe4QVb9rlRF02YcDHedgX AvY3VIaaTU8i6LOMPTioErGlLvCeiHA= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-159-MCjdWqK5MGuZ7dScehYHXg-1; Thu, 20 Feb 2020 08:06:10 -0500 Received: by mail-wr1-f70.google.com with SMTP id p8so1713491wrw.5 for ; Thu, 20 Feb 2020 05:06:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uQu7r5A36ZEekF4m32GxNBlLjnOkqxofIVmsz5VZ5cY=; b=SGSQcpDpBxXOtT2mQZ5YbEXZEB8xDpvaj/wi5W1M2CfmRquEb8rkP4wl1yPQJ2G+yY RyrbUsvgx3Qj1O57KO6jcFRFx3b34kDlpGnsbhFWL9ef/wmd9HV4tBVux74WhDwXAp3m vg5ZjikcMEnq2hD1UjNTFWO0+rr6+zK4pPUpnXWX5vXj9eJ+1faroxEc/0nw2m618ouh tARpi5KYIp5QlX0Lyl0/tXng+al9iyUwLxQdPMLmMNGZqS/sEOqk3VtC6wpjZS1U25bF yP1F3WebYPg2MoWkWM+g1ib8rK90beiSVZAAjL2f9be2/GsbB4MEq7DNKXeCCGDiXnz6 Xmtw== X-Gm-Message-State: APjAAAXwyy/6xTcCXpFh+6MxyuPuxEL4JtkbSlMkfnYbfRHrjHjtqRe0 D7PzbNucggXsp+0eTt5SDwVHGofvuV6kfVFgvBJyfqTLEHqIHNSGhSj95R18QTY0qIWWvDgThui nkZjLxeQDSEtHwhY2LVd4nIPQ+hY= X-Received: by 2002:a7b:c19a:: with SMTP id y26mr4784706wmi.152.1582203968766; Thu, 20 Feb 2020 05:06:08 -0800 (PST) X-Google-Smtp-Source: APXvYqyE66uIDK1qcY0whocMHGuc5UiGXXzMSpfPUxCMQ6ki2ViRoHWEoIvgwkFHTsmW7YQNGkg7QA== X-Received: by 2002:a7b:c19a:: with SMTP id y26mr4784676wmi.152.1582203968575; Thu, 20 Feb 2020 05:06:08 -0800 (PST) Received: from localhost.localdomain (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id b67sm4594690wmc.38.2020.02.20.05.06.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:08 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Date: Thu, 20 Feb 2020 14:05:32 +0100 Message-Id: <20200220130548.29974-5-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200220130548.29974-1-philmd@redhat.com> References: <20200220130548.29974-1-philmd@redhat.com> MIME-Version: 1.0 X-MC-Unique: MCjdWqK5MGuZ7dScehYHXg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [Xen-devel] [PATCH v3 04/20] exec: Rename ram_ptr variable X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Dmitry Fleytman , kvm@vger.kernel.org, "Michael S. Tsirkin" , Jason Wang , Gerd Hoffmann , "Edgar E. Iglesias" , Stefano Stabellini , Matthew Rosato , qemu-block@nongnu.org, David Hildenbrand , Halil Pasic , Christian Borntraeger , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Marcel Apfelbaum , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , Thomas Huth , Eduardo Habkost , Stefan Weil , Alistair Francis , Richard Henderson , Paul Durrant , Eric Auger , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , David Gibson , Igor Mitsyanko , Cornelia Huck , Michael Walle , qemu-ppc@nongnu.org, Paolo Bonzini Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" QXMgd2UgYXJlIGdvaW5nIHRvIHVzZSBhIGRpZmZlcmVudCAncHRyJyB2YXJpYWJsZSwgcmVuYW1l IHRoZSAncmFtCnBvaW50ZXInIHZhcmlhYmxlLgoKU2lnbmVkLW9mZi1ieTogUGhpbGlwcGUgTWF0 aGlldS1EYXVkw6kgPHBoaWxtZEByZWRoYXQuY29tPgotLS0KIGV4ZWMuYyB8IDIwICsrKysrKysr KystLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZXhlYy5jIGIvZXhlYy5jCmluZGV4IDAyYjRlNmVhNDEuLjA2 ZTM4NmRjNzIgMTAwNjQ0Ci0tLSBhL2V4ZWMuYworKysgYi9leGVjLmMKQEAgLTMxNTEsNyArMzE1 MSw3IEBAIHN0YXRpYyBNZW1UeFJlc3VsdCBmbGF0dmlld193cml0ZV9jb250aW51ZShGbGF0Vmll dyAqZnYsIGh3YWRkciBhZGRyLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGh3YWRkciBsZW4sIGh3YWRkciBhZGRyMSwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBod2FkZHIgbCwgTWVtb3J5UmVnaW9uICptcikKIHsKLSAgICB1 aW50OF90ICpwdHI7CisgICAgdWludDhfdCAqcmFtX3B0cjsKICAgICB1aW50NjRfdCB2YWw7CiAg ICAgTWVtVHhSZXN1bHQgcmVzdWx0ID0gTUVNVFhfT0s7CiAgICAgYm9vbCByZWxlYXNlX2xvY2sg PSBmYWxzZTsKQEAgLTMxNjcsOCArMzE2Nyw4IEBAIHN0YXRpYyBNZW1UeFJlc3VsdCBmbGF0dmll d193cml0ZV9jb250aW51ZShGbGF0VmlldyAqZnYsIGh3YWRkciBhZGRyLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2l6ZV9tZW1vcChsKSwgYXR0 cnMpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgLyogUkFNIGNhc2UgKi8KLSAgICAg ICAgICAgIHB0ciA9IHFlbXVfcmFtX3B0cl9sZW5ndGgobXItPnJhbV9ibG9jaywgYWRkcjEsICZs LCBmYWxzZSk7Ci0gICAgICAgICAgICBtZW1jcHkocHRyLCBidWYsIGwpOworICAgICAgICAgICAg cmFtX3B0ciA9IHFlbXVfcmFtX3B0cl9sZW5ndGgobXItPnJhbV9ibG9jaywgYWRkcjEsICZsLCBm YWxzZSk7CisgICAgICAgICAgICBtZW1jcHkocmFtX3B0ciwgYnVmLCBsKTsKICAgICAgICAgICAg IGludmFsaWRhdGVfYW5kX3NldF9kaXJ0eShtciwgYWRkcjEsIGwpOwogICAgICAgICB9CiAKQEAg LTMyMTUsNyArMzIxNSw3IEBAIE1lbVR4UmVzdWx0IGZsYXR2aWV3X3JlYWRfY29udGludWUoRmxh dFZpZXcgKmZ2LCBod2FkZHIgYWRkciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgaHdhZGRyIGxlbiwgaHdhZGRyIGFkZHIxLCBod2FkZHIgbCwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgTWVtb3J5UmVnaW9uICptcikKIHsKLSAgICB1aW50OF90ICpwdHI7 CisgICAgdWludDhfdCAqcmFtX3B0cjsKICAgICB1aW50NjRfdCB2YWw7CiAgICAgTWVtVHhSZXN1 bHQgcmVzdWx0ID0gTUVNVFhfT0s7CiAgICAgYm9vbCByZWxlYXNlX2xvY2sgPSBmYWxzZTsKQEAg LTMyMzAsOCArMzIzMCw4IEBAIE1lbVR4UmVzdWx0IGZsYXR2aWV3X3JlYWRfY29udGludWUoRmxh dFZpZXcgKmZ2LCBod2FkZHIgYWRkciwKICAgICAgICAgICAgIHN0bl9oZV9wKGJ1ZiwgbCwgdmFs KTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIC8qIFJBTSBjYXNlICovCi0gICAgICAg ICAgICBwdHIgPSBxZW11X3JhbV9wdHJfbGVuZ3RoKG1yLT5yYW1fYmxvY2ssIGFkZHIxLCAmbCwg ZmFsc2UpOwotICAgICAgICAgICAgbWVtY3B5KGJ1ZiwgcHRyLCBsKTsKKyAgICAgICAgICAgIHJh bV9wdHIgPSBxZW11X3JhbV9wdHJfbGVuZ3RoKG1yLT5yYW1fYmxvY2ssIGFkZHIxLCAmbCwgZmFs c2UpOworICAgICAgICAgICAgbWVtY3B5KGJ1ZiwgcmFtX3B0ciwgbCk7CiAgICAgICAgIH0KIAog ICAgICAgICBpZiAocmVsZWFzZV9sb2NrKSB7CkBAIC0zMzI5LDcgKzMzMjksNyBAQCBzdGF0aWMg aW5saW5lIE1lbVR4UmVzdWx0IGFkZHJlc3Nfc3BhY2Vfd3JpdGVfcm9tX2ludGVybmFsKEFkZHJl c3NTcGFjZSAqYXMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGVudW0gd3JpdGVfcm9tX3R5cGUgdHlwZSkKIHsKICAgICBod2FkZHIg bDsKLSAgICB1aW50OF90ICpwdHI7CisgICAgdWludDhfdCAqcmFtX3B0cjsKICAgICBod2FkZHIg YWRkcjE7CiAgICAgTWVtb3J5UmVnaW9uICptcjsKIApAQCAtMzM0MywxNCArMzM0MywxNCBAQCBz dGF0aWMgaW5saW5lIE1lbVR4UmVzdWx0IGFkZHJlc3Nfc3BhY2Vfd3JpdGVfcm9tX2ludGVybmFs KEFkZHJlc3NTcGFjZSAqYXMsCiAgICAgICAgICAgICBsID0gbWVtb3J5X2FjY2Vzc19zaXplKG1y LCBsLCBhZGRyMSk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAvKiBST00vUkFNIGNh c2UgKi8KLSAgICAgICAgICAgIHB0ciA9IHFlbXVfbWFwX3JhbV9wdHIobXItPnJhbV9ibG9jaywg YWRkcjEpOworICAgICAgICAgICAgcmFtX3B0ciA9IHFlbXVfbWFwX3JhbV9wdHIobXItPnJhbV9i bG9jaywgYWRkcjEpOwogICAgICAgICAgICAgc3dpdGNoICh0eXBlKSB7CiAgICAgICAgICAgICBj YXNlIFdSSVRFX0RBVEE6Ci0gICAgICAgICAgICAgICAgbWVtY3B5KHB0ciwgYnVmLCBsKTsKKyAg ICAgICAgICAgICAgICBtZW1jcHkocmFtX3B0ciwgYnVmLCBsKTsKICAgICAgICAgICAgICAgICBp bnZhbGlkYXRlX2FuZF9zZXRfZGlydHkobXIsIGFkZHIxLCBsKTsKICAgICAgICAgICAgICAgICBi cmVhazsKICAgICAgICAgICAgIGNhc2UgRkxVU0hfQ0FDSEU6Ci0gICAgICAgICAgICAgICAgZmx1 c2hfaWNhY2hlX3JhbmdlKCh1aW50cHRyX3QpcHRyLCAodWludHB0cl90KXB0ciArIGwpOworICAg ICAgICAgICAgICAgIGZsdXNoX2ljYWNoZV9yYW5nZSgodWludHB0cl90KXJhbV9wdHIsICh1aW50 cHRyX3QpcmFtX3B0ciArIGwpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAg fQogICAgICAgICB9Ci0tIAoyLjIxLjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54 ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGlu Zm8veGVuLWRldmVs From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27747C11D04 for ; Thu, 20 Feb 2020 13:12:10 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E1D08206ED for ; Thu, 20 Feb 2020 13:12:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KhxgHIVk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E1D08206ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4lce-00073L-Vn for qemu-devel@archiver.kernel.org; Thu, 20 Feb 2020 08:12:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55704) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4lWw-0004RW-SS for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4lWv-0004st-Hl for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:14 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:32604 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j4lWv-0004sZ-DX for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582203973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3U8RUDrkQxMnVOOW0OCE6S37E2RIVx9bINi/XXS02Y4=; b=KhxgHIVkUDuYVOm6JJkYCP8eRrERMOLmKZp5leu6GoT3BE/JhOzqX8lxi+SuN/SB7ILW+M PtHgWmJ1KxL9idIj7Cuf1fNOWN8YfyEpdhWzcnWG7ei537OPD78hyGX0zfCf5nE2tN1y5z +WflVHg5RZ7f5VlOYp8N/3ZchaE7VJU= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-174-IDHSw1WzOTybIF6eoIfNsA-1; Thu, 20 Feb 2020 08:06:11 -0500 Received: by mail-wm1-f70.google.com with SMTP id f66so577573wmf.9 for ; Thu, 20 Feb 2020 05:06:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uQu7r5A36ZEekF4m32GxNBlLjnOkqxofIVmsz5VZ5cY=; b=HNiVRgjKa5TfvREPD2uz2fVayBbaQeMS7r2nUrGme3LlIgSdJdFY313gLU0bUdi0Rh Vdf07u7L7/wAjFgrHPQtx1bCwINiC6wZBHQWisqC8qWiRxCSyc/YEoE3621pc4MacstF +Apj7kA7UbiZRev2m2zemOY1ANqHkm7a7aCFXs5wCuD5mSZVG76xKRAumFwjQAsk/OVW J02FAyiS59EE36oC4YJbR2BTV78x+6LLzmCYXtybL1xd0pwB7gkuHo72J98IKNaYov6W BFys4g7j+koDSb7D5McPg3TIiwclJ9z9YNwmtmK+D45g2nIzlrcAC+gOTItB0vYY/EDO SUvg== X-Gm-Message-State: APjAAAWp+HAdj6geYIoGwnQA8NQ5AJt0lGkXRlN3Cfl8IcMluzEvJ+jL 0np/7+79eyMWlZXee0kzullKgHM9wu4pJm25mR6U8oKALSwX4FmKC1puCr0LByqlQHNc5pLQ7Ot I54voRBdMnt7I7N4= X-Received: by 2002:a7b:c19a:: with SMTP id y26mr4784713wmi.152.1582203968767; Thu, 20 Feb 2020 05:06:08 -0800 (PST) X-Google-Smtp-Source: APXvYqyE66uIDK1qcY0whocMHGuc5UiGXXzMSpfPUxCMQ6ki2ViRoHWEoIvgwkFHTsmW7YQNGkg7QA== X-Received: by 2002:a7b:c19a:: with SMTP id y26mr4784676wmi.152.1582203968575; Thu, 20 Feb 2020 05:06:08 -0800 (PST) Received: from localhost.localdomain (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id b67sm4594690wmc.38.2020.02.20.05.06.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:08 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Subject: [PATCH v3 04/20] exec: Rename ram_ptr variable Date: Thu, 20 Feb 2020 14:05:32 +0100 Message-Id: <20200220130548.29974-5-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200220130548.29974-1-philmd@redhat.com> References: <20200220130548.29974-1-philmd@redhat.com> MIME-Version: 1.0 X-MC-Unique: IDHSw1WzOTybIF6eoIfNsA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Dmitry Fleytman , kvm@vger.kernel.org, "Michael S. Tsirkin" , Jason Wang , Gerd Hoffmann , "Edgar E. Iglesias" , Stefano Stabellini , Matthew Rosato , qemu-block@nongnu.org, David Hildenbrand , Halil Pasic , Christian Borntraeger , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , Thomas Huth , Eduardo Habkost , Stefan Weil , Alistair Francis , Richard Henderson , Paul Durrant , Eric Auger , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , David Gibson , Igor Mitsyanko , Cornelia Huck , Michael Walle , qemu-ppc@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" As we are going to use a different 'ptr' variable, rename the 'ram pointer' variable. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- exec.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/exec.c b/exec.c index 02b4e6ea41..06e386dc72 100644 --- a/exec.c +++ b/exec.c @@ -3151,7 +3151,7 @@ static MemTxResult flatview_write_continue(FlatView *= fv, hwaddr addr, hwaddr len, hwaddr addr1, hwaddr l, MemoryRegion *mr) { - uint8_t *ptr; + uint8_t *ram_ptr; uint64_t val; MemTxResult result =3D MEMTX_OK; bool release_lock =3D false; @@ -3167,8 +3167,8 @@ static MemTxResult flatview_write_continue(FlatView *= fv, hwaddr addr, size_memop(l), attrs); } else { /* RAM case */ - ptr =3D qemu_ram_ptr_length(mr->ram_block, addr1, &l, false); - memcpy(ptr, buf, l); + ram_ptr =3D qemu_ram_ptr_length(mr->ram_block, addr1, &l, fals= e); + memcpy(ram_ptr, buf, l); invalidate_and_set_dirty(mr, addr1, l); } =20 @@ -3215,7 +3215,7 @@ MemTxResult flatview_read_continue(FlatView *fv, hwad= dr addr, hwaddr len, hwaddr addr1, hwaddr l, MemoryRegion *mr) { - uint8_t *ptr; + uint8_t *ram_ptr; uint64_t val; MemTxResult result =3D MEMTX_OK; bool release_lock =3D false; @@ -3230,8 +3230,8 @@ MemTxResult flatview_read_continue(FlatView *fv, hwad= dr addr, stn_he_p(buf, l, val); } else { /* RAM case */ - ptr =3D qemu_ram_ptr_length(mr->ram_block, addr1, &l, false); - memcpy(buf, ptr, l); + ram_ptr =3D qemu_ram_ptr_length(mr->ram_block, addr1, &l, fals= e); + memcpy(buf, ram_ptr, l); } =20 if (release_lock) { @@ -3329,7 +3329,7 @@ static inline MemTxResult address_space_write_rom_int= ernal(AddressSpace *as, enum write_rom_= type type) { hwaddr l; - uint8_t *ptr; + uint8_t *ram_ptr; hwaddr addr1; MemoryRegion *mr; =20 @@ -3343,14 +3343,14 @@ static inline MemTxResult address_space_write_rom_i= nternal(AddressSpace *as, l =3D memory_access_size(mr, l, addr1); } else { /* ROM/RAM case */ - ptr =3D qemu_map_ram_ptr(mr->ram_block, addr1); + ram_ptr =3D qemu_map_ram_ptr(mr->ram_block, addr1); switch (type) { case WRITE_DATA: - memcpy(ptr, buf, l); + memcpy(ram_ptr, buf, l); invalidate_and_set_dirty(mr, addr1, l); break; case FLUSH_CACHE: - flush_icache_range((uintptr_t)ptr, (uintptr_t)ptr + l); + flush_icache_range((uintptr_t)ram_ptr, (uintptr_t)ram_ptr = + l); break; } } --=20 2.21.1