From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:cb43:0:0:0:0:0 with SMTP id b64csp543087lfg; Thu, 20 Feb 2020 05:06:10 -0800 (PST) X-Google-Smtp-Source: APXvYqws8AtM/5AnyEATYmHLbvHY2qGFUVxyTOb525XQza8OBlq4atRJDbeaUMtKKji/d2+ZCRCW X-Received: by 2002:a9d:65cb:: with SMTP id z11mr22019091oth.348.1582203970526; Thu, 20 Feb 2020 05:06:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582203970; cv=none; d=google.com; s=arc-20160816; b=DOi9VnYDO9hMbymFbgrP1Jwib0ghIy0+qWnfgPP+PWhB2XBWbhq7LVZLM8eALVN9pn apKlNadpdFNQK6QJF28jDZDM3nzX1vC6MLpOj9y+9tuhD4TxvbvXsbL9WmmCe58N3Ihm rk1kZly7lSX7XBI9mhMvAov1iJNa3hlZQTWJ8ZJ5SHeW3IETcwl+yfPGY/0YMGT0HNn9 Lx7T/nnc7i1D6AWx3uo+qlEy2ULsNStv6WlETo+EaXK8GJcLBcpEMMbneR8cvu6RhlwZ g3PpWTo8geZTPAV/vOvFS0AOO31wGMIvlwZWH2NQdb64VXav5sC2wNsCkEz0opezjq9g 7sFA== 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=8odk76d2z3izhK+yPuh+zYi/Cj4FHaZPMzDDqjJ0XeE=; b=LuMH1owc1ut9ontEJRZp70x43ZSdXXoSCTf7/fm1Hm3NfEEkRp1/QzZwIMJwSH7Ky6 y0zhVhVeziS62H0DtYwzLG5nab0aNqeEvaYnimzDvKLs27IaQf/BN8fnBLpqQLDCDlMx H4ju5n9rejpdnguXXWf5xz4DtoGmnU2OKJfAINNdKg1aT95Detzem9KiHth5WJFkd8Y/ A6larPu/l5yZXUhJc/bLxqAs+EsatI+5DAnwDok+czs1pADZawKedVQY+MvvPR18RjeV VO0pCKoQoNTw/eIRD5XsOW0gSwiipzz4ayfPqEVJsFk/8w0rcIb6TOOaXYvmqVqWBuJ6 yqLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=YCpCq2pX; 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.10; Thu, 20 Feb 2020 05:06:10 -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=YCpCq2pX; 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 S1728143AbgBTNGJ (ORCPT + 5 others); Thu, 20 Feb 2020 08:06:09 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:55176 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728114AbgBTNGJ (ORCPT ); Thu, 20 Feb 2020 08:06:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582203968; 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=8odk76d2z3izhK+yPuh+zYi/Cj4FHaZPMzDDqjJ0XeE=; b=YCpCq2pXOtLFGTShEFq0RZZ/S/ZfrjkulMnvcAIoja0IOzePIQgQe9AzgjTqHBKS31FcGm gHXPabK6oCBvXW4+1wKKfui7wVOIQFi2ruhvrQum0lZ0mpaWbMkbfvtL5L7n0OQwpLukMY Ag/0fap2q/Uuaugx0SAQo+zN5mdXVf0= 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-56--YlLcAl2PfOvzevvfk78rQ-1; Thu, 20 Feb 2020 08:06:06 -0500 X-MC-Unique: -YlLcAl2PfOvzevvfk78rQ-1 Received: by mail-wm1-f72.google.com with SMTP id u11so802782wmb.4 for ; Thu, 20 Feb 2020 05:06:06 -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=8odk76d2z3izhK+yPuh+zYi/Cj4FHaZPMzDDqjJ0XeE=; b=Zgzq2TB4G4Qeg1IwTvW9gQPrpZT5Q658d81+qKgC+AwWrAo2+uYxFcFGsS8MBHCWVf QT/A6uJlxTjbjgGC2AtOcGoanukgmJrHyBa1DXFOhArDEBjjEyWGfYRxzTjnEqIdw9po j0cB0QWzEeZPMXd1CR1uuTptvq4yp0bqbNNvc0c3NiHgd+lOJm1Ku+bvhe7QyP1WSkLB 7F50ZOF3CAa3ih5uzVSiWACOGWFiygVVN2Sa0vlimGuSMyOtNrpqbgn9mPmferdshmIg APynmWcNFIpqNIDW2ptEWkE2E5ezYJHRcA/UB1xZ9rN2Az/1SwsFi2AHJ3gEG2/+24BX 7cUg== X-Gm-Message-State: APjAAAXfDcMVjANF2qOIvYGCGQvxJ6t5yZtVuZq5BYQaN9+NOVCtK22n 0WcHqQVIeyChpCWwSkv0eFfbR6rirUTMYhJNqWXK+DZTE2i1fyYiRcAV90aMfvzkvoCbQjZbVn1 HarVOE1Tshz5C X-Received: by 2002:a5d:4e91:: with SMTP id e17mr40459252wru.233.1582203965282; Thu, 20 Feb 2020 05:06:05 -0800 (PST) X-Received: by 2002:a5d:4e91:: with SMTP id e17mr40459189wru.233.1582203964946; Thu, 20 Feb 2020 05:06:04 -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.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:04 -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 03/20] exec: Let qemu_ram_*() functions take a const pointer argument Date: Thu, 20 Feb 2020 14:05:31 +0100 Message-Id: <20200220130548.29974-4-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: RuyMIk3KKMNl 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); 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; -- 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 02BA2C11D07 for ; Thu, 20 Feb 2020 13:06:22 +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 CD887206E2 for ; Thu, 20 Feb 2020 13:06:21 +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="dB3aYcX+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD887206E2 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 1j4lWs-00011L-Pe; Thu, 20 Feb 2020 13:06:10 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j4lWs-00010q-6y for xen-devel@lists.xenproject.org; Thu, 20 Feb 2020 13:06:10 +0000 X-Inumbo-ID: c29d4552-53e1-11ea-b0fd-bc764e2007e4 Received: from us-smtp-delivery-1.mimecast.com (unknown [207.211.31.120]) by us1-rack-iad1.inumbo.com (Halon) with ESMTP id c29d4552-53e1-11ea-b0fd-bc764e2007e4; Thu, 20 Feb 2020 13:06:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582203968; 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=FX3FXQX3OgJ73Ij27vj7Z7zPMOBdko14sr77VldpMU0=; b=dB3aYcX+HHVZYTfEAkajM9JqlWq0mr4IQgD5jiLZWBtr+2u3jdd/ipu/ozaBLsHqzvOrns EXdraVh1Nomg52ebsCs5eKlFpWRoUcwx2w2ZhF2aAq3E16t2HL5WLuvdjLzzdX9ZwD6ww+ o9piFQsqYj9mGMkVGXI02QE5hwSzZyM= 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-235-7yXeH7kMOjKik46Yn4-LgA-1; Thu, 20 Feb 2020 08:06:06 -0500 Received: by mail-wm1-f69.google.com with SMTP id t17so797552wmi.7 for ; Thu, 20 Feb 2020 05:06:06 -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=8odk76d2z3izhK+yPuh+zYi/Cj4FHaZPMzDDqjJ0XeE=; b=gK2MOeHNX88KsVmgdp0bJwYNVMQs2yzHwdM8vKPgkHvzHkw3lOQS9iXtpNc+po7T8Q 881uNDTJrxKI90MNbu7DlQidvyH7uLZjmeVVhJHdPOoUUqxesryXsXyhhx90XUmpfBy4 cqUFWTAofkLTeLFdibCOhL9kl56UyIYQTo6rLgY4b6GEq69Lq42DTCpUwWBSqinwe7XN qfvme/cUY0RRee9sKQGzDqSMMdpgTaaNZkau7v/P2edZoeTc7A5Fzb82WYnh6RUOT5U8 zmK3bC3Kd/xqlso2c/mdeDXg83dlDgWL2laUVyrg/91NwiSvZM/qgv4Yc/yxIL6DaL6G 52QQ== X-Gm-Message-State: APjAAAVCMg2Kmp8OknzyQCgkrHN+mz2cq2nUguNRY3TzfVsZb7QEOhs8 sQavblx72jNGB6yjhaSXEzpRZjMu4hqBZZDC1vHj2lv8cDGsDYyrJHyoNrI1RXVPRaLN+OhiZ4Q 1ZRh1rxM0OnOKvAZ8Pu3MhDdHFJk= X-Received: by 2002:a5d:4e91:: with SMTP id e17mr40459245wru.233.1582203965279; Thu, 20 Feb 2020 05:06:05 -0800 (PST) X-Google-Smtp-Source: APXvYqxYyC0rm9Zmq8Udvt5K4WfGoUA6AsKImvpwZLE6azxpWra0StVD53WtA0C45GVywJSMzTwuwQ== X-Received: by 2002:a5d:4e91:: with SMTP id e17mr40459189wru.233.1582203964946; Thu, 20 Feb 2020 05:06:04 -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.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:04 -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:31 +0100 Message-Id: <20200220130548.29974-4-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: 7yXeH7kMOjKik46Yn4-LgA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [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=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" U2lnbmVkLW9mZi1ieTogUGhpbGlwcGUgTWF0aGlldS1EYXVkw6kgPHBoaWxtZEByZWRoYXQuY29t PgotLS0KIGluY2x1ZGUvZXhlYy9jcHUtY29tbW9uLmggICAgIHwgNiArKystLS0KIGluY2x1ZGUv c3lzZW11L3hlbi1tYXBjYWNoZS5oIHwgNCArKy0tCiBleGVjLmMgICAgICAgICAgICAgICAgICAg ICAgICB8IDggKysrKy0tLS0KIGh3L2kzODYveGVuL3hlbi1tYXBjYWNoZS5jICAgIHwgMiArLQog NCBmaWxlcyBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9pbmNsdWRlL2V4ZWMvY3B1LWNvbW1vbi5oIGIvaW5jbHVkZS9leGVjL2NwdS1jb21t b24uaAppbmRleCA4MTc1M2JiYjM0Li4wNWFjMWE1ZDY5IDEwMDY0NAotLS0gYS9pbmNsdWRlL2V4 ZWMvY3B1LWNvbW1vbi5oCisrKyBiL2luY2x1ZGUvZXhlYy9jcHUtY29tbW9uLmgKQEAgLTQ4LDEx ICs0OCwxMSBAQCB0eXBlZGVmIHVpbnQzMl90IENQVVJlYWRNZW1vcnlGdW5jKHZvaWQgKm9wYXF1 ZSwgaHdhZGRyIGFkZHIpOwogCiB2b2lkIHFlbXVfcmFtX3JlbWFwKHJhbV9hZGRyX3QgYWRkciwg cmFtX2FkZHJfdCBsZW5ndGgpOwogLyogVGhpcyBzaG91bGQgbm90IGJlIHVzZWQgYnkgZGV2aWNl cy4gICovCi1yYW1fYWRkcl90IHFlbXVfcmFtX2FkZHJfZnJvbV9ob3N0KHZvaWQgKnB0cik7City YW1fYWRkcl90IHFlbXVfcmFtX2FkZHJfZnJvbV9ob3N0KGNvbnN0IHZvaWQgKnB0cik7CiBSQU1C bG9jayAqcWVtdV9yYW1fYmxvY2tfYnlfbmFtZShjb25zdCBjaGFyICpuYW1lKTsKLVJBTUJsb2Nr ICpxZW11X3JhbV9ibG9ja19mcm9tX2hvc3Qodm9pZCAqcHRyLCBib29sIHJvdW5kX29mZnNldCwK K1JBTUJsb2NrICpxZW11X3JhbV9ibG9ja19mcm9tX2hvc3QoY29uc3Qgdm9pZCAqcHRyLCBib29s IHJvdW5kX29mZnNldCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmFtX2Fk ZHJfdCAqb2Zmc2V0KTsKLXJhbV9hZGRyX3QgcWVtdV9yYW1fYmxvY2tfaG9zdF9vZmZzZXQoUkFN QmxvY2sgKnJiLCB2b2lkICpob3N0KTsKK3JhbV9hZGRyX3QgcWVtdV9yYW1fYmxvY2tfaG9zdF9v ZmZzZXQoUkFNQmxvY2sgKnJiLCBjb25zdCB2b2lkICpob3N0KTsKIHZvaWQgcWVtdV9yYW1fc2V0 X2lkc3RyKFJBTUJsb2NrICpibG9jaywgY29uc3QgY2hhciAqbmFtZSwgRGV2aWNlU3RhdGUgKmRl dik7CiB2b2lkIHFlbXVfcmFtX3Vuc2V0X2lkc3RyKFJBTUJsb2NrICpibG9jayk7CiBjb25zdCBj aGFyICpxZW11X3JhbV9nZXRfaWRzdHIoUkFNQmxvY2sgKnJiKTsKZGlmZiAtLWdpdCBhL2luY2x1 ZGUvc3lzZW11L3hlbi1tYXBjYWNoZS5oIGIvaW5jbHVkZS9zeXNlbXUveGVuLW1hcGNhY2hlLmgK aW5kZXggYzhlN2MyZjZjZi4uODFlOWFhMmZhNiAxMDA2NDQKLS0tIGEvaW5jbHVkZS9zeXNlbXUv eGVuLW1hcGNhY2hlLmgKKysrIGIvaW5jbHVkZS9zeXNlbXUveGVuLW1hcGNhY2hlLmgKQEAgLTE5 LDcgKzE5LDcgQEAgdm9pZCB4ZW5fbWFwX2NhY2hlX2luaXQocGh5c19vZmZzZXRfdG9fZ2FkZHJf dCBmLAogICAgICAgICAgICAgICAgICAgICAgICAgdm9pZCAqb3BhcXVlKTsKIHVpbnQ4X3QgKnhl bl9tYXBfY2FjaGUoaHdhZGRyIHBoeXNfYWRkciwgaHdhZGRyIHNpemUsCiAgICAgICAgICAgICAg ICAgICAgICAgIHVpbnQ4X3QgbG9jaywgYm9vbCBkbWEpOwotcmFtX2FkZHJfdCB4ZW5fcmFtX2Fk ZHJfZnJvbV9tYXBjYWNoZSh2b2lkICpwdHIpOworcmFtX2FkZHJfdCB4ZW5fcmFtX2FkZHJfZnJv bV9tYXBjYWNoZShjb25zdCB2b2lkICpwdHIpOwogdm9pZCB4ZW5faW52YWxpZGF0ZV9tYXBfY2Fj aGVfZW50cnkodWludDhfdCAqYnVmZmVyKTsKIHZvaWQgeGVuX2ludmFsaWRhdGVfbWFwX2NhY2hl KHZvaWQpOwogdWludDhfdCAqeGVuX3JlcGxhY2VfY2FjaGVfZW50cnkoaHdhZGRyIG9sZF9waHlz X2FkZHIsCkBAIC00MCw3ICs0MCw3IEBAIHN0YXRpYyBpbmxpbmUgdWludDhfdCAqeGVuX21hcF9j YWNoZShod2FkZHIgcGh5c19hZGRyLAogICAgIGFib3J0KCk7CiB9CiAKLXN0YXRpYyBpbmxpbmUg cmFtX2FkZHJfdCB4ZW5fcmFtX2FkZHJfZnJvbV9tYXBjYWNoZSh2b2lkICpwdHIpCitzdGF0aWMg aW5saW5lIHJhbV9hZGRyX3QgeGVuX3JhbV9hZGRyX2Zyb21fbWFwY2FjaGUoY29uc3Qgdm9pZCAq cHRyKQogewogICAgIGFib3J0KCk7CiB9CmRpZmYgLS1naXQgYS9leGVjLmMgYi9leGVjLmMKaW5k ZXggOGU5Y2MzYjQ3Yy4uMDJiNGU2ZWE0MSAxMDA2NDQKLS0tIGEvZXhlYy5jCisrKyBiL2V4ZWMu YwpAQCAtMjYxNCw3ICsyNjE0LDcgQEAgc3RhdGljIHZvaWQgKnFlbXVfcmFtX3B0cl9sZW5ndGgo UkFNQmxvY2sgKnJhbV9ibG9jaywgcmFtX2FkZHJfdCBhZGRyLAogfQogCiAvKiBSZXR1cm4gdGhl IG9mZnNldCBvZiBhIGhvc3Rwb2ludGVyIHdpdGhpbiBhIHJhbWJsb2NrICovCi1yYW1fYWRkcl90 IHFlbXVfcmFtX2Jsb2NrX2hvc3Rfb2Zmc2V0KFJBTUJsb2NrICpyYiwgdm9pZCAqaG9zdCkKK3Jh bV9hZGRyX3QgcWVtdV9yYW1fYmxvY2tfaG9zdF9vZmZzZXQoUkFNQmxvY2sgKnJiLCBjb25zdCB2 b2lkICpob3N0KQogewogICAgIHJhbV9hZGRyX3QgcmVzID0gKHVpbnQ4X3QgKilob3N0IC0gKHVp bnQ4X3QgKilyYi0+aG9zdDsKICAgICBhc3NlcnQoKHVpbnRwdHJfdClob3N0ID49ICh1aW50cHRy X3QpcmItPmhvc3QpOwpAQCAtMjY0MCwxMSArMjY0MCwxMSBAQCByYW1fYWRkcl90IHFlbXVfcmFt X2Jsb2NrX2hvc3Rfb2Zmc2V0KFJBTUJsb2NrICpyYiwgdm9pZCAqaG9zdCkKICAqIHBvaW50ZXIs IHN1Y2ggYXMgYSByZWZlcmVuY2UgdG8gdGhlIHJlZ2lvbiB0aGF0IGluY2x1ZGVzIHRoZSBpbmNv bWluZwogICogcmFtX2FkZHJfdC4KICAqLwotUkFNQmxvY2sgKnFlbXVfcmFtX2Jsb2NrX2Zyb21f aG9zdCh2b2lkICpwdHIsIGJvb2wgcm91bmRfb2Zmc2V0LAorUkFNQmxvY2sgKnFlbXVfcmFtX2Js b2NrX2Zyb21faG9zdChjb25zdCB2b2lkICpwdHIsIGJvb2wgcm91bmRfb2Zmc2V0LAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICByYW1fYWRkcl90ICpvZmZzZXQpCiB7CiAgICAg UkFNQmxvY2sgKmJsb2NrOwotICAgIHVpbnQ4X3QgKmhvc3QgPSBwdHI7CisgICAgY29uc3QgdWlu dDhfdCAqaG9zdCA9IHB0cjsKIAogICAgIGlmICh4ZW5fZW5hYmxlZCgpKSB7CiAgICAgICAgIHJh bV9hZGRyX3QgcmFtX2FkZHI7CkBAIC0yNzA1LDcgKzI3MDUsNyBAQCBSQU1CbG9jayAqcWVtdV9y YW1fYmxvY2tfYnlfbmFtZShjb25zdCBjaGFyICpuYW1lKQogCiAvKiBTb21lIG9mIHRoZSBzb2Z0 bW11IHJvdXRpbmVzIG5lZWQgdG8gdHJhbnNsYXRlIGZyb20gYSBob3N0IHBvaW50ZXIKICAgICh0 eXBpY2FsbHkgYSBUTEIgZW50cnkpIGJhY2sgdG8gYSByYW0gb2Zmc2V0LiAgKi8KLXJhbV9hZGRy X3QgcWVtdV9yYW1fYWRkcl9mcm9tX2hvc3Qodm9pZCAqcHRyKQorcmFtX2FkZHJfdCBxZW11X3Jh bV9hZGRyX2Zyb21faG9zdChjb25zdCB2b2lkICpwdHIpCiB7CiAgICAgUkFNQmxvY2sgKmJsb2Nr OwogICAgIHJhbV9hZGRyX3Qgb2Zmc2V0OwpkaWZmIC0tZ2l0IGEvaHcvaTM4Ni94ZW4veGVuLW1h cGNhY2hlLmMgYi9ody9pMzg2L3hlbi94ZW4tbWFwY2FjaGUuYwppbmRleCA1YjEyMGVkNDRiLi40 MzJhZDMzNTRkIDEwMDY0NAotLS0gYS9ody9pMzg2L3hlbi94ZW4tbWFwY2FjaGUuYworKysgYi9o dy9pMzg2L3hlbi94ZW4tbWFwY2FjaGUuYwpAQCAtMzYzLDcgKzM2Myw3IEBAIHVpbnQ4X3QgKnhl bl9tYXBfY2FjaGUoaHdhZGRyIHBoeXNfYWRkciwgaHdhZGRyIHNpemUsCiAgICAgcmV0dXJuIHA7 CiB9CiAKLXJhbV9hZGRyX3QgeGVuX3JhbV9hZGRyX2Zyb21fbWFwY2FjaGUodm9pZCAqcHRyKQor cmFtX2FkZHJfdCB4ZW5fcmFtX2FkZHJfZnJvbV9tYXBjYWNoZShjb25zdCB2b2lkICpwdHIpCiB7 CiAgICAgTWFwQ2FjaGVFbnRyeSAqZW50cnkgPSBOVUxMOwogICAgIE1hcENhY2hlUmV2ICpyZXZl bnRyeTsKLS0gCjIuMjEuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2pl Y3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4t ZGV2ZWw= 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 AF600C11D04 for ; Thu, 20 Feb 2020 13:09:26 +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 7CA07206ED for ; Thu, 20 Feb 2020 13:09:26 +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="fd+KOQ/J" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7CA07206ED 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]:41580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4la1-0001hP-GZ for qemu-devel@archiver.kernel.org; Thu, 20 Feb 2020 08:09:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56044) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4lXI-0005Mt-Js for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4lXE-0005FK-1u for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:36 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:50998 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j4lXD-0005EM-St for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582203991; 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=FX3FXQX3OgJ73Ij27vj7Z7zPMOBdko14sr77VldpMU0=; b=fd+KOQ/JtZluiWrqw7X7t7pCKX1lN0Ek+zv0VS8zFMNmeqHHwktKH2u6d+0SayH6WMWbPR PeWoLDk19HZkMiRtSqWJUv+E4VI/m+1SVEfWO3LJpeVdE255WFe5zNNnbeWo826AaxEzNk VJQh10Q8t5w6zSHl37IP4w6pD5tUWYM= 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-14-BGgf0KZ_N6evfS_bAr0TkQ-1; Thu, 20 Feb 2020 08:06:29 -0500 X-MC-Unique: BGgf0KZ_N6evfS_bAr0TkQ-1 Received: by mail-wr1-f70.google.com with SMTP id c6so1696593wrm.18 for ; Thu, 20 Feb 2020 05:06:29 -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=8odk76d2z3izhK+yPuh+zYi/Cj4FHaZPMzDDqjJ0XeE=; b=cD5BLjMsgIB4XqaeAIPGbrbuSbpvanMEzIPOefTz0xgs9MUDFe/uK9DgfcRu1im5NP xpSlYhK8oZqZjKo8uG08kjNpIhAxv5oJd29L3+ihSYJjVRQTt+fgRa7tU8yADPq3c9Bh 9MhNHS7cSXzUqGUCLQgTQanTSIfeagn/DEVTqr5czB7do/ssAio8G90tx2tCPaL2Lj2x BmK726a4f4YZSQJzbEYi9HF4/K5hoL83FlH+c157DuwEsXLzC/9pvxXqPrUUeMd6clwA C8+PvNHtb7QYRop8y5Dfqaf5Nmknha5z9DZ42sX8BKBf2YFeFJB5a0LoCFLEfZms/mSK 7GMA== X-Gm-Message-State: APjAAAWkPWiN5KnEWDeci2PskIFgIMbPv1a06GJSFd/6uLTwxdBXwfwH cPkOa6lV2F0HfEx0YXGLojwHqzSyRvJWdPAnOq1L4R+B/VSnG+S9YLnnJQiUknMsCUVN2q1WrNf UuqnJTtca3j8TxWQ= X-Received: by 2002:a5d:4e91:: with SMTP id e17mr40459254wru.233.1582203965282; Thu, 20 Feb 2020 05:06:05 -0800 (PST) X-Google-Smtp-Source: APXvYqxYyC0rm9Zmq8Udvt5K4WfGoUA6AsKImvpwZLE6azxpWra0StVD53WtA0C45GVywJSMzTwuwQ== X-Received: by 2002:a5d:4e91:: with SMTP id e17mr40459189wru.233.1582203964946; Thu, 20 Feb 2020 05:06:04 -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.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:04 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Subject: [PATCH v3 03/20] exec: Let qemu_ram_*() functions take a const pointer argument Date: Thu, 20 Feb 2020 14:05:31 +0100 Message-Id: <20200220130548.29974-4-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 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" 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(-) 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); =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); 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 *de= v); 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_block,= 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 *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 =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 2.21.1