From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:cb43:0:0:0:0:0 with SMTP id b64csp543272lfg; Thu, 20 Feb 2020 05:06:18 -0800 (PST) X-Google-Smtp-Source: APXvYqzZhjMgG9iiM3goNF9NjtLvLBXYlmHyhEUPxeC7p0GOO2GL/FS1yE9v+i74qu/+5kRq/3PV X-Received: by 2002:a54:4091:: with SMTP id i17mr1938378oii.99.1582203978418; Thu, 20 Feb 2020 05:06:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582203978; cv=none; d=google.com; s=arc-20160816; b=cH+7wwA93RkWAxzCL3aaMOBbd5fSopitDq//s3Sw8bjibmFbANApplN1dQ8WSKe5g8 9xn/6XYVEPGtBk7Vb0GUjZa74C+4pV4o4DdsNjw7BzBvXa0GLUp5GQPTtNfcLWq7uCCD HgaG03/yaq/UwPVyLXDXZjlXgeNMKEIyo2gKBAr1tluKJVk0NNHVXAEraUQBARgJfiQB xG4UVFhFnk2wgKXN+7bvF/TQsbLcpUYDsnve2Tfo424M/GvdDjGv1FqyXi0GaE11Q+FE xnLz5YcKvGvW9lT0vt0yjO9Vfnq+XqSnXIxe6npb7q0ci0bsGDlMDjTCO76Yju9LNIrB kuHw== 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=HHWlfXnpQqqcljyzd6YNAX2WRGDbItCch3DvOI+vpOQ=; b=HKeVMxk9agOCgNZimNwGlWLctXlxf621/ztKbiSHiAoV0VXRgP8mS54JiuwSDxIjSe smHqmVDn7hV/A/wCtwz560gGm338D5w2K300Vrz5XXfdG3oZ8FOa+yC9uSaR1e3+xzFx 8gaxib1xOQTt9cuwQfxMNdUmkIWoauW4F6VT0ixvc35yj563DqOQy30Tz7O/pl+u+EWs NlkYSMQpbyCea2Hv4/8XqBysFENJ0fG4+pcNjLErGQNyTB6HbGHZwvNiT6E22jZSV8a3 wlalROG/3b+O0hw4N58Z4iR+CkmU3r/NLFzv1n5qRZz+0vuCK4d/nPHWY/KV39edV+fE VVCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=T+HlGPSZ; 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.18; Thu, 20 Feb 2020 05:06:18 -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=T+HlGPSZ; 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 S1728117AbgBTNGR (ORCPT + 5 others); Thu, 20 Feb 2020 08:06:17 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:52266 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728096AbgBTNGQ (ORCPT ); Thu, 20 Feb 2020 08:06:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582203975; 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=HHWlfXnpQqqcljyzd6YNAX2WRGDbItCch3DvOI+vpOQ=; b=T+HlGPSZPZl57fRrVdfVB3niHlNbiZy9QuIRjPoU3TlnMY8hvWB/TlO7scA4tDyUI+jhSa RErQREcq8TUXB0aQOTcycJL6G8QuNI/1G+CcGNn5BeXvG9Yep7ajMDIjAQhX12sEiPmqoA lBOp5h2z9pBE36K1WjgSIBI4/kDeom4= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-412-PPfB_DDEOUK88Ylcr_9pRA-1; Thu, 20 Feb 2020 08:06:13 -0500 X-MC-Unique: PPfB_DDEOUK88Ylcr_9pRA-1 Received: by mail-wm1-f72.google.com with SMTP id y7so578725wmd.4 for ; Thu, 20 Feb 2020 05:06:13 -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=HHWlfXnpQqqcljyzd6YNAX2WRGDbItCch3DvOI+vpOQ=; b=lW0DRQObsUzXZl0BGPIN4GbWSOuPd6ZI7zMsVkB/t1PtobgfuHzrlwAZhq5zQ5LyfH XwbuLib+5pKpODESy7Wyml8Yrjz4PMcEAIKjA4n+RcvlJ1oaE8ptns1dGCbmMJ+doKYP pm6T2PPA62qAkGx2Q/861x2jmzyXZ2+O1yhFwTR8JzS2A2h8pQ02+kkd7CoMvaKHHYwB tePbeFy6lQkvsRTRDwgJ9udBsFpTgaZo+JPJqR6z74GRlb5VsZp+SHnK3DHNYDBhRM2y WJHiUZVfuVoR7toGhEjcr7FML//QlQUU51RT1ZUlJzZ6uoZD86QFDo6KiSC5PvI1l4vV 2A3Q== X-Gm-Message-State: APjAAAXnR8pCCHbqZlKzwtufWdZ6yZM+WGhS/ikn8OZWrr2UgSDHH4EG J6oK7OS/dQEbmfbkDpQ15pU7MqZwwQ2QPK1ermdFWXJ5jfZAaSnztc+enlrNvQrG4650w8FMwlc jowHOlQM/ZMKi X-Received: by 2002:adf:e781:: with SMTP id n1mr45107553wrm.56.1582203972576; Thu, 20 Feb 2020 05:06:12 -0800 (PST) X-Received: by 2002:adf:e781:: with SMTP id n1mr45107502wrm.56.1582203972354; Thu, 20 Feb 2020 05:06:12 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:11 -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 05/20] exec: Let flatview API take void pointer arguments Date: Thu, 20 Feb 2020 14:05:33 +0100 Message-Id: <20200220130548.29974-6-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: Jxx1HBQg092M Only flatview_[read/write]_continue use a byte pointer to increment an offset. For the users, we are only dealing with a blob buffer. Use a void pointer argument. This will let us simplify the address_space API in the next commit. Signed-off-by: Philippe Mathieu-Daudé --- include/exec/memory.h | 2 +- exec.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index e85b7de99a..6f8084f45e 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -2336,7 +2336,7 @@ void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len, MemTxResult address_space_read_full(AddressSpace *as, hwaddr addr, MemTxAttrs attrs, uint8_t *buf, hwaddr len); MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr, - MemTxAttrs attrs, uint8_t *buf, + MemTxAttrs attrs, void *buf, hwaddr len, hwaddr addr1, hwaddr l, MemoryRegion *mr); void *qemu_map_ram_ptr(RAMBlock *ram_block, ram_addr_t addr); diff --git a/exec.c b/exec.c index 06e386dc72..980cc0e2b2 100644 --- a/exec.c +++ b/exec.c @@ -2780,9 +2780,9 @@ void cpu_check_watchpoint(CPUState *cpu, vaddr addr, vaddr len, } static MemTxResult flatview_read(FlatView *fv, hwaddr addr, - MemTxAttrs attrs, uint8_t *buf, hwaddr len); + MemTxAttrs attrs, void *buf, hwaddr len); static MemTxResult flatview_write(FlatView *fv, hwaddr addr, MemTxAttrs attrs, - const uint8_t *buf, hwaddr len); + const void *buf, hwaddr len); static bool flatview_access_valid(FlatView *fv, hwaddr addr, hwaddr len, bool is_write, MemTxAttrs attrs); @@ -3147,7 +3147,7 @@ static bool prepare_mmio_access(MemoryRegion *mr) /* Called within RCU critical section. */ static MemTxResult flatview_write_continue(FlatView *fv, hwaddr addr, MemTxAttrs attrs, - const uint8_t *buf, + const void *ptr, hwaddr len, hwaddr addr1, hwaddr l, MemoryRegion *mr) { @@ -3155,6 +3155,7 @@ static MemTxResult flatview_write_continue(FlatView *fv, hwaddr addr, uint64_t val; MemTxResult result = MEMTX_OK; bool release_lock = false; + const uint8_t *buf = ptr; for (;;) { if (!memory_access_is_direct(mr, true)) { @@ -3194,7 +3195,7 @@ static MemTxResult flatview_write_continue(FlatView *fv, hwaddr addr, /* Called from RCU critical section. */ static MemTxResult flatview_write(FlatView *fv, hwaddr addr, MemTxAttrs attrs, - const uint8_t *buf, hwaddr len) + const void *buf, hwaddr len) { hwaddr l; hwaddr addr1; @@ -3211,7 +3212,7 @@ static MemTxResult flatview_write(FlatView *fv, hwaddr addr, MemTxAttrs attrs, /* Called within RCU critical section. */ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr, - MemTxAttrs attrs, uint8_t *buf, + MemTxAttrs attrs, void *ptr, hwaddr len, hwaddr addr1, hwaddr l, MemoryRegion *mr) { @@ -3219,6 +3220,7 @@ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr, uint64_t val; MemTxResult result = MEMTX_OK; bool release_lock = false; + uint8_t *buf = ptr; for (;;) { if (!memory_access_is_direct(mr, false)) { @@ -3256,7 +3258,7 @@ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr, /* Called from RCU critical section. */ static MemTxResult flatview_read(FlatView *fv, hwaddr addr, - MemTxAttrs attrs, uint8_t *buf, hwaddr len) + MemTxAttrs attrs, void *buf, hwaddr len) { hwaddr l; hwaddr addr1; -- 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 05A15C11D09 for ; Thu, 20 Feb 2020 13:06:35 +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 CD6AB208C4 for ; Thu, 20 Feb 2020 13:06:34 +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="bk/Y81T4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD6AB208C4 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 1j4lX6-00019K-B2; Thu, 20 Feb 2020 13:06:24 +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 1j4lX4-000183-SM for xen-devel@lists.xenproject.org; Thu, 20 Feb 2020 13:06:22 +0000 X-Inumbo-ID: c830801b-53e1-11ea-8526-12813bfff9fa Received: from us-smtp-1.mimecast.com (unknown [207.211.31.81]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id c830801b-53e1-11ea-8526-12813bfff9fa; Thu, 20 Feb 2020 13:06:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582203977; 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=kamW98p66sN+eur3Q7AqsRMR1uwJ8MHCAydSaAKz21s=; b=bk/Y81T4AQBPqTsAQHKoLWAPqz4JFVkPG4X2DY0vOVHlXZV8y0NfdrVktKGAhT5QGDahAB 9Nhjz4otfWDoTY6nFdieSM/ZSwMeP/88y4LZqpjOP6RLKpCrd5JAbFZhKAjULhbqZa1CdP lg2qhjTWrSmTmi7rP3NxxoCkaZuHeJI= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-63-zALtjJ_kPp-gdXBim9n0Pw-1; Thu, 20 Feb 2020 08:06:13 -0500 X-MC-Unique: zALtjJ_kPp-gdXBim9n0Pw-1 Received: by mail-wm1-f71.google.com with SMTP id z7so583497wmi.0 for ; Thu, 20 Feb 2020 05:06:13 -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=HHWlfXnpQqqcljyzd6YNAX2WRGDbItCch3DvOI+vpOQ=; b=KddFX+5NhXq0aWStL55TG2BvE3Hiuifk4mFwVOQoiKEdP3eCm3g6jGVvMV+6crKdiM 2/mIMgbq/trihlxEGlUpZy9ZycqNtgPvx1ZhKjaPNw9ZgEVtuUb39CZ8o/bakSLXAUrG K+L4V6tKomqSbLR+eVdPeL62wKWKjhpDIYI6JeKpPHvKV8KakIs5yYORghSnkLOvY7p4 Vm7zQNNR1QkyWP+nYmAJyyO0Rbtl2xr5uDMvYMxQ+xY3UrhFr9HVZjvts+skJls6/I0x zNRdBYY0xO9wUXCmuh/YHuQrKOGRHzY42pWJhKxT8zUfUR0Q83cS2b9OeTqV9HEdMU9c Wtxg== X-Gm-Message-State: APjAAAXVIPWdjamlRlgZcKP5rYz+f9iDTpgbliRzmqbUtCwl2uEoOk9T dpViUrUzGcAlbgokySz0uNYP/5SyD+Rdd9GA6k3vqZAu+49qRWk54eYGB6ftmFISAu2fRuup9kP 69pj9haJV+oklBBrL/qTyrtONifI= X-Received: by 2002:adf:e781:: with SMTP id n1mr45107528wrm.56.1582203972574; Thu, 20 Feb 2020 05:06:12 -0800 (PST) X-Google-Smtp-Source: APXvYqxKBcX8rH6rx55ITZPEmcOIUOejSB/5dplr56Z6ALR3ecPn0w2hMCkhVWEBs3126xsvrTMCAw== X-Received: by 2002:adf:e781:: with SMTP id n1mr45107502wrm.56.1582203972354; Thu, 20 Feb 2020 05:06:12 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:11 -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:33 +0100 Message-Id: <20200220130548.29974-6-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-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [Xen-devel] [PATCH v3 05/20] exec: Let flatview API take void pointer arguments 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" T25seSBmbGF0dmlld19bcmVhZC93cml0ZV1fY29udGludWUgdXNlIGEgYnl0ZSBwb2ludGVyIHRv IGluY3JlbWVudAphbiBvZmZzZXQuIEZvciB0aGUgdXNlcnMsIHdlIGFyZSBvbmx5IGRlYWxpbmcg d2l0aCBhIGJsb2IgYnVmZmVyLgpVc2UgYSB2b2lkIHBvaW50ZXIgYXJndW1lbnQuIFRoaXMgd2ls bCBsZXQgdXMgc2ltcGxpZnkgdGhlCmFkZHJlc3Nfc3BhY2UgQVBJIGluIHRoZSBuZXh0IGNvbW1p dC4KClNpZ25lZC1vZmYtYnk6IFBoaWxpcHBlIE1hdGhpZXUtRGF1ZMOpIDxwaGlsbWRAcmVkaGF0 LmNvbT4KLS0tCiBpbmNsdWRlL2V4ZWMvbWVtb3J5LmggfCAgMiArLQogZXhlYy5jICAgICAgICAg ICAgICAgIHwgMTQgKysrKysrKystLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgOSBpbnNlcnRpb25z KCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2luY2x1ZGUvZXhlYy9tZW1vcnkuaCBi L2luY2x1ZGUvZXhlYy9tZW1vcnkuaAppbmRleCBlODViN2RlOTlhLi42ZjgwODRmNDVlIDEwMDY0 NAotLS0gYS9pbmNsdWRlL2V4ZWMvbWVtb3J5LmgKKysrIGIvaW5jbHVkZS9leGVjL21lbW9yeS5o CkBAIC0yMzM2LDcgKzIzMzYsNyBAQCB2b2lkIGFkZHJlc3Nfc3BhY2VfdW5tYXAoQWRkcmVzc1Nw YWNlICphcywgdm9pZCAqYnVmZmVyLCBod2FkZHIgbGVuLAogTWVtVHhSZXN1bHQgYWRkcmVzc19z cGFjZV9yZWFkX2Z1bGwoQWRkcmVzc1NwYWNlICphcywgaHdhZGRyIGFkZHIsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBNZW1UeEF0dHJzIGF0dHJzLCB1aW50OF90ICpidWYs IGh3YWRkciBsZW4pOwogTWVtVHhSZXN1bHQgZmxhdHZpZXdfcmVhZF9jb250aW51ZShGbGF0Vmll dyAqZnYsIGh3YWRkciBhZGRyLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBN ZW1UeEF0dHJzIGF0dHJzLCB1aW50OF90ICpidWYsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIE1lbVR4QXR0cnMgYXR0cnMsIHZvaWQgKmJ1ZiwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgaHdhZGRyIGxlbiwgaHdhZGRyIGFkZHIxLCBod2FkZHIgbCwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTWVtb3J5UmVnaW9uICptcik7CiB2b2lk ICpxZW11X21hcF9yYW1fcHRyKFJBTUJsb2NrICpyYW1fYmxvY2ssIHJhbV9hZGRyX3QgYWRkcik7 CmRpZmYgLS1naXQgYS9leGVjLmMgYi9leGVjLmMKaW5kZXggMDZlMzg2ZGM3Mi4uOTgwY2MwZTJi MiAxMDA2NDQKLS0tIGEvZXhlYy5jCisrKyBiL2V4ZWMuYwpAQCAtMjc4MCw5ICsyNzgwLDkgQEAg dm9pZCBjcHVfY2hlY2tfd2F0Y2hwb2ludChDUFVTdGF0ZSAqY3B1LCB2YWRkciBhZGRyLCB2YWRk ciBsZW4sCiB9CiAKIHN0YXRpYyBNZW1UeFJlc3VsdCBmbGF0dmlld19yZWFkKEZsYXRWaWV3ICpm diwgaHdhZGRyIGFkZHIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBNZW1UeEF0 dHJzIGF0dHJzLCB1aW50OF90ICpidWYsIGh3YWRkciBsZW4pOworICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgTWVtVHhBdHRycyBhdHRycywgdm9pZCAqYnVmLCBod2FkZHIgbGVuKTsK IHN0YXRpYyBNZW1UeFJlc3VsdCBmbGF0dmlld193cml0ZShGbGF0VmlldyAqZnYsIGh3YWRkciBh ZGRyLCBNZW1UeEF0dHJzIGF0dHJzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IHVpbnQ4X3QgKmJ1ZiwgaHdhZGRyIGxlbik7CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29uc3Qgdm9pZCAqYnVmLCBod2FkZHIgbGVuKTsKIHN0YXRpYyBib29sIGZs YXR2aWV3X2FjY2Vzc192YWxpZChGbGF0VmlldyAqZnYsIGh3YWRkciBhZGRyLCBod2FkZHIgbGVu LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgaXNfd3JpdGUsIE1lbVR4 QXR0cnMgYXR0cnMpOwogCkBAIC0zMTQ3LDcgKzMxNDcsNyBAQCBzdGF0aWMgYm9vbCBwcmVwYXJl X21taW9fYWNjZXNzKE1lbW9yeVJlZ2lvbiAqbXIpCiAvKiBDYWxsZWQgd2l0aGluIFJDVSBjcml0 aWNhbCBzZWN0aW9uLiAgKi8KIHN0YXRpYyBNZW1UeFJlc3VsdCBmbGF0dmlld193cml0ZV9jb250 aW51ZShGbGF0VmlldyAqZnYsIGh3YWRkciBhZGRyLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIE1lbVR4QXR0cnMgYXR0cnMsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgdWludDhfdCAqYnVmLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHZvaWQgKnB0ciwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBod2FkZHIgbGVuLCBod2FkZHIgYWRk cjEsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaHdhZGRyIGws IE1lbW9yeVJlZ2lvbiAqbXIpCiB7CkBAIC0zMTU1LDYgKzMxNTUsNyBAQCBzdGF0aWMgTWVtVHhS ZXN1bHQgZmxhdHZpZXdfd3JpdGVfY29udGludWUoRmxhdFZpZXcgKmZ2LCBod2FkZHIgYWRkciwK ICAgICB1aW50NjRfdCB2YWw7CiAgICAgTWVtVHhSZXN1bHQgcmVzdWx0ID0gTUVNVFhfT0s7CiAg ICAgYm9vbCByZWxlYXNlX2xvY2sgPSBmYWxzZTsKKyAgICBjb25zdCB1aW50OF90ICpidWYgPSBw dHI7CiAKICAgICBmb3IgKDs7KSB7CiAgICAgICAgIGlmICghbWVtb3J5X2FjY2Vzc19pc19kaXJl Y3QobXIsIHRydWUpKSB7CkBAIC0zMTk0LDcgKzMxOTUsNyBAQCBzdGF0aWMgTWVtVHhSZXN1bHQg ZmxhdHZpZXdfd3JpdGVfY29udGludWUoRmxhdFZpZXcgKmZ2LCBod2FkZHIgYWRkciwKIAogLyog Q2FsbGVkIGZyb20gUkNVIGNyaXRpY2FsIHNlY3Rpb24uICAqLwogc3RhdGljIE1lbVR4UmVzdWx0 IGZsYXR2aWV3X3dyaXRlKEZsYXRWaWV3ICpmdiwgaHdhZGRyIGFkZHIsIE1lbVR4QXR0cnMgYXR0 cnMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgdWludDhfdCAqYnVm LCBod2FkZHIgbGVuKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHZv aWQgKmJ1ZiwgaHdhZGRyIGxlbikKIHsKICAgICBod2FkZHIgbDsKICAgICBod2FkZHIgYWRkcjE7 CkBAIC0zMjExLDcgKzMyMTIsNyBAQCBzdGF0aWMgTWVtVHhSZXN1bHQgZmxhdHZpZXdfd3JpdGUo RmxhdFZpZXcgKmZ2LCBod2FkZHIgYWRkciwgTWVtVHhBdHRycyBhdHRycywKIAogLyogQ2FsbGVk IHdpdGhpbiBSQ1UgY3JpdGljYWwgc2VjdGlvbi4gICovCiBNZW1UeFJlc3VsdCBmbGF0dmlld19y ZWFkX2NvbnRpbnVlKEZsYXRWaWV3ICpmdiwgaHdhZGRyIGFkZHIsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIE1lbVR4QXR0cnMgYXR0cnMsIHVpbnQ4X3QgKmJ1ZiwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTWVtVHhBdHRycyBhdHRycywgdm9pZCAqcHRy LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBod2FkZHIgbGVuLCBod2FkZHIg YWRkcjEsIGh3YWRkciBsLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBNZW1v cnlSZWdpb24gKm1yKQogewpAQCAtMzIxOSw2ICszMjIwLDcgQEAgTWVtVHhSZXN1bHQgZmxhdHZp ZXdfcmVhZF9jb250aW51ZShGbGF0VmlldyAqZnYsIGh3YWRkciBhZGRyLAogICAgIHVpbnQ2NF90 IHZhbDsKICAgICBNZW1UeFJlc3VsdCByZXN1bHQgPSBNRU1UWF9PSzsKICAgICBib29sIHJlbGVh c2VfbG9jayA9IGZhbHNlOworICAgIHVpbnQ4X3QgKmJ1ZiA9IHB0cjsKIAogICAgIGZvciAoOzsp IHsKICAgICAgICAgaWYgKCFtZW1vcnlfYWNjZXNzX2lzX2RpcmVjdChtciwgZmFsc2UpKSB7CkBA IC0zMjU2LDcgKzMyNTgsNyBAQCBNZW1UeFJlc3VsdCBmbGF0dmlld19yZWFkX2NvbnRpbnVlKEZs YXRWaWV3ICpmdiwgaHdhZGRyIGFkZHIsCiAKIC8qIENhbGxlZCBmcm9tIFJDVSBjcml0aWNhbCBz ZWN0aW9uLiAgKi8KIHN0YXRpYyBNZW1UeFJlc3VsdCBmbGF0dmlld19yZWFkKEZsYXRWaWV3ICpm diwgaHdhZGRyIGFkZHIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBNZW1UeEF0 dHJzIGF0dHJzLCB1aW50OF90ICpidWYsIGh3YWRkciBsZW4pCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBNZW1UeEF0dHJzIGF0dHJzLCB2b2lkICpidWYsIGh3YWRkciBsZW4pCiB7 CiAgICAgaHdhZGRyIGw7CiAgICAgaHdhZGRyIGFkZHIxOwotLSAKMi4yMS4xCgoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcg bGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9q ZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA== 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 31F08C11D04 for ; Thu, 20 Feb 2020 13:10:18 +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 F0D64206ED for ; Thu, 20 Feb 2020 13:10:17 +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="BhM6j2TF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F0D64206ED 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]:41620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4lar-0003Yi-3y for qemu-devel@archiver.kernel.org; Thu, 20 Feb 2020 08:10:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55756) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4lX0-0004ay-6a 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 1j4lWy-0004vs-VL for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:18 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:60433 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 1j4lWy-0004vY-RQ for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582203976; 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=kamW98p66sN+eur3Q7AqsRMR1uwJ8MHCAydSaAKz21s=; b=BhM6j2TFlxilShmuQPG5GLYUxvP0mmPW+ZSUvi0Ddl9fdEqtLJUsOCn1HuTqCuKoVm0Rtd 196j19umV8AZsPmrFilPrfDdmx6Dwk0frkW3cjjIP4L6GyDu8qVgf7CnPGVOBCw2Un1hMH z+2zK6Lji9ZBlEHGJKtFlZbih2bFqV0= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-342-4dUiJntRMn6ktmMCFzlW2A-1; Thu, 20 Feb 2020 08:06:13 -0500 Received: by mail-wm1-f69.google.com with SMTP id z7so583498wmi.0 for ; Thu, 20 Feb 2020 05:06:13 -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=HHWlfXnpQqqcljyzd6YNAX2WRGDbItCch3DvOI+vpOQ=; b=CQfKH4QGDTQjHunwmV8Nmaa2IR9e+3GcJ333Yeh0DDgV2gXtr7JqoPa+MEUlrs3Hop 9q+INz7/8hkDwzFdvPtPW+5F3jrpUOt4o6wrtI+A/V//O9KJQVlP1+w3HjQAdcn29is7 CDuuFRxlHBjxgFPNKvBk59G+/jvKIvXkwx9YuUSYrSm2fXlhNzFu4Lr3o4X6DaCuZt9L MtK712Al3tMrIdMOGp+fO5mhssKHJJREgqQyU4NF4mY2YzPq0u7NlrPQg3MOwZM0/XF4 E9lg/BNityn8iSfZfVJGFotd5mHeDiuwbhqGmdwAJFgfjhEL7sHwt1nCtMWGx12vFoBn +mLA== X-Gm-Message-State: APjAAAU7AZYl/URxefs2V2ZABsxOIq1zB8ELFYAD+KYhAvY4Ek0FboAe PgCRMIcx/+YN+tA+rH1tWw4+mbrlBZxSbyyLES0uIsNxFDzdValrH4ypEunLtmgn5O2TB2AauUa iBlIuIob4UEoFYLA= X-Received: by 2002:adf:e781:: with SMTP id n1mr45107538wrm.56.1582203972575; Thu, 20 Feb 2020 05:06:12 -0800 (PST) X-Google-Smtp-Source: APXvYqxKBcX8rH6rx55ITZPEmcOIUOejSB/5dplr56Z6ALR3ecPn0w2hMCkhVWEBs3126xsvrTMCAw== X-Received: by 2002:adf:e781:: with SMTP id n1mr45107502wrm.56.1582203972354; Thu, 20 Feb 2020 05:06:12 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:11 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Subject: [PATCH v3 05/20] exec: Let flatview API take void pointer arguments Date: Thu, 20 Feb 2020 14:05:33 +0100 Message-Id: <20200220130548.29974-6-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: 4dUiJntRMn6ktmMCFzlW2A-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" Only flatview_[read/write]_continue use a byte pointer to increment an offset. For the users, we are only dealing with a blob buffer. Use a void pointer argument. This will let us simplify the address_space API in the next commit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/memory.h | 2 +- exec.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index e85b7de99a..6f8084f45e 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -2336,7 +2336,7 @@ void address_space_unmap(AddressSpace *as, void *buff= er, hwaddr len, MemTxResult address_space_read_full(AddressSpace *as, hwaddr addr, MemTxAttrs attrs, uint8_t *buf, hwaddr= len); MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr, - MemTxAttrs attrs, uint8_t *buf, + MemTxAttrs attrs, void *buf, hwaddr len, hwaddr addr1, hwaddr l, MemoryRegion *mr); void *qemu_map_ram_ptr(RAMBlock *ram_block, ram_addr_t addr); diff --git a/exec.c b/exec.c index 06e386dc72..980cc0e2b2 100644 --- a/exec.c +++ b/exec.c @@ -2780,9 +2780,9 @@ void cpu_check_watchpoint(CPUState *cpu, vaddr addr, = vaddr len, } =20 static MemTxResult flatview_read(FlatView *fv, hwaddr addr, - MemTxAttrs attrs, uint8_t *buf, hwaddr le= n); + MemTxAttrs attrs, void *buf, hwaddr len); static MemTxResult flatview_write(FlatView *fv, hwaddr addr, MemTxAttrs at= trs, - const uint8_t *buf, hwaddr len); + const void *buf, hwaddr len); static bool flatview_access_valid(FlatView *fv, hwaddr addr, hwaddr len, bool is_write, MemTxAttrs attrs); =20 @@ -3147,7 +3147,7 @@ static bool prepare_mmio_access(MemoryRegion *mr) /* Called within RCU critical section. */ static MemTxResult flatview_write_continue(FlatView *fv, hwaddr addr, MemTxAttrs attrs, - const uint8_t *buf, + const void *ptr, hwaddr len, hwaddr addr1, hwaddr l, MemoryRegion *mr) { @@ -3155,6 +3155,7 @@ static MemTxResult flatview_write_continue(FlatView *= fv, hwaddr addr, uint64_t val; MemTxResult result =3D MEMTX_OK; bool release_lock =3D false; + const uint8_t *buf =3D ptr; =20 for (;;) { if (!memory_access_is_direct(mr, true)) { @@ -3194,7 +3195,7 @@ static MemTxResult flatview_write_continue(FlatView *= fv, hwaddr addr, =20 /* Called from RCU critical section. */ static MemTxResult flatview_write(FlatView *fv, hwaddr addr, MemTxAttrs at= trs, - const uint8_t *buf, hwaddr len) + const void *buf, hwaddr len) { hwaddr l; hwaddr addr1; @@ -3211,7 +3212,7 @@ static MemTxResult flatview_write(FlatView *fv, hwadd= r addr, MemTxAttrs attrs, =20 /* Called within RCU critical section. */ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr, - MemTxAttrs attrs, uint8_t *buf, + MemTxAttrs attrs, void *ptr, hwaddr len, hwaddr addr1, hwaddr l, MemoryRegion *mr) { @@ -3219,6 +3220,7 @@ MemTxResult flatview_read_continue(FlatView *fv, hwad= dr addr, uint64_t val; MemTxResult result =3D MEMTX_OK; bool release_lock =3D false; + uint8_t *buf =3D ptr; =20 for (;;) { if (!memory_access_is_direct(mr, false)) { @@ -3256,7 +3258,7 @@ MemTxResult flatview_read_continue(FlatView *fv, hwad= dr addr, =20 /* Called from RCU critical section. */ static MemTxResult flatview_read(FlatView *fv, hwaddr addr, - MemTxAttrs attrs, uint8_t *buf, hwaddr le= n) + MemTxAttrs attrs, void *buf, hwaddr len) { hwaddr l; hwaddr addr1; --=20 2.21.1