From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:cb43:0:0:0:0:0 with SMTP id b64csp559793lfg; Thu, 20 Feb 2020 05:21:48 -0800 (PST) X-Google-Smtp-Source: APXvYqyf9ROB35gstHJKSUaOzP8iClsk9v4SYbAoXXNYpuWAu4M3YMGgFfjxdMM1MAfcBE1n/ZYa X-Received: by 2002:aca:a857:: with SMTP id r84mr1897903oie.41.1582204908301; Thu, 20 Feb 2020 05:21:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582204908; cv=none; d=google.com; s=arc-20160816; b=fZIDfrAYqWRy//tu6GC5mdg6swI5a5x7ZTpK48leoMKa+Y7eOtovOS1RqG8K7Gb5/X vrtbMYKnDwxNmd4MyeO2PQbEOusOjnqlYIqgWpiIkRlrbFFLWf8KStf9+u0/LkZ770yi iPmmzjUeqS6VEuJWDTKLX6vOVVqiKULoO0mN0lVAZwDOILBx+pL6Y3rZeH/gzJgIEgie VwkgJcek2ya9QxT6dD/MH4J6k17gWaxQUMPbH7vTBkbo0GYJCZE09C8/PuY4Gjp7znK8 +mSEmTWCKxwjjx9oWLd1aEdGr7zH3+H8fov2Df2uUTSy/cY0GGjzIrzzGBvzg/dB8gvN KjLQ== 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 :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature; bh=8fOoSsSz7tsTUHvX+UaUO6G7U94kDGpWqoCWwnJ/CO0=; b=pPZbsNbUAMYuQgnXo18tXkfXftqqBtjFw1GMpYSvgzHrz0GIsuROHgl+EFjukqCmAr 2V6p0wNjwWGm4hIqWbpzQ/Exzx5tc0SRvRlFeSiDL49JW8OY18+RtIhixV1wqvwfNrFp bLLEsq3BxfDWVC5Cmh85k0vJTO3YUaJ7r2taeRDI/wm3+NjBu1jgweYX/LF7ajf0goww gmf44lTwiifwofQGoNthVUwLu+f2nzEY7cDSQtRJjPXPqCqluYYwbbroSwlZLCwmGGKh moYKMGqGcJmS+VnDCFjk+/6HeB0dTK05114d5rhoUwY6J1rHdhDgQdqyvrLKGFxBheKN CrPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="f8R9f/fs"; 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 m19si10421395oig.91.2020.02.20.05.21.47; Thu, 20 Feb 2020 05:21:48 -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="f8R9f/fs"; 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 S1728185AbgBTNVp (ORCPT + 5 others); Thu, 20 Feb 2020 08:21:45 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:56685 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727943AbgBTNVo (ORCPT ); Thu, 20 Feb 2020 08:21:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582204903; 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=8fOoSsSz7tsTUHvX+UaUO6G7U94kDGpWqoCWwnJ/CO0=; b=f8R9f/fs+z+SZtBe8/u25Grzgw4n0Hb72dSzMC6RirrFVnhcF+NBJDriVjKMOnO8CDtB5T 8lzJC3I43qJZpV10cYaZido4ab4QrvU8lR+R7bqWf2SDvafn9aEJ5MspGZUlrrTtLlqfuz XcTrRc957n8ZZ80DscX9NT39ZzPWJYk= 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-321-N77XKRyXMyut3LxDUyhXag-1; Thu, 20 Feb 2020 08:21:41 -0500 X-MC-Unique: N77XKRyXMyut3LxDUyhXag-1 Received: by mail-wm1-f71.google.com with SMTP id b8so990409wmj.0 for ; Thu, 20 Feb 2020 05:21:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=8fOoSsSz7tsTUHvX+UaUO6G7U94kDGpWqoCWwnJ/CO0=; b=d7Hk1Ve0h0u/j3TZSjs5IYh9PQs8qzN9+BpnoMDD2xJPBGiV2pKOAYO/H1IoxbOHMB TtBuLZG85Hb8nBR79dmQtmyXcSX6wxJH6wywOh+4dDoi/Kwtt78Y7pE2ERLGR3fcQ9mj 8ix40s/Nf7/42dTlZnVIA73ofnWjvsdoqawEWHeCljZwF4UnbgbTmSd3TJr0Qx8T7Lvk oeFeN8A3Y6CBJsoin9psxBf3CR4zYReYnH7H5RLA0XmAqgcz54gomFIJpBM5qVXwJ0us VBLpsaErThjwnpVrM+nGUOiK6tlWJKprJaeCECayeo9sGDLYcVfSfCoz92naNbzrGrEG VejQ== X-Gm-Message-State: APjAAAX2BvYatemU0YucdxOIZarFCBrcgeooXOGURJLsP4JrcfqstkfN hGOpTmGdtc/JoRvTWVbbT5NO48v5dz77KPqcNANMqvuUM7BYX4MnT/PX554xPgqVC/bnRLPHm63 OH9DWMDMx6fkF X-Received: by 2002:a7b:ca49:: with SMTP id m9mr4782592wml.50.1582204900626; Thu, 20 Feb 2020 05:21:40 -0800 (PST) X-Received: by 2002:a7b:ca49:: with SMTP id m9mr4782560wml.50.1582204900358; Thu, 20 Feb 2020 05:21:40 -0800 (PST) Received: from [10.201.49.12] (nat-pool-mxp-u.redhat.com. [149.6.153.187]) by smtp.gmail.com with ESMTPSA id i2sm4415838wmb.28.2020.02.20.05.21.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 20 Feb 2020 05:21:39 -0800 (PST) Subject: Re: [PATCH v3 03/20] exec: Let qemu_ram_*() functions take a const pointer argument To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Peter Maydell , qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , Anthony Perard , Fam Zheng , =?UTF-8?Q?Herv=c3=a9_Poussineau?= , 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_Le_Goater?= , Jason Wang , xen-devel@lists.xenproject.org, Christian Borntraeger , Dmitry Fleytman , Matthew Rosato , Eduardo Habkost , Richard Henderson , "Michael S. Tsirkin" , David Hildenbrand , Stefano Stabellini , Igor Mitsyanko , Paul Durrant , Richard Henderson , John Snow References: <20200220130548.29974-1-philmd@redhat.com> <20200220130548.29974-4-philmd@redhat.com> From: Paolo Bonzini Message-ID: Date: Thu, 20 Feb 2020 14:21:35 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: <20200220130548.29974-4-philmd@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-TUID: xIMvSOY7LAja On 20/02/20 14:05, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé > --- > include/exec/cpu-common.h | 6 +++--- > include/sysemu/xen-mapcache.h | 4 ++-- > exec.c | 8 ++++---- > hw/i386/xen/xen-mapcache.c | 2 +- > 4 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h > index 81753bbb34..05ac1a5d69 100644 > --- a/include/exec/cpu-common.h > +++ b/include/exec/cpu-common.h > @@ -48,11 +48,11 @@ typedef uint32_t CPUReadMemoryFunc(void *opaque, hwaddr addr); > > void qemu_ram_remap(ram_addr_t addr, ram_addr_t length); > /* This should not be used by devices. */ > -ram_addr_t qemu_ram_addr_from_host(void *ptr); > +ram_addr_t qemu_ram_addr_from_host(const void *ptr); This is a bit ugly, because the pointer _can_ be modified via qemu_map_ram_ptr. Is this needed for the rest of the series to apply? Paolo > RAMBlock *qemu_ram_block_by_name(const char *name); > -RAMBlock *qemu_ram_block_from_host(void *ptr, bool round_offset, > +RAMBlock *qemu_ram_block_from_host(const void *ptr, bool round_offset, > ram_addr_t *offset); > -ram_addr_t qemu_ram_block_host_offset(RAMBlock *rb, void *host); > +ram_addr_t qemu_ram_block_host_offset(RAMBlock *rb, const void *host); > void qemu_ram_set_idstr(RAMBlock *block, const char *name, DeviceState *dev); > void qemu_ram_unset_idstr(RAMBlock *block); > const char *qemu_ram_get_idstr(RAMBlock *rb); > diff --git a/include/sysemu/xen-mapcache.h b/include/sysemu/xen-mapcache.h > index c8e7c2f6cf..81e9aa2fa6 100644 > --- a/include/sysemu/xen-mapcache.h > +++ b/include/sysemu/xen-mapcache.h > @@ -19,7 +19,7 @@ void xen_map_cache_init(phys_offset_to_gaddr_t f, > void *opaque); > uint8_t *xen_map_cache(hwaddr phys_addr, hwaddr size, > uint8_t lock, bool dma); > -ram_addr_t xen_ram_addr_from_mapcache(void *ptr); > +ram_addr_t xen_ram_addr_from_mapcache(const void *ptr); > void xen_invalidate_map_cache_entry(uint8_t *buffer); > void xen_invalidate_map_cache(void); > uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr, > @@ -40,7 +40,7 @@ static inline uint8_t *xen_map_cache(hwaddr phys_addr, > abort(); > } > > -static inline ram_addr_t xen_ram_addr_from_mapcache(void *ptr) > +static inline ram_addr_t xen_ram_addr_from_mapcache(const void *ptr) > { > abort(); > } > diff --git a/exec.c b/exec.c > index 8e9cc3b47c..02b4e6ea41 100644 > --- a/exec.c > +++ b/exec.c > @@ -2614,7 +2614,7 @@ static void *qemu_ram_ptr_length(RAMBlock *ram_block, ram_addr_t addr, > } > > /* Return the offset of a hostpointer within a ramblock */ > -ram_addr_t qemu_ram_block_host_offset(RAMBlock *rb, void *host) > +ram_addr_t qemu_ram_block_host_offset(RAMBlock *rb, const void *host) > { > ram_addr_t res = (uint8_t *)host - (uint8_t *)rb->host; > assert((uintptr_t)host >= (uintptr_t)rb->host); > @@ -2640,11 +2640,11 @@ ram_addr_t qemu_ram_block_host_offset(RAMBlock *rb, void *host) > * pointer, such as a reference to the region that includes the incoming > * ram_addr_t. > */ > -RAMBlock *qemu_ram_block_from_host(void *ptr, bool round_offset, > +RAMBlock *qemu_ram_block_from_host(const void *ptr, bool round_offset, > ram_addr_t *offset) > { > RAMBlock *block; > - uint8_t *host = ptr; > + const uint8_t *host = ptr; > > if (xen_enabled()) { > ram_addr_t ram_addr; > @@ -2705,7 +2705,7 @@ RAMBlock *qemu_ram_block_by_name(const char *name) > > /* Some of the softmmu routines need to translate from a host pointer > (typically a TLB entry) back to a ram offset. */ > -ram_addr_t qemu_ram_addr_from_host(void *ptr) > +ram_addr_t qemu_ram_addr_from_host(const void *ptr) > { > RAMBlock *block; > ram_addr_t offset; > diff --git a/hw/i386/xen/xen-mapcache.c b/hw/i386/xen/xen-mapcache.c > index 5b120ed44b..432ad3354d 100644 > --- a/hw/i386/xen/xen-mapcache.c > +++ b/hw/i386/xen/xen-mapcache.c > @@ -363,7 +363,7 @@ uint8_t *xen_map_cache(hwaddr phys_addr, hwaddr size, > return p; > } > > -ram_addr_t xen_ram_addr_from_mapcache(void *ptr) > +ram_addr_t xen_ram_addr_from_mapcache(const void *ptr) > { > MapCacheEntry *entry = NULL; > MapCacheRev *reventry; > 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=-8.1 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_SANE_1 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 814F2C11D04 for ; Thu, 20 Feb 2020 13:22:04 +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 532BB206E2 for ; Thu, 20 Feb 2020 13:22:04 +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="J6gPmvlE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 532BB206E2 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 1j4llx-0004yH-HM; Thu, 20 Feb 2020 13:21:45 +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 1j4llw-0004yC-Cu for xen-devel@lists.xenproject.org; Thu, 20 Feb 2020 13:21:44 +0000 X-Inumbo-ID: efe7a5c8-53e3-11ea-8527-12813bfff9fa Received: from us-smtp-1.mimecast.com (unknown [205.139.110.120]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id efe7a5c8-53e3-11ea-8527-12813bfff9fa; Thu, 20 Feb 2020 13:21:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582204903; 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=S4PJnWfahZa1TNC6+g1IhMFCY1W/sixaIQI4WNkTwR8=; b=J6gPmvlEcAYYGB7M6Me9KtlP+OJsJz3Ir8MvgOQVGFpL5laD/vBg5mTJv67l+4erZ0CkN2 m6aegXauLyCAdQWW8ZhyAHhvGZA1ObzLh9jJWUtzJTFrKVqg11x+fPYqn1vd10AOV6v4tu cjOX/e0T3UY+62J339+YPDrSJKJoCsQ= 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-232-oCmgC4lxOxCWvrsZsAwsTA-1; Thu, 20 Feb 2020 08:21:41 -0500 Received: by mail-wm1-f71.google.com with SMTP id f207so590083wme.6 for ; Thu, 20 Feb 2020 05:21:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=8fOoSsSz7tsTUHvX+UaUO6G7U94kDGpWqoCWwnJ/CO0=; b=JQL0xrnT4jzbe/1vIYJ0Vhb6H2Tyu0915HvInpz6+KkhudZIJT6onGsv7Gp49W7+oE 6R5Xx1P7MCfq1P1MwheGrvEEZ1JsjyTCrgbJ3Eb7MnkYmnjK7rvfMM8DAv3tAP5wNlS8 KyYvl5I2l605x3fkqasbrb0kTM5xyvC4lOzfkCo+r/kIW3h6YGAoInFngLChYMTL6D/P blAt73OdWe5+yxGl8aeDMH1ieeo8lhNCmDEHIW1tw2pPx/YyQr5tmbBtmvZRSV/TU64O cilhjwTZ+Ww1fU9SCA+HbrSL2EvSTHNyxNfdtkuWDcFCKY4cj9rF8zUNfeDNEG7I67rq zRPw== X-Gm-Message-State: APjAAAVqbQCl534EG3O+wB3gVNii90CmPfhYqx0PFg43RV7A49A1mn75 krU1l1EMrAXT2/1DsyN+onUiexZ38CxTEhO0ezrYH3/CuG0MDDZ9XNrNu3dqLmhmprBrDlYrmf2 820r9MVb8k2yOGRktbXPnc6U/ZGs= X-Received: by 2002:a7b:ca49:: with SMTP id m9mr4782590wml.50.1582204900626; Thu, 20 Feb 2020 05:21:40 -0800 (PST) X-Google-Smtp-Source: APXvYqzKxcQLqflxe9qCIU9rTsjyGiEk6CQgzPBe/H4AxjLFCiLPx9wCf3WQ03jwpKNmMAnM1bKEcw== X-Received: by 2002:a7b:ca49:: with SMTP id m9mr4782560wml.50.1582204900358; Thu, 20 Feb 2020 05:21:40 -0800 (PST) Received: from [10.201.49.12] (nat-pool-mxp-u.redhat.com. [149.6.153.187]) by smtp.gmail.com with ESMTPSA id i2sm4415838wmb.28.2020.02.20.05.21.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 20 Feb 2020 05:21:39 -0800 (PST) To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Peter Maydell , qemu-devel@nongnu.org References: <20200220130548.29974-1-philmd@redhat.com> <20200220130548.29974-4-philmd@redhat.com> From: Paolo Bonzini Message-ID: Date: Thu, 20 Feb 2020 14:21:35 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: <20200220130548.29974-4-philmd@redhat.com> Content-Language: en-US X-MC-Unique: oCmgC4lxOxCWvrsZsAwsTA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: Re: [Xen-devel] [PATCH v3 03/20] exec: Let qemu_ram_*() functions take a const pointer argument 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_Poussineau?= , Marcel Apfelbaum , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , 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_Le_Goater?= , John Snow , David Gibson , Igor Mitsyanko , Cornelia Huck , Michael Walle , qemu-ppc@nongnu.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" T24gMjAvMDIvMjAgMTQ6MDUsIFBoaWxpcHBlIE1hdGhpZXUtRGF1ZMOpIHdyb3RlOgo+IFNpZ25l ZC1vZmYtYnk6IFBoaWxpcHBlIE1hdGhpZXUtRGF1ZMOpIDxwaGlsbWRAcmVkaGF0LmNvbT4KPiAt LS0KPiAgaW5jbHVkZS9leGVjL2NwdS1jb21tb24uaCAgICAgfCA2ICsrKy0tLQo+ICBpbmNsdWRl L3N5c2VtdS94ZW4tbWFwY2FjaGUuaCB8IDQgKystLQo+ICBleGVjLmMgICAgICAgICAgICAgICAg ICAgICAgICB8IDggKysrKy0tLS0KPiAgaHcvaTM4Ni94ZW4veGVuLW1hcGNhY2hlLmMgICAgfCAy ICstCj4gIDQgZmlsZXMgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0p Cj4gCj4gZGlmZiAtLWdpdCBhL2luY2x1ZGUvZXhlYy9jcHUtY29tbW9uLmggYi9pbmNsdWRlL2V4 ZWMvY3B1LWNvbW1vbi5oCj4gaW5kZXggODE3NTNiYmIzNC4uMDVhYzFhNWQ2OSAxMDA2NDQKPiAt LS0gYS9pbmNsdWRlL2V4ZWMvY3B1LWNvbW1vbi5oCj4gKysrIGIvaW5jbHVkZS9leGVjL2NwdS1j b21tb24uaAo+IEBAIC00OCwxMSArNDgsMTEgQEAgdHlwZWRlZiB1aW50MzJfdCBDUFVSZWFkTWVt b3J5RnVuYyh2b2lkICpvcGFxdWUsIGh3YWRkciBhZGRyKTsKPiAgCj4gIHZvaWQgcWVtdV9yYW1f cmVtYXAocmFtX2FkZHJfdCBhZGRyLCByYW1fYWRkcl90IGxlbmd0aCk7Cj4gIC8qIFRoaXMgc2hv dWxkIG5vdCBiZSB1c2VkIGJ5IGRldmljZXMuICAqLwo+IC1yYW1fYWRkcl90IHFlbXVfcmFtX2Fk ZHJfZnJvbV9ob3N0KHZvaWQgKnB0cik7Cj4gK3JhbV9hZGRyX3QgcWVtdV9yYW1fYWRkcl9mcm9t X2hvc3QoY29uc3Qgdm9pZCAqcHRyKTsKClRoaXMgaXMgYSBiaXQgdWdseSwgYmVjYXVzZSB0aGUg cG9pbnRlciBfY2FuXyBiZSBtb2RpZmllZCB2aWEKcWVtdV9tYXBfcmFtX3B0ci4gIElzIHRoaXMg bmVlZGVkIGZvciB0aGUgcmVzdCBvZiB0aGUgc2VyaWVzIHRvIGFwcGx5PwoKUGFvbG8KCj4gIFJB TUJsb2NrICpxZW11X3JhbV9ibG9ja19ieV9uYW1lKGNvbnN0IGNoYXIgKm5hbWUpOwo+IC1SQU1C bG9jayAqcWVtdV9yYW1fYmxvY2tfZnJvbV9ob3N0KHZvaWQgKnB0ciwgYm9vbCByb3VuZF9vZmZz ZXQsCj4gK1JBTUJsb2NrICpxZW11X3JhbV9ibG9ja19mcm9tX2hvc3QoY29uc3Qgdm9pZCAqcHRy LCBib29sIHJvdW5kX29mZnNldCwKPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICByYW1fYWRkcl90ICpvZmZzZXQpOwo+IC1yYW1fYWRkcl90IHFlbXVfcmFtX2Jsb2NrX2hvc3Rf b2Zmc2V0KFJBTUJsb2NrICpyYiwgdm9pZCAqaG9zdCk7Cj4gK3JhbV9hZGRyX3QgcWVtdV9yYW1f YmxvY2tfaG9zdF9vZmZzZXQoUkFNQmxvY2sgKnJiLCBjb25zdCB2b2lkICpob3N0KTsKPiAgdm9p ZCBxZW11X3JhbV9zZXRfaWRzdHIoUkFNQmxvY2sgKmJsb2NrLCBjb25zdCBjaGFyICpuYW1lLCBE ZXZpY2VTdGF0ZSAqZGV2KTsKPiAgdm9pZCBxZW11X3JhbV91bnNldF9pZHN0cihSQU1CbG9jayAq YmxvY2spOwo+ICBjb25zdCBjaGFyICpxZW11X3JhbV9nZXRfaWRzdHIoUkFNQmxvY2sgKnJiKTsK PiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS9zeXNlbXUveGVuLW1hcGNhY2hlLmggYi9pbmNsdWRlL3N5 c2VtdS94ZW4tbWFwY2FjaGUuaAo+IGluZGV4IGM4ZTdjMmY2Y2YuLjgxZTlhYTJmYTYgMTAwNjQ0 Cj4gLS0tIGEvaW5jbHVkZS9zeXNlbXUveGVuLW1hcGNhY2hlLmgKPiArKysgYi9pbmNsdWRlL3N5 c2VtdS94ZW4tbWFwY2FjaGUuaAo+IEBAIC0xOSw3ICsxOSw3IEBAIHZvaWQgeGVuX21hcF9jYWNo ZV9pbml0KHBoeXNfb2Zmc2V0X3RvX2dhZGRyX3QgZiwKPiAgICAgICAgICAgICAgICAgICAgICAg ICAgdm9pZCAqb3BhcXVlKTsKPiAgdWludDhfdCAqeGVuX21hcF9jYWNoZShod2FkZHIgcGh5c19h ZGRyLCBod2FkZHIgc2l6ZSwKPiAgICAgICAgICAgICAgICAgICAgICAgICB1aW50OF90IGxvY2ss IGJvb2wgZG1hKTsKPiAtcmFtX2FkZHJfdCB4ZW5fcmFtX2FkZHJfZnJvbV9tYXBjYWNoZSh2b2lk ICpwdHIpOwo+ICtyYW1fYWRkcl90IHhlbl9yYW1fYWRkcl9mcm9tX21hcGNhY2hlKGNvbnN0IHZv aWQgKnB0cik7Cj4gIHZvaWQgeGVuX2ludmFsaWRhdGVfbWFwX2NhY2hlX2VudHJ5KHVpbnQ4X3Qg KmJ1ZmZlcik7Cj4gIHZvaWQgeGVuX2ludmFsaWRhdGVfbWFwX2NhY2hlKHZvaWQpOwo+ICB1aW50 OF90ICp4ZW5fcmVwbGFjZV9jYWNoZV9lbnRyeShod2FkZHIgb2xkX3BoeXNfYWRkciwKPiBAQCAt NDAsNyArNDAsNyBAQCBzdGF0aWMgaW5saW5lIHVpbnQ4X3QgKnhlbl9tYXBfY2FjaGUoaHdhZGRy IHBoeXNfYWRkciwKPiAgICAgIGFib3J0KCk7Cj4gIH0KPiAgCj4gLXN0YXRpYyBpbmxpbmUgcmFt X2FkZHJfdCB4ZW5fcmFtX2FkZHJfZnJvbV9tYXBjYWNoZSh2b2lkICpwdHIpCj4gK3N0YXRpYyBp bmxpbmUgcmFtX2FkZHJfdCB4ZW5fcmFtX2FkZHJfZnJvbV9tYXBjYWNoZShjb25zdCB2b2lkICpw dHIpCj4gIHsKPiAgICAgIGFib3J0KCk7Cj4gIH0KPiBkaWZmIC0tZ2l0IGEvZXhlYy5jIGIvZXhl Yy5jCj4gaW5kZXggOGU5Y2MzYjQ3Yy4uMDJiNGU2ZWE0MSAxMDA2NDQKPiAtLS0gYS9leGVjLmMK PiArKysgYi9leGVjLmMKPiBAQCAtMjYxNCw3ICsyNjE0LDcgQEAgc3RhdGljIHZvaWQgKnFlbXVf cmFtX3B0cl9sZW5ndGgoUkFNQmxvY2sgKnJhbV9ibG9jaywgcmFtX2FkZHJfdCBhZGRyLAo+ICB9 Cj4gIAo+ICAvKiBSZXR1cm4gdGhlIG9mZnNldCBvZiBhIGhvc3Rwb2ludGVyIHdpdGhpbiBhIHJh bWJsb2NrICovCj4gLXJhbV9hZGRyX3QgcWVtdV9yYW1fYmxvY2tfaG9zdF9vZmZzZXQoUkFNQmxv Y2sgKnJiLCB2b2lkICpob3N0KQo+ICtyYW1fYWRkcl90IHFlbXVfcmFtX2Jsb2NrX2hvc3Rfb2Zm c2V0KFJBTUJsb2NrICpyYiwgY29uc3Qgdm9pZCAqaG9zdCkKPiAgewo+ICAgICAgcmFtX2FkZHJf dCByZXMgPSAodWludDhfdCAqKWhvc3QgLSAodWludDhfdCAqKXJiLT5ob3N0Owo+ICAgICAgYXNz ZXJ0KCh1aW50cHRyX3QpaG9zdCA+PSAodWludHB0cl90KXJiLT5ob3N0KTsKPiBAQCAtMjY0MCwx MSArMjY0MCwxMSBAQCByYW1fYWRkcl90IHFlbXVfcmFtX2Jsb2NrX2hvc3Rfb2Zmc2V0KFJBTUJs b2NrICpyYiwgdm9pZCAqaG9zdCkKPiAgICogcG9pbnRlciwgc3VjaCBhcyBhIHJlZmVyZW5jZSB0 byB0aGUgcmVnaW9uIHRoYXQgaW5jbHVkZXMgdGhlIGluY29taW5nCj4gICAqIHJhbV9hZGRyX3Qu Cj4gICAqLwo+IC1SQU1CbG9jayAqcWVtdV9yYW1fYmxvY2tfZnJvbV9ob3N0KHZvaWQgKnB0ciwg Ym9vbCByb3VuZF9vZmZzZXQsCj4gK1JBTUJsb2NrICpxZW11X3JhbV9ibG9ja19mcm9tX2hvc3Qo Y29uc3Qgdm9pZCAqcHRyLCBib29sIHJvdW5kX29mZnNldCwKPiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICByYW1fYWRkcl90ICpvZmZzZXQpCj4gIHsKPiAgICAgIFJBTUJsb2Nr ICpibG9jazsKPiAtICAgIHVpbnQ4X3QgKmhvc3QgPSBwdHI7Cj4gKyAgICBjb25zdCB1aW50OF90 ICpob3N0ID0gcHRyOwo+ICAKPiAgICAgIGlmICh4ZW5fZW5hYmxlZCgpKSB7Cj4gICAgICAgICAg cmFtX2FkZHJfdCByYW1fYWRkcjsKPiBAQCAtMjcwNSw3ICsyNzA1LDcgQEAgUkFNQmxvY2sgKnFl bXVfcmFtX2Jsb2NrX2J5X25hbWUoY29uc3QgY2hhciAqbmFtZSkKPiAgCj4gIC8qIFNvbWUgb2Yg dGhlIHNvZnRtbXUgcm91dGluZXMgbmVlZCB0byB0cmFuc2xhdGUgZnJvbSBhIGhvc3QgcG9pbnRl cgo+ICAgICAodHlwaWNhbGx5IGEgVExCIGVudHJ5KSBiYWNrIHRvIGEgcmFtIG9mZnNldC4gICov Cj4gLXJhbV9hZGRyX3QgcWVtdV9yYW1fYWRkcl9mcm9tX2hvc3Qodm9pZCAqcHRyKQo+ICtyYW1f YWRkcl90IHFlbXVfcmFtX2FkZHJfZnJvbV9ob3N0KGNvbnN0IHZvaWQgKnB0cikKPiAgewo+ICAg ICAgUkFNQmxvY2sgKmJsb2NrOwo+ICAgICAgcmFtX2FkZHJfdCBvZmZzZXQ7Cj4gZGlmZiAtLWdp dCBhL2h3L2kzODYveGVuL3hlbi1tYXBjYWNoZS5jIGIvaHcvaTM4Ni94ZW4veGVuLW1hcGNhY2hl LmMKPiBpbmRleCA1YjEyMGVkNDRiLi40MzJhZDMzNTRkIDEwMDY0NAo+IC0tLSBhL2h3L2kzODYv eGVuL3hlbi1tYXBjYWNoZS5jCj4gKysrIGIvaHcvaTM4Ni94ZW4veGVuLW1hcGNhY2hlLmMKPiBA QCAtMzYzLDcgKzM2Myw3IEBAIHVpbnQ4X3QgKnhlbl9tYXBfY2FjaGUoaHdhZGRyIHBoeXNfYWRk ciwgaHdhZGRyIHNpemUsCj4gICAgICByZXR1cm4gcDsKPiAgfQo+ICAKPiAtcmFtX2FkZHJfdCB4 ZW5fcmFtX2FkZHJfZnJvbV9tYXBjYWNoZSh2b2lkICpwdHIpCj4gK3JhbV9hZGRyX3QgeGVuX3Jh bV9hZGRyX2Zyb21fbWFwY2FjaGUoY29uc3Qgdm9pZCAqcHRyKQo+ICB7Cj4gICAgICBNYXBDYWNo ZUVudHJ5ICplbnRyeSA9IE5VTEw7Cj4gICAgICBNYXBDYWNoZVJldiAqcmV2ZW50cnk7Cj4gCgoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVs IG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0 cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA== 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=-8.1 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_SANE_1 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 2AC56C11D04 for ; Thu, 20 Feb 2020 13:23:00 +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 EAB11206E2 for ; Thu, 20 Feb 2020 13:22:59 +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="J6gPmvlE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EAB11206E2 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]:42076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4ln9-0008KP-2H for qemu-devel@archiver.kernel.org; Thu, 20 Feb 2020 08:22:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59236) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4llx-0006oU-Qg for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:21:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4llw-0003Kg-I5 for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:21:45 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:56432 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 1j4llw-0003KR-Ek for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:21:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582204903; 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=S4PJnWfahZa1TNC6+g1IhMFCY1W/sixaIQI4WNkTwR8=; b=J6gPmvlEcAYYGB7M6Me9KtlP+OJsJz3Ir8MvgOQVGFpL5laD/vBg5mTJv67l+4erZ0CkN2 m6aegXauLyCAdQWW8ZhyAHhvGZA1ObzLh9jJWUtzJTFrKVqg11x+fPYqn1vd10AOV6v4tu cjOX/e0T3UY+62J339+YPDrSJKJoCsQ= 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-332-CwOULh03NfSiWDriaaJwcg-1; Thu, 20 Feb 2020 08:21:42 -0500 Received: by mail-wm1-f69.google.com with SMTP id y7so591832wmd.4 for ; Thu, 20 Feb 2020 05:21:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=8fOoSsSz7tsTUHvX+UaUO6G7U94kDGpWqoCWwnJ/CO0=; b=GoNGXX1ev19cghvKHJCWGTTjlNcyx5zGkkBQ6YkUYnc4L+smEK2eJSpZBTotg49BRd auiHp75igcE4+mSmG+EutDMyA0gQ7YnJAVWofgq1/XC6q1v4sFGPoVuofQhkw2KxZxUz ZokVbyCFBc2M4th6JT2WYMQuydoBuUGOAyh4mczac/dlOUxezoerCGkEyGLL0YtU9hNU demmYvOzMHImdmWNsIjMOBFvlTrVFXucJ+NBEzzYbUio+YVlGvLrL0Qx+rhL8YxApIxh ryKWQqMMGvoSTPzund0T3OExBdpRzsN7wE+NTofbE9soVNXKsnIQqipJe/WVDCb4XAxo /vEQ== X-Gm-Message-State: APjAAAX5kR0MdKbzXuw4Lt4cniaMtJLzyTpw4+CffmoiLIYDf1zlcAi5 jKUMxOIOgxXangnea+QRgw6D78vO8ULhKHZrDmuYEEDEhi1ddKVSGI389MY7MZBZE2865kzhhcZ KyBCShW8zB19DWQs= X-Received: by 2002:a7b:ca49:: with SMTP id m9mr4782605wml.50.1582204900628; Thu, 20 Feb 2020 05:21:40 -0800 (PST) X-Google-Smtp-Source: APXvYqzKxcQLqflxe9qCIU9rTsjyGiEk6CQgzPBe/H4AxjLFCiLPx9wCf3WQ03jwpKNmMAnM1bKEcw== X-Received: by 2002:a7b:ca49:: with SMTP id m9mr4782560wml.50.1582204900358; Thu, 20 Feb 2020 05:21:40 -0800 (PST) Received: from [10.201.49.12] (nat-pool-mxp-u.redhat.com. [149.6.153.187]) by smtp.gmail.com with ESMTPSA id i2sm4415838wmb.28.2020.02.20.05.21.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 20 Feb 2020 05:21:39 -0800 (PST) Subject: Re: [PATCH v3 03/20] exec: Let qemu_ram_*() functions take a const pointer argument To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Peter Maydell , qemu-devel@nongnu.org References: <20200220130548.29974-1-philmd@redhat.com> <20200220130548.29974-4-philmd@redhat.com> From: Paolo Bonzini Message-ID: Date: Thu, 20 Feb 2020 14:21:35 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: <20200220130548.29974-4-philmd@redhat.com> Content-Language: en-US X-MC-Unique: CwOULh03NfSiWDriaaJwcg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: 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_Poussineau?= , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , 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_Le_Goater?= , John Snow , David Gibson , Igor Mitsyanko , Cornelia Huck , Michael Walle , qemu-ppc@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 20/02/20 14:05, Philippe Mathieu-Daud=C3=A9 wrote: > Signed-off-by: Philippe Mathieu-Daud=C3=A9 > --- > include/exec/cpu-common.h | 6 +++--- > include/sysemu/xen-mapcache.h | 4 ++-- > exec.c | 8 ++++---- > hw/i386/xen/xen-mapcache.c | 2 +- > 4 files changed, 10 insertions(+), 10 deletions(-) >=20 > diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h > index 81753bbb34..05ac1a5d69 100644 > --- a/include/exec/cpu-common.h > +++ b/include/exec/cpu-common.h > @@ -48,11 +48,11 @@ typedef uint32_t CPUReadMemoryFunc(void *opaque, hwad= dr addr); > =20 > void qemu_ram_remap(ram_addr_t addr, ram_addr_t length); > /* This should not be used by devices. */ > -ram_addr_t qemu_ram_addr_from_host(void *ptr); > +ram_addr_t qemu_ram_addr_from_host(const void *ptr); This is a bit ugly, because the pointer _can_ be modified via qemu_map_ram_ptr. Is this needed for the rest of the series to apply? Paolo > RAMBlock *qemu_ram_block_by_name(const char *name); > -RAMBlock *qemu_ram_block_from_host(void *ptr, bool round_offset, > +RAMBlock *qemu_ram_block_from_host(const void *ptr, bool round_offset, > ram_addr_t *offset); > -ram_addr_t qemu_ram_block_host_offset(RAMBlock *rb, void *host); > +ram_addr_t qemu_ram_block_host_offset(RAMBlock *rb, const void *host); > void qemu_ram_set_idstr(RAMBlock *block, const char *name, DeviceState *= dev); > void qemu_ram_unset_idstr(RAMBlock *block); > const char *qemu_ram_get_idstr(RAMBlock *rb); > diff --git a/include/sysemu/xen-mapcache.h b/include/sysemu/xen-mapcache.= h > index c8e7c2f6cf..81e9aa2fa6 100644 > --- a/include/sysemu/xen-mapcache.h > +++ b/include/sysemu/xen-mapcache.h > @@ -19,7 +19,7 @@ void xen_map_cache_init(phys_offset_to_gaddr_t f, > void *opaque); > uint8_t *xen_map_cache(hwaddr phys_addr, hwaddr size, > uint8_t lock, bool dma); > -ram_addr_t xen_ram_addr_from_mapcache(void *ptr); > +ram_addr_t xen_ram_addr_from_mapcache(const void *ptr); > void xen_invalidate_map_cache_entry(uint8_t *buffer); > void xen_invalidate_map_cache(void); > uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr, > @@ -40,7 +40,7 @@ static inline uint8_t *xen_map_cache(hwaddr phys_addr, > abort(); > } > =20 > -static inline ram_addr_t xen_ram_addr_from_mapcache(void *ptr) > +static inline ram_addr_t xen_ram_addr_from_mapcache(const void *ptr) > { > abort(); > } > diff --git a/exec.c b/exec.c > index 8e9cc3b47c..02b4e6ea41 100644 > --- a/exec.c > +++ b/exec.c > @@ -2614,7 +2614,7 @@ static void *qemu_ram_ptr_length(RAMBlock *ram_bloc= k, ram_addr_t addr, > } > =20 > /* Return the offset of a hostpointer within a ramblock */ > -ram_addr_t qemu_ram_block_host_offset(RAMBlock *rb, void *host) > +ram_addr_t qemu_ram_block_host_offset(RAMBlock *rb, const void *host) > { > ram_addr_t res =3D (uint8_t *)host - (uint8_t *)rb->host; > assert((uintptr_t)host >=3D (uintptr_t)rb->host); > @@ -2640,11 +2640,11 @@ ram_addr_t qemu_ram_block_host_offset(RAMBlock *r= b, void *host) > * pointer, such as a reference to the region that includes the incoming > * ram_addr_t. > */ > -RAMBlock *qemu_ram_block_from_host(void *ptr, bool round_offset, > +RAMBlock *qemu_ram_block_from_host(const void *ptr, bool round_offset, > ram_addr_t *offset) > { > RAMBlock *block; > - uint8_t *host =3D ptr; > + const uint8_t *host =3D ptr; > =20 > if (xen_enabled()) { > ram_addr_t ram_addr; > @@ -2705,7 +2705,7 @@ RAMBlock *qemu_ram_block_by_name(const char *name) > =20 > /* Some of the softmmu routines need to translate from a host pointer > (typically a TLB entry) back to a ram offset. */ > -ram_addr_t qemu_ram_addr_from_host(void *ptr) > +ram_addr_t qemu_ram_addr_from_host(const void *ptr) > { > RAMBlock *block; > ram_addr_t offset; > diff --git a/hw/i386/xen/xen-mapcache.c b/hw/i386/xen/xen-mapcache.c > index 5b120ed44b..432ad3354d 100644 > --- a/hw/i386/xen/xen-mapcache.c > +++ b/hw/i386/xen/xen-mapcache.c > @@ -363,7 +363,7 @@ uint8_t *xen_map_cache(hwaddr phys_addr, hwaddr size, > return p; > } > =20 > -ram_addr_t xen_ram_addr_from_mapcache(void *ptr) > +ram_addr_t xen_ram_addr_from_mapcache(const void *ptr) > { > MapCacheEntry *entry =3D NULL; > MapCacheRev *reventry; >=20