From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:cb43:0:0:0:0:0 with SMTP id b64csp543344lfg; Thu, 20 Feb 2020 05:06:23 -0800 (PST) X-Google-Smtp-Source: APXvYqxX6l/Q04M94ZDbrgXdrtuZ2JPGpQrZcO37E4szYVWR/K1fNDMptnBgLWBf1YBuThq+McrW X-Received: by 2002:a9d:1ca3:: with SMTP id l35mr22987568ota.271.1582203982832; Thu, 20 Feb 2020 05:06:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582203982; cv=none; d=google.com; s=arc-20160816; b=FuRC9eTGz5y3og3uCN0u6raTh6pM9PM93CKe7hCwpzPyZ+Be6EZgQfMVaQWfnOTkcn vSHuKpWOvhNU34mcRgGn7QH2riuvWjyNMYLiVQHTOS6h978nrrMIwEW1alR0vSzX/8rC 96S84OwhyQrH1MvT31uVJ+aajuxtLTMXRTwXUuaOkjQBw+8mrKd9ETN5zEva5tQhJ5Cn cKTVPufzYgHJlqrK8eNaCxkG+nZVwLauIMzRUVze6gfXPJYCFUtkqgrsjJy1P8j7Jru3 RmW0ctxW4ClOMkCvmcwm5mHpqxUC73AP6+ERVkgJRlRryuT8+nGFFaRfr2njlPDLjiAi +bqQ== 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=f0ShsBpyUInIOkeskmM477n/0YX3Rn03mTxtkP3QCEQ=; b=nsOOjPlCuVVacX4uXXUZFuYITE+ZHYAfzgt+E78T5T/o1b2jXtGV2QwLX+oHVzOa7C pDBV4dAAM4wMLd7RR8lzZE7ogkEnScnuFT+KoZ/iWUtpQP6ji1xayIOAnOYve6pyKQd2 PosmHxMHUssCuMsTPB1XvVIA0uSUNGKzvOw1c//+K7r5PLEfT7dnQ1ZZFhCbzCgErHZy U/i1k18lpWqW4dJqtObeSWb4BarBwtZuoXnMk7AzJh2kl+F6swFZXXaoHpuqF7hQWSGJ ACflB3m5/J8f5EpxR+MF7yNpVc8Lr22SRGZOET/7JdSupVNeRddtad6Fvc7pkFHO6UQn eIJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=RkpHTvVx; 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.22; Thu, 20 Feb 2020 05:06:22 -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=RkpHTvVx; 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 S1728115AbgBTNGV (ORCPT + 5 others); Thu, 20 Feb 2020 08:06:21 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:49684 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728129AbgBTNGV (ORCPT ); Thu, 20 Feb 2020 08:06:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582203979; 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=f0ShsBpyUInIOkeskmM477n/0YX3Rn03mTxtkP3QCEQ=; b=RkpHTvVxoA6EN+px0g/siCn4StJ5rLMmXztnagN5X5NPCuBnUYFtVND+lDln4EhnJptUkc xn1wsgg1Vuu9zWz5MN0AyV9y/5oE4YU3gUhR2pejBdPT9VwF9++T2FXu8/Bvrtog9vibrB UYJdDjRBDxVTj8nW/s3o/FbHMKoMN6I= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-148-1dhPhWMvOZCxF72YQPgxWQ-1; Thu, 20 Feb 2020 08:06:17 -0500 X-MC-Unique: 1dhPhWMvOZCxF72YQPgxWQ-1 Received: by mail-wm1-f70.google.com with SMTP id b205so806641wmh.2 for ; Thu, 20 Feb 2020 05:06:17 -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=f0ShsBpyUInIOkeskmM477n/0YX3Rn03mTxtkP3QCEQ=; b=dhCYssWxHvoKhuxK+ODATSs06aTKFvGR7bMMjIlkeoFtXDLJ8agLMsbx/PZMWi5s5E 1ZF8kYAv8H1m6yur9OBgO41k6GKDiZjh0rlpcU//5rdwSbL87+ZPxsQhGM9OsNkDpMZ0 vO4a+RoikBhfN5V+/2HLClMP7yRaEFFuNDIgD7QUGyEunODS52czDNUXCRaf1yf7HNHt h/4N7lh4mbe7YfGpcsbKjhgtCY22donfqlFT/f01W85wW7P1FHar+2GO8Ru1nBoYLLsI l8f0RE1w5Gvvqx3BD9DGB881/Sh3BrduAbwHU0gTNlZ7o8VrihQg23icz5PhqIDvkOq+ GTVg== X-Gm-Message-State: APjAAAVxxT4/oM+y2CYJOty7O+ZF26/N9FxWxzxpVvHK6JNAx9kF+pIh mlQ8VebU3QuvSyIEFZsSWtO2mLt8VXarAjMZUGFPitSaGlC8a/0KQXkTlrLDifCgrzs177lRs/8 qN1hhqLSVS/G0 X-Received: by 2002:adf:ec02:: with SMTP id x2mr9464159wrn.8.1582203976198; Thu, 20 Feb 2020 05:06:16 -0800 (PST) X-Received: by 2002:adf:ec02:: with SMTP id x2mr9464128wrn.8.1582203975917; Thu, 20 Feb 2020 05:06:15 -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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:15 -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 06/20] exec: Let the address_space API use void pointer arguments Date: Thu, 20 Feb 2020 14:05:34 +0100 Message-Id: <20200220130548.29974-7-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: Xr1e7OD0RwmB As we are only dealing with a blob buffer, use a void pointer argument. This will let us simplify other APIs. Signed-off-by: Philippe Mathieu-Daudé --- include/exec/memory.h | 12 ++++++------ exec.c | 11 ++++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 6f8084f45e..afee185eae 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -2052,7 +2052,7 @@ void address_space_remove_listeners(AddressSpace *as); * @is_write: indicates the transfer direction */ MemTxResult address_space_rw(AddressSpace *as, hwaddr addr, - MemTxAttrs attrs, uint8_t *buf, + MemTxAttrs attrs, void *buf, hwaddr len, bool is_write); /** @@ -2070,7 +2070,7 @@ MemTxResult address_space_rw(AddressSpace *as, hwaddr addr, */ MemTxResult address_space_write(AddressSpace *as, hwaddr addr, MemTxAttrs attrs, - const uint8_t *buf, hwaddr len); + const void *buf, hwaddr len); /** * address_space_write_rom: write to address space, including ROM. @@ -2096,7 +2096,7 @@ MemTxResult address_space_write(AddressSpace *as, hwaddr addr, */ MemTxResult address_space_write_rom(AddressSpace *as, hwaddr addr, MemTxAttrs attrs, - const uint8_t *buf, hwaddr len); + const void *buf, hwaddr len); /* address_space_ld*: load from an address space * address_space_st*: store to an address space @@ -2334,7 +2334,7 @@ void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len, /* Internal functions, part of the implementation of address_space_read. */ MemTxResult address_space_read_full(AddressSpace *as, hwaddr addr, - MemTxAttrs attrs, uint8_t *buf, hwaddr len); + MemTxAttrs attrs, void *buf, hwaddr len); MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr, MemTxAttrs attrs, void *buf, hwaddr len, hwaddr addr1, hwaddr l, @@ -2374,7 +2374,7 @@ static inline bool memory_access_is_direct(MemoryRegion *mr, bool is_write) */ static inline __attribute__((__always_inline__)) MemTxResult address_space_read(AddressSpace *as, hwaddr addr, - MemTxAttrs attrs, uint8_t *buf, + MemTxAttrs attrs, void *buf, hwaddr len) { MemTxResult result = MEMTX_OK; @@ -2433,7 +2433,7 @@ address_space_read_cached(MemoryRegionCache *cache, hwaddr addr, */ static inline void address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, - void *buf, hwaddr len) + const void *buf, hwaddr len) { assert(addr < cache->len && len <= cache->len - addr); if (likely(cache->ptr)) { diff --git a/exec.c b/exec.c index 980cc0e2b2..1a80159996 100644 --- a/exec.c +++ b/exec.c @@ -3271,7 +3271,7 @@ static MemTxResult flatview_read(FlatView *fv, hwaddr addr, } MemTxResult address_space_read_full(AddressSpace *as, hwaddr addr, - MemTxAttrs attrs, uint8_t *buf, hwaddr len) + MemTxAttrs attrs, void *buf, hwaddr len) { MemTxResult result = MEMTX_OK; FlatView *fv; @@ -3287,7 +3287,7 @@ MemTxResult address_space_read_full(AddressSpace *as, hwaddr addr, MemTxResult address_space_write(AddressSpace *as, hwaddr addr, MemTxAttrs attrs, - const uint8_t *buf, hwaddr len) + const void *buf, hwaddr len) { MemTxResult result = MEMTX_OK; FlatView *fv; @@ -3302,7 +3302,7 @@ MemTxResult address_space_write(AddressSpace *as, hwaddr addr, } MemTxResult address_space_rw(AddressSpace *as, hwaddr addr, MemTxAttrs attrs, - uint8_t *buf, hwaddr len, bool is_write) + void *buf, hwaddr len, bool is_write) { if (is_write) { return address_space_write(as, addr, attrs, buf, len); @@ -3326,7 +3326,7 @@ enum write_rom_type { static inline MemTxResult address_space_write_rom_internal(AddressSpace *as, hwaddr addr, MemTxAttrs attrs, - const uint8_t *buf, + const void *ptr, hwaddr len, enum write_rom_type type) { @@ -3334,6 +3334,7 @@ static inline MemTxResult address_space_write_rom_internal(AddressSpace *as, uint8_t *ram_ptr; hwaddr addr1; MemoryRegion *mr; + const uint8_t *buf = ptr; RCU_READ_LOCK_GUARD(); while (len > 0) { @@ -3366,7 +3367,7 @@ static inline MemTxResult address_space_write_rom_internal(AddressSpace *as, /* used for ROM loading : can write in RAM and ROM */ MemTxResult address_space_write_rom(AddressSpace *as, hwaddr addr, MemTxAttrs attrs, - const uint8_t *buf, hwaddr len) + const void *buf, hwaddr len) { return address_space_write_rom_internal(as, addr, attrs, buf, len, WRITE_DATA); -- 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 EAA5CC11D0B 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 C18C3206ED for ; Thu, 20 Feb 2020 13:06:35 +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="Iq+j47c/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C18C3206ED 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 1j4lX5-00018b-Ok; Thu, 20 Feb 2020 13:06:23 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j4lX3-00016n-Qj for xen-devel@lists.xenproject.org; Thu, 20 Feb 2020 13:06:21 +0000 X-Inumbo-ID: ca1a1724-53e1-11ea-b0fd-bc764e2007e4 Received: from us-smtp-delivery-1.mimecast.com (unknown [207.211.31.81]) by us1-rack-iad1.inumbo.com (Halon) with ESMTP id ca1a1724-53e1-11ea-b0fd-bc764e2007e4; Thu, 20 Feb 2020 13:06:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582203981; 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=9T2fAo+6xtdSOASO+MDoJq7z4DL4xf6hcEaFpq9VX4A=; b=Iq+j47c/71o4ui3iyND8W4PWFq5fKyG5tcPNoZ5ML/QJTrFQZ9r2z7pVid5DzE0rgAWftc fOVYSsSqT6vNb8PzflBwqLaqTfRx1OI+1o0rYtd35UhllgX9M73uZHbZO/o43pnoeScs7e OPnJdmqnXJ8mYT/nMEPpvQfABMRnfFo= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-313-Sr4y9MXaMCytIX_rIUtg6Q-1; Thu, 20 Feb 2020 08:06:19 -0500 Received: by mail-wr1-f72.google.com with SMTP id d8so1701512wrq.12 for ; Thu, 20 Feb 2020 05:06:19 -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=f0ShsBpyUInIOkeskmM477n/0YX3Rn03mTxtkP3QCEQ=; b=OA6JD0bZL/nZuvgLST800VfqRxWlWm6Pq6iz19hxr8EVAeFNcxIHr/zKI1/1HaLq4j ZY4sP3bzjGyvVLIYVgN6Hbey1CQSvw81MKgmZaSNQhBGjyBz3m+wwtDLOKC7MMozfjYR LWT7mqF9+qX9MdDJI3AUfqlEQuQ78Wa4ibPa24PUHfJaosWsHVTZcy70aQ0tZpWbQm+k SpwNiTq8VehgMKvgE59z1ObUcHYiiDEh9h/czD6SZHD/LwuxkH8/VJToJKgx/OCS3tVk Fqj7SOfJ3lPQGZVSgJ5rsb5aETXMnxDO/iW4PhVbm7VX7z3JormkD+iFxQSZZd31b9sz RpZw== X-Gm-Message-State: APjAAAUwpbsZAdqHsHZpNVYJssuDGnDN4NLc7gdkhggclNR508UiGaFl ZeWNQrkgGDM8IrGGxZZjwGnkwZBov8UjM0iTImAMuOs+9YRgPq8qxfZ+mx6A0HPvJnxEPT3arUr I9FHzmCG1LskoGowitrjQKlcGd3A= X-Received: by 2002:adf:ec02:: with SMTP id x2mr9464207wrn.8.1582203976536; Thu, 20 Feb 2020 05:06:16 -0800 (PST) X-Google-Smtp-Source: APXvYqxxvhyunneK2qPGr0PvPMnzbnKoLc1KRvHi/EZUPnye+P/5CWZaGi4Yc+u50TlNAyrnI1YoAA== X-Received: by 2002:adf:ec02:: with SMTP id x2mr9464128wrn.8.1582203975917; Thu, 20 Feb 2020 05:06:15 -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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:15 -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:34 +0100 Message-Id: <20200220130548.29974-7-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: Sr4y9MXaMCytIX_rIUtg6Q-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [Xen-devel] [PATCH v3 06/20] exec: Let the address_space API use 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" QXMgd2UgYXJlIG9ubHkgZGVhbGluZyB3aXRoIGEgYmxvYiBidWZmZXIsIHVzZSBhIHZvaWQgcG9p bnRlcgphcmd1bWVudC4gVGhpcyB3aWxsIGxldCB1cyBzaW1wbGlmeSBvdGhlciBBUElzLgoKU2ln bmVkLW9mZi1ieTogUGhpbGlwcGUgTWF0aGlldS1EYXVkw6kgPHBoaWxtZEByZWRoYXQuY29tPgot LS0KIGluY2x1ZGUvZXhlYy9tZW1vcnkuaCB8IDEyICsrKysrKy0tLS0tLQogZXhlYy5jICAgICAg ICAgICAgICAgIHwgMTEgKysrKysrLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9u cygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9leGVjL21lbW9yeS5o IGIvaW5jbHVkZS9leGVjL21lbW9yeS5oCmluZGV4IDZmODA4NGY0NWUuLmFmZWUxODVlYWUgMTAw NjQ0Ci0tLSBhL2luY2x1ZGUvZXhlYy9tZW1vcnkuaAorKysgYi9pbmNsdWRlL2V4ZWMvbWVtb3J5 LmgKQEAgLTIwNTIsNyArMjA1Miw3IEBAIHZvaWQgYWRkcmVzc19zcGFjZV9yZW1vdmVfbGlzdGVu ZXJzKEFkZHJlc3NTcGFjZSAqYXMpOwogICogQGlzX3dyaXRlOiBpbmRpY2F0ZXMgdGhlIHRyYW5z ZmVyIGRpcmVjdGlvbgogICovCiBNZW1UeFJlc3VsdCBhZGRyZXNzX3NwYWNlX3J3KEFkZHJlc3NT cGFjZSAqYXMsIGh3YWRkciBhZGRyLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBNZW1U eEF0dHJzIGF0dHJzLCB1aW50OF90ICpidWYsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg IE1lbVR4QXR0cnMgYXR0cnMsIHZvaWQgKmJ1ZiwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgaHdhZGRyIGxlbiwgYm9vbCBpc193cml0ZSk7CiAKIC8qKgpAQCAtMjA3MCw3ICsyMDcwLDcg QEAgTWVtVHhSZXN1bHQgYWRkcmVzc19zcGFjZV9ydyhBZGRyZXNzU3BhY2UgKmFzLCBod2FkZHIg YWRkciwKICAqLwogTWVtVHhSZXN1bHQgYWRkcmVzc19zcGFjZV93cml0ZShBZGRyZXNzU3BhY2Ug KmFzLCBod2FkZHIgYWRkciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTWVtVHhB dHRycyBhdHRycywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgdWludDhf dCAqYnVmLCBod2FkZHIgbGVuKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3Qgdm9pZCAqYnVmLCBod2FkZHIgbGVuKTsKIAogLyoqCiAgKiBhZGRyZXNzX3NwYWNlX3dyaXRl X3JvbTogd3JpdGUgdG8gYWRkcmVzcyBzcGFjZSwgaW5jbHVkaW5nIFJPTS4KQEAgLTIwOTYsNyAr MjA5Niw3IEBAIE1lbVR4UmVzdWx0IGFkZHJlc3Nfc3BhY2Vfd3JpdGUoQWRkcmVzc1NwYWNlICph cywgaHdhZGRyIGFkZHIsCiAgKi8KIE1lbVR4UmVzdWx0IGFkZHJlc3Nfc3BhY2Vfd3JpdGVfcm9t KEFkZHJlc3NTcGFjZSAqYXMsIGh3YWRkciBhZGRyLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgTWVtVHhBdHRycyBhdHRycywKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNvbnN0IHVpbnQ4X3QgKmJ1ZiwgaHdhZGRyIGxlbik7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBjb25zdCB2b2lkICpidWYsIGh3YWRkciBsZW4pOwogCiAv KiBhZGRyZXNzX3NwYWNlX2xkKjogbG9hZCBmcm9tIGFuIGFkZHJlc3Mgc3BhY2UKICAqIGFkZHJl c3Nfc3BhY2Vfc3QqOiBzdG9yZSB0byBhbiBhZGRyZXNzIHNwYWNlCkBAIC0yMzM0LDcgKzIzMzQs NyBAQCB2b2lkIGFkZHJlc3Nfc3BhY2VfdW5tYXAoQWRkcmVzc1NwYWNlICphcywgdm9pZCAqYnVm ZmVyLCBod2FkZHIgbGVuLAogCiAvKiBJbnRlcm5hbCBmdW5jdGlvbnMsIHBhcnQgb2YgdGhlIGlt cGxlbWVudGF0aW9uIG9mIGFkZHJlc3Nfc3BhY2VfcmVhZC4gICovCiBNZW1UeFJlc3VsdCBhZGRy ZXNzX3NwYWNlX3JlYWRfZnVsbChBZGRyZXNzU3BhY2UgKmFzLCBod2FkZHIgYWRkciwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE1lbVR4QXR0cnMgYXR0cnMsIHVpbnQ4X3Qg KmJ1ZiwgaHdhZGRyIGxlbik7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBN ZW1UeEF0dHJzIGF0dHJzLCB2b2lkICpidWYsIGh3YWRkciBsZW4pOwogTWVtVHhSZXN1bHQgZmxh dHZpZXdfcmVhZF9jb250aW51ZShGbGF0VmlldyAqZnYsIGh3YWRkciBhZGRyLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBNZW1UeEF0dHJzIGF0dHJzLCB2b2lkICpidWYsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGh3YWRkciBsZW4sIGh3YWRkciBhZGRy MSwgaHdhZGRyIGwsCkBAIC0yMzc0LDcgKzIzNzQsNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgbWVt b3J5X2FjY2Vzc19pc19kaXJlY3QoTWVtb3J5UmVnaW9uICptciwgYm9vbCBpc193cml0ZSkKICAq Lwogc3RhdGljIGlubGluZSBfX2F0dHJpYnV0ZV9fKChfX2Fsd2F5c19pbmxpbmVfXykpCiBNZW1U eFJlc3VsdCBhZGRyZXNzX3NwYWNlX3JlYWQoQWRkcmVzc1NwYWNlICphcywgaHdhZGRyIGFkZHIs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTWVtVHhBdHRycyBhdHRycywgdWludDhf dCAqYnVmLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE1lbVR4QXR0cnMgYXR0cnMs IHZvaWQgKmJ1ZiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBod2FkZHIgbGVuKQog ewogICAgIE1lbVR4UmVzdWx0IHJlc3VsdCA9IE1FTVRYX09LOwpAQCAtMjQzMyw3ICsyNDMzLDcg QEAgYWRkcmVzc19zcGFjZV9yZWFkX2NhY2hlZChNZW1vcnlSZWdpb25DYWNoZSAqY2FjaGUsIGh3 YWRkciBhZGRyLAogICovCiBzdGF0aWMgaW5saW5lIHZvaWQKIGFkZHJlc3Nfc3BhY2Vfd3JpdGVf Y2FjaGVkKE1lbW9yeVJlZ2lvbkNhY2hlICpjYWNoZSwgaHdhZGRyIGFkZHIsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICB2b2lkICpidWYsIGh3YWRkciBsZW4pCisgICAgICAgICAgICAgICAg ICAgICAgICAgICBjb25zdCB2b2lkICpidWYsIGh3YWRkciBsZW4pCiB7CiAgICAgYXNzZXJ0KGFk ZHIgPCBjYWNoZS0+bGVuICYmIGxlbiA8PSBjYWNoZS0+bGVuIC0gYWRkcik7CiAgICAgaWYgKGxp a2VseShjYWNoZS0+cHRyKSkgewpkaWZmIC0tZ2l0IGEvZXhlYy5jIGIvZXhlYy5jCmluZGV4IDk4 MGNjMGUyYjIuLjFhODAxNTk5OTYgMTAwNjQ0Ci0tLSBhL2V4ZWMuYworKysgYi9leGVjLmMKQEAg LTMyNzEsNyArMzI3MSw3IEBAIHN0YXRpYyBNZW1UeFJlc3VsdCBmbGF0dmlld19yZWFkKEZsYXRW aWV3ICpmdiwgaHdhZGRyIGFkZHIsCiB9CiAKIE1lbVR4UmVzdWx0IGFkZHJlc3Nfc3BhY2VfcmVh ZF9mdWxsKEFkZHJlc3NTcGFjZSAqYXMsIGh3YWRkciBhZGRyLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgTWVtVHhBdHRycyBhdHRycywgdWludDhfdCAqYnVmLCBod2FkZHIg bGVuKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTWVtVHhBdHRycyBhdHRy cywgdm9pZCAqYnVmLCBod2FkZHIgbGVuKQogewogICAgIE1lbVR4UmVzdWx0IHJlc3VsdCA9IE1F TVRYX09LOwogICAgIEZsYXRWaWV3ICpmdjsKQEAgLTMyODcsNyArMzI4Nyw3IEBAIE1lbVR4UmVz dWx0IGFkZHJlc3Nfc3BhY2VfcmVhZF9mdWxsKEFkZHJlc3NTcGFjZSAqYXMsIGh3YWRkciBhZGRy LAogCiBNZW1UeFJlc3VsdCBhZGRyZXNzX3NwYWNlX3dyaXRlKEFkZHJlc3NTcGFjZSAqYXMsIGh3 YWRkciBhZGRyLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBNZW1UeEF0dHJzIGF0 dHJzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCB1aW50OF90ICpidWYs IGh3YWRkciBsZW4pCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHZvaWQg KmJ1ZiwgaHdhZGRyIGxlbikKIHsKICAgICBNZW1UeFJlc3VsdCByZXN1bHQgPSBNRU1UWF9PSzsK ICAgICBGbGF0VmlldyAqZnY7CkBAIC0zMzAyLDcgKzMzMDIsNyBAQCBNZW1UeFJlc3VsdCBhZGRy ZXNzX3NwYWNlX3dyaXRlKEFkZHJlc3NTcGFjZSAqYXMsIGh3YWRkciBhZGRyLAogfQogCiBNZW1U eFJlc3VsdCBhZGRyZXNzX3NwYWNlX3J3KEFkZHJlc3NTcGFjZSAqYXMsIGh3YWRkciBhZGRyLCBN ZW1UeEF0dHJzIGF0dHJzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50OF90ICpi dWYsIGh3YWRkciBsZW4sIGJvb2wgaXNfd3JpdGUpCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHZvaWQgKmJ1ZiwgaHdhZGRyIGxlbiwgYm9vbCBpc193cml0ZSkKIHsKICAgICBpZiAoaXNf d3JpdGUpIHsKICAgICAgICAgcmV0dXJuIGFkZHJlc3Nfc3BhY2Vfd3JpdGUoYXMsIGFkZHIsIGF0 dHJzLCBidWYsIGxlbik7CkBAIC0zMzI2LDcgKzMzMjYsNyBAQCBlbnVtIHdyaXRlX3JvbV90eXBl IHsKIHN0YXRpYyBpbmxpbmUgTWVtVHhSZXN1bHQgYWRkcmVzc19zcGFjZV93cml0ZV9yb21faW50 ZXJuYWwoQWRkcmVzc1NwYWNlICphcywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgaHdhZGRyIGFkZHIsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE1lbVR4QXR0cnMgYXR0 cnMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbnN0IHVpbnQ4X3QgKmJ1ZiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qgdm9pZCAqcHRyLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBod2FkZHIg bGVuLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBlbnVtIHdyaXRlX3JvbV90eXBlIHR5cGUpCiB7CkBAIC0zMzM0LDYgKzMzMzQsNyBA QCBzdGF0aWMgaW5saW5lIE1lbVR4UmVzdWx0IGFkZHJlc3Nfc3BhY2Vfd3JpdGVfcm9tX2ludGVy bmFsKEFkZHJlc3NTcGFjZSAqYXMsCiAgICAgdWludDhfdCAqcmFtX3B0cjsKICAgICBod2FkZHIg YWRkcjE7CiAgICAgTWVtb3J5UmVnaW9uICptcjsKKyAgICBjb25zdCB1aW50OF90ICpidWYgPSBw dHI7CiAKICAgICBSQ1VfUkVBRF9MT0NLX0dVQVJEKCk7CiAgICAgd2hpbGUgKGxlbiA+IDApIHsK QEAgLTMzNjYsNyArMzM2Nyw3IEBAIHN0YXRpYyBpbmxpbmUgTWVtVHhSZXN1bHQgYWRkcmVzc19z cGFjZV93cml0ZV9yb21faW50ZXJuYWwoQWRkcmVzc1NwYWNlICphcywKIC8qIHVzZWQgZm9yIFJP TSBsb2FkaW5nIDogY2FuIHdyaXRlIGluIFJBTSBhbmQgUk9NICovCiBNZW1UeFJlc3VsdCBhZGRy ZXNzX3NwYWNlX3dyaXRlX3JvbShBZGRyZXNzU3BhY2UgKmFzLCBod2FkZHIgYWRkciwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE1lbVR4QXR0cnMgYXR0cnMsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCB1aW50OF90ICpidWYsIGh3YWRkciBs ZW4pCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCB2b2lkICpidWYs IGh3YWRkciBsZW4pCiB7CiAgICAgcmV0dXJuIGFkZHJlc3Nfc3BhY2Vfd3JpdGVfcm9tX2ludGVy bmFsKGFzLCBhZGRyLCBhdHRycywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgYnVmLCBsZW4sIFdSSVRFX0RBVEEpOwotLSAKMi4yMS4xCgoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlz dApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0 Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA== 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 53134C11D04 for ; Thu, 20 Feb 2020 13:10:47 +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 1DFB1206DB for ; Thu, 20 Feb 2020 13:10:47 +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="ejLdCo6Z" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1DFB1206DB 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]:41638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4lbK-0004ml-7j for qemu-devel@archiver.kernel.org; Thu, 20 Feb 2020 08:10:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55812) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4lX3-0004iw-5V for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4lX1-0004z5-MR for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:21 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:43988 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 1j4lX1-0004yc-I2 for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582203979; 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=9T2fAo+6xtdSOASO+MDoJq7z4DL4xf6hcEaFpq9VX4A=; b=ejLdCo6ZIYmc5j4rtA/084C1L1YWVd9T9NhuBuNyWgx6KvqT+UmgWOqUJVJwM3f6pRQUAV 73zUMcTHpOhpk2gFnz6iZmx4ES9188atg5qUlu2oTpXqpw7bu0TT+y9e4bSOhlmJQDuwno LrcpC4JBbuaXJILnjfrkMrZJ4he4+2o= 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-233-GMxDok0VM6mX7O5TWXkYwA-1; Thu, 20 Feb 2020 08:06:17 -0500 Received: by mail-wr1-f70.google.com with SMTP id d15so1715201wru.1 for ; Thu, 20 Feb 2020 05:06:17 -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=f0ShsBpyUInIOkeskmM477n/0YX3Rn03mTxtkP3QCEQ=; b=kcH9ve9rDgNV2BA/uiTdHeHfp1jKTRh7UmUu35A09a0lRPWfBd1vs6GDavgr4R59JB W9FpEqZQWqWeU7QLwJ+1jaVBSLTAAJrwTDKf4uPEHb0O4UiEVbcRti7w31ErDK+6Ozvn Yhal3ToG3rvcV09CZlqaVBlbj4nLcmf/70n15qVB6csWmrSdTQbAy3PHHF6MSzag1Nnp a3dOVcLTznmahSiXd4Fa1QTr8ziQSW+P4A5FMVB+1Ryz10dVERe6H3ghJQbg21yFJmxe l6DkdmkZZbUXKCoe+osNKvoYI1DMg62pBf+WaD1d0BsHQbfpVb3G/tyue6ByjkzE/Zl7 zaIA== X-Gm-Message-State: APjAAAXYwtd5vx4cI0RCeGmEwiyoBY0NIBnaoS8UTNwxQHQv4ERkmbIA Xc3MM8DUbDzfQGDUly3Jir44xYVHlGzl2lfcHSbqL/TxQx2WQFznPLFJ4MYdt/17fmnukRrtESd B9cietcsJmA9fP68= X-Received: by 2002:adf:ec02:: with SMTP id x2mr9464156wrn.8.1582203976197; Thu, 20 Feb 2020 05:06:16 -0800 (PST) X-Google-Smtp-Source: APXvYqxxvhyunneK2qPGr0PvPMnzbnKoLc1KRvHi/EZUPnye+P/5CWZaGi4Yc+u50TlNAyrnI1YoAA== X-Received: by 2002:adf:ec02:: with SMTP id x2mr9464128wrn.8.1582203975917; Thu, 20 Feb 2020 05:06:15 -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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:15 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Subject: [PATCH v3 06/20] exec: Let the address_space API use void pointer arguments Date: Thu, 20 Feb 2020 14:05:34 +0100 Message-Id: <20200220130548.29974-7-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: GMxDok0VM6mX7O5TWXkYwA-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] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Dmitry Fleytman , kvm@vger.kernel.org, "Michael S. Tsirkin" , Jason Wang , Gerd Hoffmann , "Edgar E. Iglesias" , Stefano Stabellini , Matthew Rosato , qemu-block@nongnu.org, David Hildenbrand , Halil Pasic , Christian Borntraeger , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , Thomas Huth , Eduardo Habkost , Stefan Weil , Alistair Francis , Richard Henderson , Paul Durrant , Eric Auger , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , David Gibson , Igor Mitsyanko , Cornelia Huck , Michael Walle , qemu-ppc@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" As we are only dealing with a blob buffer, use a void pointer argument. This will let us simplify other APIs. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/memory.h | 12 ++++++------ exec.c | 11 ++++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 6f8084f45e..afee185eae 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -2052,7 +2052,7 @@ void address_space_remove_listeners(AddressSpace *as)= ; * @is_write: indicates the transfer direction */ MemTxResult address_space_rw(AddressSpace *as, hwaddr addr, - MemTxAttrs attrs, uint8_t *buf, + MemTxAttrs attrs, void *buf, hwaddr len, bool is_write); =20 /** @@ -2070,7 +2070,7 @@ MemTxResult address_space_rw(AddressSpace *as, hwaddr= addr, */ MemTxResult address_space_write(AddressSpace *as, hwaddr addr, MemTxAttrs attrs, - const uint8_t *buf, hwaddr len); + const void *buf, hwaddr len); =20 /** * address_space_write_rom: write to address space, including ROM. @@ -2096,7 +2096,7 @@ MemTxResult address_space_write(AddressSpace *as, hwa= ddr addr, */ MemTxResult address_space_write_rom(AddressSpace *as, hwaddr addr, MemTxAttrs attrs, - const uint8_t *buf, hwaddr len); + const void *buf, hwaddr len); =20 /* address_space_ld*: load from an address space * address_space_st*: store to an address space @@ -2334,7 +2334,7 @@ void address_space_unmap(AddressSpace *as, void *buff= er, hwaddr len, =20 /* Internal functions, part of the implementation of address_space_read. = */ MemTxResult address_space_read_full(AddressSpace *as, hwaddr addr, - MemTxAttrs attrs, uint8_t *buf, hwaddr= len); + MemTxAttrs attrs, void *buf, hwaddr le= n); MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr, MemTxAttrs attrs, void *buf, hwaddr len, hwaddr addr1, hwaddr l, @@ -2374,7 +2374,7 @@ static inline bool memory_access_is_direct(MemoryRegi= on *mr, bool is_write) */ static inline __attribute__((__always_inline__)) MemTxResult address_space_read(AddressSpace *as, hwaddr addr, - MemTxAttrs attrs, uint8_t *buf, + MemTxAttrs attrs, void *buf, hwaddr len) { MemTxResult result =3D MEMTX_OK; @@ -2433,7 +2433,7 @@ address_space_read_cached(MemoryRegionCache *cache, h= waddr addr, */ static inline void address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, - void *buf, hwaddr len) + const void *buf, hwaddr len) { assert(addr < cache->len && len <=3D cache->len - addr); if (likely(cache->ptr)) { diff --git a/exec.c b/exec.c index 980cc0e2b2..1a80159996 100644 --- a/exec.c +++ b/exec.c @@ -3271,7 +3271,7 @@ static MemTxResult flatview_read(FlatView *fv, hwaddr= addr, } =20 MemTxResult address_space_read_full(AddressSpace *as, hwaddr addr, - MemTxAttrs attrs, uint8_t *buf, hwaddr= len) + MemTxAttrs attrs, void *buf, hwaddr le= n) { MemTxResult result =3D MEMTX_OK; FlatView *fv; @@ -3287,7 +3287,7 @@ MemTxResult address_space_read_full(AddressSpace *as,= hwaddr addr, =20 MemTxResult address_space_write(AddressSpace *as, hwaddr addr, MemTxAttrs attrs, - const uint8_t *buf, hwaddr len) + const void *buf, hwaddr len) { MemTxResult result =3D MEMTX_OK; FlatView *fv; @@ -3302,7 +3302,7 @@ MemTxResult address_space_write(AddressSpace *as, hwa= ddr addr, } =20 MemTxResult address_space_rw(AddressSpace *as, hwaddr addr, MemTxAttrs att= rs, - uint8_t *buf, hwaddr len, bool is_write) + void *buf, hwaddr len, bool is_write) { if (is_write) { return address_space_write(as, addr, attrs, buf, len); @@ -3326,7 +3326,7 @@ enum write_rom_type { static inline MemTxResult address_space_write_rom_internal(AddressSpace *a= s, hwaddr addr, MemTxAttrs attr= s, - const uint8_t *= buf, + const void *ptr= , hwaddr len, enum write_rom_= type type) { @@ -3334,6 +3334,7 @@ static inline MemTxResult address_space_write_rom_int= ernal(AddressSpace *as, uint8_t *ram_ptr; hwaddr addr1; MemoryRegion *mr; + const uint8_t *buf =3D ptr; =20 RCU_READ_LOCK_GUARD(); while (len > 0) { @@ -3366,7 +3367,7 @@ static inline MemTxResult address_space_write_rom_int= ernal(AddressSpace *as, /* used for ROM loading : can write in RAM and ROM */ MemTxResult address_space_write_rom(AddressSpace *as, hwaddr addr, MemTxAttrs attrs, - const uint8_t *buf, hwaddr len) + const void *buf, hwaddr len) { return address_space_write_rom_internal(as, addr, attrs, buf, len, WRITE_DATA); --=20 2.21.1