From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:cb43:0:0:0:0:0 with SMTP id b64csp543572lfg; Thu, 20 Feb 2020 05:06:34 -0800 (PST) X-Google-Smtp-Source: APXvYqxPm7QP3RN8RPsc9C+GJd2yWTS5eCZSPDdfdRy5bOmWUME9P894ZHqfyFolsGqIHXwrPZ0h X-Received: by 2002:a05:6808:1:: with SMTP id u1mr1935399oic.74.1582203994719; Thu, 20 Feb 2020 05:06:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582203994; cv=none; d=google.com; s=arc-20160816; b=lGBNJTKXpB9/7I4GQkl+NjPuePoB4UuK+PYgvfgJMH37dogjKgaSfJI+8hPSiKkLNL gwK1e+oZSwMglMaKDUeNMIK5I9uauK/+MsSNc4rsBv9eUc/1L9voDyWbMWhu4IrhIYR0 fis8SsLet5B03We0QxNpX7LNmHWSsr70piebqsY1XJ4Abjo2g5TqLFo6/qmL6ynJDsWn DdRm7XKdE0enYeFEKKv+SzF/ENAEoYRqOdtSj7GkVopKfvp7HKEFJFvmGhqEUpOeymht gAusLnTKJ2XR6ZM5hr15SyOaG+zpZtHN7quml2hbaJymVBO/e4VRMWHP1hCuYR8RYOq9 Yo5g== 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=ijbOoyrS9Jz9oM+Px+EP5Y3MCyoKyJq//TyCsQeLfQM=; b=uK0fJnGzvLuFHgAsCyou22SzWHT9GirhnuPVlBmOK0loeCQMP3Yls+WU34xYJR4C/3 6tS6OrGR5VikXL724GxMVeUPlYUr4zbX+71mS56Qi8M8IUlf8gkgTr7BxBtzvP/KZAKl xWNhesalvPi36iekwTJNG4pNVKvwuDuf/2J3IBXSNfuXooXGTiPj/psb2c+orwTUsbK5 unoELgSr8wi6utyaNqLpl//4bCHRu5YhCENZWdt/fsZTelbYXeXbfV5847WaHBG69nzH moDz60AvApmMaR09qy0yyJZtVIOEyJYofJYev0qZfb+Gjd5L/SoLZM8iAkmZnJSw0Dpg nguQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=cC3F0XSL; 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.34; Thu, 20 Feb 2020 05:06:34 -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=cC3F0XSL; 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 S1728186AbgBTNGd (ORCPT + 5 others); Thu, 20 Feb 2020 08:06:33 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:32843 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728169AbgBTNGd (ORCPT ); Thu, 20 Feb 2020 08:06:33 -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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ijbOoyrS9Jz9oM+Px+EP5Y3MCyoKyJq//TyCsQeLfQM=; b=cC3F0XSL7+pfUaUaH8110zN4knVnHqJdyLf1OizFtCqnLbjr2K9DdhLy4+Gpdj/5iwv+kK oHn5H60fBp43el5fGYezoK7ccAgVj5GEMytctYGEh03WP9phvYZyNwVRDqiC7w4gO+lq+7 GaRDoSiK+X2X4wrqPa34rt/AXuIJqgQ= 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-292-d0d0nP4sP_yCeiHcAhQdnA-1; Thu, 20 Feb 2020 08:06:29 -0500 X-MC-Unique: d0d0nP4sP_yCeiHcAhQdnA-1 Received: by mail-wm1-f72.google.com with SMTP id q125so582423wme.1 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=ijbOoyrS9Jz9oM+Px+EP5Y3MCyoKyJq//TyCsQeLfQM=; b=nQmJLLm/1+Vj115MjddvCIeLhyl67eUbi+5TxCKSeMRdP0hOvx1/jvAGLQrS60R08y Qo/Q3Tjkv60+eHKw2rebwZxysPSBkaZNUqNoA1WZLcqrq/VVFSZ4VrjDLgGp1sennFlL 8B2OB/HYsL/lS+Jwls9zE0GfO5eTk5UzpnV7vM9stAZ/Ig+ySSlQEWWqMJPUgRF9/2Eh iX6zKHCyuWIFt4bE1sJh7tm9BRa26cfJ5cY1UTRX0Df+AQcu3NMaDCSpzz/I/FVQUAFR 0z02WV6d8iy2yGYfrbDFOWKlz1QPblkpVc0EMjTM2EMsaE0//rJP51hqiQs2IcP6T0on 53xw== X-Gm-Message-State: APjAAAW49+ycLBdMHZMOmvtu5935PM5QeHamzAZ/uBlQhsES0Y7L7yTC GN1nOyC7wmHoWEBS3e6LLv9IgQcOGBoz03ZjwNphDidtnCL4hv0DY4GuERIn4jV4hq6FFbNZgNE qnKgeSMNiPJ+e X-Received: by 2002:a7b:c19a:: with SMTP id y26mr4786399wmi.152.1582203988197; Thu, 20 Feb 2020 05:06:28 -0800 (PST) X-Received: by 2002:a7b:c19a:: with SMTP id y26mr4786351wmi.152.1582203987812; Thu, 20 Feb 2020 05:06:27 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:27 -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 09/20] exec: Let the cpu_[physical]_memory API use void pointer arguments Date: Thu, 20 Feb 2020 14:05:37 +0100 Message-Id: <20200220130548.29974-10-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: O5GyZ/S1BWMp 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/cpu-all.h | 2 +- include/exec/cpu-common.h | 2 +- exec.c | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index e96781a455..49e96caa3f 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -388,7 +388,7 @@ void dump_opcount_info(void); #endif /* !CONFIG_USER_ONLY */ int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr, - uint8_t *buf, target_ulong len, int is_write); + void *ptr, target_ulong len, int is_write); int cpu_exec(CPUState *cpu); diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 05ac1a5d69..165f8fb621 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -69,7 +69,7 @@ void qemu_ram_unset_migratable(RAMBlock *rb); size_t qemu_ram_pagesize(RAMBlock *block); size_t qemu_ram_pagesize_largest(void); -void cpu_physical_memory_rw(hwaddr addr, uint8_t *buf, +void cpu_physical_memory_rw(hwaddr addr, void *buf, hwaddr len, int is_write); static inline void cpu_physical_memory_read(hwaddr addr, void *buf, hwaddr len) diff --git a/exec.c b/exec.c index 1a80159996..01437be691 100644 --- a/exec.c +++ b/exec.c @@ -3019,11 +3019,12 @@ MemoryRegion *get_system_io(void) /* physical memory access (slow version, mainly for debug) */ #if defined(CONFIG_USER_ONLY) int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr, - uint8_t *buf, target_ulong len, int is_write) + void *ptr, target_ulong len, int is_write) { int flags; target_ulong l, page; void * p; + uint8_t *buf = ptr; while (len > 0) { page = addr & TARGET_PAGE_MASK; @@ -3311,7 +3312,7 @@ MemTxResult address_space_rw(AddressSpace *as, hwaddr addr, MemTxAttrs attrs, } } -void cpu_physical_memory_rw(hwaddr addr, uint8_t *buf, +void cpu_physical_memory_rw(hwaddr addr, void *buf, hwaddr len, int is_write) { address_space_rw(&address_space_memory, addr, MEMTXATTRS_UNSPECIFIED, @@ -3789,10 +3790,11 @@ address_space_write_cached_slow(MemoryRegionCache *cache, hwaddr addr, /* virtual memory access for debug (includes writing to ROM) */ int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr, - uint8_t *buf, target_ulong len, int is_write) + void *ptr, target_ulong len, int is_write) { hwaddr phys_addr; target_ulong l, page; + uint8_t *buf = ptr; cpu_synchronize_state(cpu); while (len > 0) { -- 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 2A2D6C11D04 for ; Thu, 20 Feb 2020 13:06:44 +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 F2D9C206ED for ; Thu, 20 Feb 2020 13:06:43 +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="OsIXN0Kk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F2D9C206ED 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 1j4lXF-0001Ig-Lb; Thu, 20 Feb 2020 13:06:33 +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 1j4lXE-0001Hf-Si for xen-devel@lists.xenproject.org; Thu, 20 Feb 2020 13:06:32 +0000 X-Inumbo-ID: cff8233f-53e1-11ea-8526-12813bfff9fa Received: from us-smtp-delivery-1.mimecast.com (unknown [205.139.110.120]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id cff8233f-53e1-11ea-8526-12813bfff9fa; Thu, 20 Feb 2020 13:06:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582203990; 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=URr7V1M6RZkd8VsYjn8QuFWcMecDXO2sKYgxZu+xFU4=; b=OsIXN0Kk8sqDbDcM935ySQqlm95+2CQzDzr/Tne4Evf/5+C2Yr7jkoPNaOZhMPLfQDGlGr tr1O7xOLulKv35dvVSMEv8lygHwCgSA3fr5u+nRE3AMTmyJR9SL3T9QMrPeQy4k82d39Rr VCQc8xivOE1GRLo1bSnXCxErZy0jDC8= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-378-Kkn2CV6lM3apO8CyjjFRgA-1; Thu, 20 Feb 2020 08:06:29 -0500 Received: by mail-wr1-f71.google.com with SMTP id d15so1715401wru.1 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=ijbOoyrS9Jz9oM+Px+EP5Y3MCyoKyJq//TyCsQeLfQM=; b=W8o+2Iajmvt8ZNlLGwUy9Vq8Y17DLQbHlbzEWUKU4p0g/b781auO/eUiTJJzpaMjVN KEWs1aiQF9+QLdQ5OT7/ZArQJqZWnX/KTygiwCWaARhzzM8MLN3MuSstJB4VH09DWyqf ubkn1hlRGdz6Ml9VFM3YdH0hNI5me1yJz2JJJUA+99peRevVJOk8lBQiRJL2Wh9IPbtA sh3vjXfscFAWadko+ukpdV/o/BwHFxM7lybriJbux/PgwV/atPZ/gsFg5/APRLV9C6oO 9J3/2RmIrGoOl1CCpI9uCmhD3KpDWoGViItO5dPbSShSwhbHDp3WBNSTeqhgZqNnN1bO FpQQ== X-Gm-Message-State: APjAAAUh2LnEL6kgr5nFD8WZvAM1wQbIQmplJT3Br+/5HjyA5n89IBQU PUqTma/DfawOLHB7U5DCM7KvZq1kkWDhr1jk/LLpg2VwyskbuqnXZDV6/MI+mUSHOjhUqkILHXX 8hB92aBYUJtFF6aJsLFgB+nTQHoI= X-Received: by 2002:a7b:c19a:: with SMTP id y26mr4786409wmi.152.1582203988197; Thu, 20 Feb 2020 05:06:28 -0800 (PST) X-Google-Smtp-Source: APXvYqyZ6/a+oKytvIxV32J43VlbJoelLuLW+rm04bNrtIDR5Tp2LK/nrGilhR3sl09VB9q8vLJTrw== X-Received: by 2002:a7b:c19a:: with SMTP id y26mr4786351wmi.152.1582203987812; Thu, 20 Feb 2020 05:06:27 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:27 -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:37 +0100 Message-Id: <20200220130548.29974-10-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: Kkn2CV6lM3apO8CyjjFRgA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [Xen-devel] [PATCH v3 09/20] exec: Let the cpu_[physical]_memory 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 LS0KIGluY2x1ZGUvZXhlYy9jcHUtYWxsLmggICAgfCAyICstCiBpbmNsdWRlL2V4ZWMvY3B1LWNv bW1vbi5oIHwgMiArLQogZXhlYy5jICAgICAgICAgICAgICAgICAgICB8IDggKysrKystLS0KIDMg ZmlsZXMgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2luY2x1ZGUvZXhlYy9jcHUtYWxsLmggYi9pbmNsdWRlL2V4ZWMvY3B1LWFsbC5oCmluZGV4 IGU5Njc4MWE0NTUuLjQ5ZTk2Y2FhM2YgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZXhlYy9jcHUtYWxs LmgKKysrIGIvaW5jbHVkZS9leGVjL2NwdS1hbGwuaApAQCAtMzg4LDcgKzM4OCw3IEBAIHZvaWQg ZHVtcF9vcGNvdW50X2luZm8odm9pZCk7CiAjZW5kaWYgLyogIUNPTkZJR19VU0VSX09OTFkgKi8K IAogaW50IGNwdV9tZW1vcnlfcndfZGVidWcoQ1BVU3RhdGUgKmNwdSwgdGFyZ2V0X3Vsb25nIGFk ZHIsCi0gICAgICAgICAgICAgICAgICAgICAgICB1aW50OF90ICpidWYsIHRhcmdldF91bG9uZyBs ZW4sIGludCBpc193cml0ZSk7CisgICAgICAgICAgICAgICAgICAgICAgICB2b2lkICpwdHIsIHRh cmdldF91bG9uZyBsZW4sIGludCBpc193cml0ZSk7CiAKIGludCBjcHVfZXhlYyhDUFVTdGF0ZSAq Y3B1KTsKIApkaWZmIC0tZ2l0IGEvaW5jbHVkZS9leGVjL2NwdS1jb21tb24uaCBiL2luY2x1ZGUv ZXhlYy9jcHUtY29tbW9uLmgKaW5kZXggMDVhYzFhNWQ2OS4uMTY1ZjhmYjYyMSAxMDA2NDQKLS0t IGEvaW5jbHVkZS9leGVjL2NwdS1jb21tb24uaAorKysgYi9pbmNsdWRlL2V4ZWMvY3B1LWNvbW1v bi5oCkBAIC02OSw3ICs2OSw3IEBAIHZvaWQgcWVtdV9yYW1fdW5zZXRfbWlncmF0YWJsZShSQU1C bG9jayAqcmIpOwogc2l6ZV90IHFlbXVfcmFtX3BhZ2VzaXplKFJBTUJsb2NrICpibG9jayk7CiBz aXplX3QgcWVtdV9yYW1fcGFnZXNpemVfbGFyZ2VzdCh2b2lkKTsKIAotdm9pZCBjcHVfcGh5c2lj YWxfbWVtb3J5X3J3KGh3YWRkciBhZGRyLCB1aW50OF90ICpidWYsCit2b2lkIGNwdV9waHlzaWNh bF9tZW1vcnlfcncoaHdhZGRyIGFkZHIsIHZvaWQgKmJ1ZiwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBod2FkZHIgbGVuLCBpbnQgaXNfd3JpdGUpOwogc3RhdGljIGlubGluZSB2b2lkIGNw dV9waHlzaWNhbF9tZW1vcnlfcmVhZChod2FkZHIgYWRkciwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgdm9pZCAqYnVmLCBod2FkZHIgbGVuKQpkaWZmIC0tZ2l0 IGEvZXhlYy5jIGIvZXhlYy5jCmluZGV4IDFhODAxNTk5OTYuLjAxNDM3YmU2OTEgMTAwNjQ0Ci0t LSBhL2V4ZWMuYworKysgYi9leGVjLmMKQEAgLTMwMTksMTEgKzMwMTksMTIgQEAgTWVtb3J5UmVn aW9uICpnZXRfc3lzdGVtX2lvKHZvaWQpCiAvKiBwaHlzaWNhbCBtZW1vcnkgYWNjZXNzIChzbG93 IHZlcnNpb24sIG1haW5seSBmb3IgZGVidWcpICovCiAjaWYgZGVmaW5lZChDT05GSUdfVVNFUl9P TkxZKQogaW50IGNwdV9tZW1vcnlfcndfZGVidWcoQ1BVU3RhdGUgKmNwdSwgdGFyZ2V0X3Vsb25n IGFkZHIsCi0gICAgICAgICAgICAgICAgICAgICAgICB1aW50OF90ICpidWYsIHRhcmdldF91bG9u ZyBsZW4sIGludCBpc193cml0ZSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHZvaWQgKnB0ciwg dGFyZ2V0X3Vsb25nIGxlbiwgaW50IGlzX3dyaXRlKQogewogICAgIGludCBmbGFnczsKICAgICB0 YXJnZXRfdWxvbmcgbCwgcGFnZTsKICAgICB2b2lkICogcDsKKyAgICB1aW50OF90ICpidWYgPSBw dHI7CiAKICAgICB3aGlsZSAobGVuID4gMCkgewogICAgICAgICBwYWdlID0gYWRkciAmIFRBUkdF VF9QQUdFX01BU0s7CkBAIC0zMzExLDcgKzMzMTIsNyBAQCBNZW1UeFJlc3VsdCBhZGRyZXNzX3Nw YWNlX3J3KEFkZHJlc3NTcGFjZSAqYXMsIGh3YWRkciBhZGRyLCBNZW1UeEF0dHJzIGF0dHJzLAog ICAgIH0KIH0KIAotdm9pZCBjcHVfcGh5c2ljYWxfbWVtb3J5X3J3KGh3YWRkciBhZGRyLCB1aW50 OF90ICpidWYsCit2b2lkIGNwdV9waHlzaWNhbF9tZW1vcnlfcncoaHdhZGRyIGFkZHIsIHZvaWQg KmJ1ZiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBod2FkZHIgbGVuLCBpbnQgaXNfd3Jp dGUpCiB7CiAgICAgYWRkcmVzc19zcGFjZV9ydygmYWRkcmVzc19zcGFjZV9tZW1vcnksIGFkZHIs IE1FTVRYQVRUUlNfVU5TUEVDSUZJRUQsCkBAIC0zNzg5LDEwICszNzkwLDExIEBAIGFkZHJlc3Nf c3BhY2Vfd3JpdGVfY2FjaGVkX3Nsb3coTWVtb3J5UmVnaW9uQ2FjaGUgKmNhY2hlLCBod2FkZHIg YWRkciwKIAogLyogdmlydHVhbCBtZW1vcnkgYWNjZXNzIGZvciBkZWJ1ZyAoaW5jbHVkZXMgd3Jp dGluZyB0byBST00pICovCiBpbnQgY3B1X21lbW9yeV9yd19kZWJ1ZyhDUFVTdGF0ZSAqY3B1LCB0 YXJnZXRfdWxvbmcgYWRkciwKLSAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQ4X3QgKmJ1Ziwg dGFyZ2V0X3Vsb25nIGxlbiwgaW50IGlzX3dyaXRlKQorICAgICAgICAgICAgICAgICAgICAgICAg dm9pZCAqcHRyLCB0YXJnZXRfdWxvbmcgbGVuLCBpbnQgaXNfd3JpdGUpCiB7CiAgICAgaHdhZGRy IHBoeXNfYWRkcjsKICAgICB0YXJnZXRfdWxvbmcgbCwgcGFnZTsKKyAgICB1aW50OF90ICpidWYg PSBwdHI7CiAKICAgICBjcHVfc3luY2hyb25pemVfc3RhdGUoY3B1KTsKICAgICB3aGlsZSAobGVu ID4gMCkgewotLSAKMi4yMS4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJv amVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hl bi1kZXZlbA== 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 5F0EDC11D04 for ; Thu, 20 Feb 2020 13:16:42 +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 29E8C20722 for ; Thu, 20 Feb 2020 13:16:42 +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="fa4hYfT5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 29E8C20722 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]:41870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4lh3-0007eY-8d for qemu-devel@archiver.kernel.org; Thu, 20 Feb 2020 08:16:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55984) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4lXF-0005DD-3x for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4lXD-0005Eu-Rw for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:33 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:35163 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 1j4lXD-0005E5-N0 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=URr7V1M6RZkd8VsYjn8QuFWcMecDXO2sKYgxZu+xFU4=; b=fa4hYfT5l/CNj/9o5jpRBwRG4EwChaZHV0aLAB7O2pbgHxWZmCLL6p2hurqmas1ABM9i3v Kv/jWm1UGKpt3eB66id8ncLApVER97Q6vmWynuiyEDcEZBBWDBkUDaSQW7wSH12XlXqyws BRrYjPbefA3+82R5cF3E7vHF7nFBTEk= 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-428-g22Gwg_wPHiHXVVZeB1H4A-1; Thu, 20 Feb 2020 08:06:29 -0500 Received: by mail-wr1-f72.google.com with SMTP id r1so1700148wrc.15 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=ijbOoyrS9Jz9oM+Px+EP5Y3MCyoKyJq//TyCsQeLfQM=; b=tKbZXoyfzganhYAvSov/eDR84ffMPS/RcPM0YxXHoCQYMWohmR+mJHwrdRGAPC72Qs wTfpy4637HXpdLbGdgyoGwNUemQ61off/+JQMz/+6XkjB68b85aSU43Cpv2gfankdP// 8r248Vjk+uDf+FrijxnEwuH7syNUUzAw05xm3L0ra/3QCvpa76yhgSpEaMD9VQA2HhD4 77t3jHOv4t6h0xI9A2pz4JiXD8JamTdJWiJnOyllgGnOEj1Zq4bjt4rcJ7Bi75duudJ7 vV4qDoiWp+a2ZNMpthNZgfTWzdZPhlwTGX5+TT5CI013yuM7Uy62+C77gAgI5Xv3fqrd j0kw== X-Gm-Message-State: APjAAAWru417O7unVrBFCy1L50ScQ6lmPWNMyjtimlJlCjpVX8q71m56 LHFtqCBB3qgD9TMXwDJtIhazsA2WrSfZ3p3amQB4bM2AXLg7ymUY7hWAi0h3zPppsTljKp223w6 l6e7QHTgMVLX8azU= X-Received: by 2002:a7b:c19a:: with SMTP id y26mr4786419wmi.152.1582203988199; Thu, 20 Feb 2020 05:06:28 -0800 (PST) X-Google-Smtp-Source: APXvYqyZ6/a+oKytvIxV32J43VlbJoelLuLW+rm04bNrtIDR5Tp2LK/nrGilhR3sl09VB9q8vLJTrw== X-Received: by 2002:a7b:c19a:: with SMTP id y26mr4786351wmi.152.1582203987812; Thu, 20 Feb 2020 05:06:27 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:27 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Subject: [PATCH v3 09/20] exec: Let the cpu_[physical]_memory API use void pointer arguments Date: Thu, 20 Feb 2020 14:05:37 +0100 Message-Id: <20200220130548.29974-10-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: g22Gwg_wPHiHXVVZeB1H4A-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Dmitry Fleytman , kvm@vger.kernel.org, "Michael S. Tsirkin" , Jason Wang , Gerd Hoffmann , "Edgar E. Iglesias" , Stefano Stabellini , Matthew Rosato , qemu-block@nongnu.org, David Hildenbrand , Halil Pasic , Christian Borntraeger , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , Thomas Huth , Eduardo Habkost , Stefan Weil , Alistair Francis , Richard Henderson , Paul Durrant , Eric Auger , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , David Gibson , Igor Mitsyanko , Cornelia Huck , Michael Walle , qemu-ppc@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" As we are 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/cpu-all.h | 2 +- include/exec/cpu-common.h | 2 +- exec.c | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index e96781a455..49e96caa3f 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -388,7 +388,7 @@ void dump_opcount_info(void); #endif /* !CONFIG_USER_ONLY */ =20 int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr, - uint8_t *buf, target_ulong len, int is_write); + void *ptr, target_ulong len, int is_write); =20 int cpu_exec(CPUState *cpu); =20 diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 05ac1a5d69..165f8fb621 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -69,7 +69,7 @@ void qemu_ram_unset_migratable(RAMBlock *rb); size_t qemu_ram_pagesize(RAMBlock *block); size_t qemu_ram_pagesize_largest(void); =20 -void cpu_physical_memory_rw(hwaddr addr, uint8_t *buf, +void cpu_physical_memory_rw(hwaddr addr, void *buf, hwaddr len, int is_write); static inline void cpu_physical_memory_read(hwaddr addr, void *buf, hwaddr len) diff --git a/exec.c b/exec.c index 1a80159996..01437be691 100644 --- a/exec.c +++ b/exec.c @@ -3019,11 +3019,12 @@ MemoryRegion *get_system_io(void) /* physical memory access (slow version, mainly for debug) */ #if defined(CONFIG_USER_ONLY) int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr, - uint8_t *buf, target_ulong len, int is_write) + void *ptr, target_ulong len, int is_write) { int flags; target_ulong l, page; void * p; + uint8_t *buf =3D ptr; =20 while (len > 0) { page =3D addr & TARGET_PAGE_MASK; @@ -3311,7 +3312,7 @@ MemTxResult address_space_rw(AddressSpace *as, hwaddr= addr, MemTxAttrs attrs, } } =20 -void cpu_physical_memory_rw(hwaddr addr, uint8_t *buf, +void cpu_physical_memory_rw(hwaddr addr, void *buf, hwaddr len, int is_write) { address_space_rw(&address_space_memory, addr, MEMTXATTRS_UNSPECIFIED, @@ -3789,10 +3790,11 @@ address_space_write_cached_slow(MemoryRegionCache *= cache, hwaddr addr, =20 /* virtual memory access for debug (includes writing to ROM) */ int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr, - uint8_t *buf, target_ulong len, int is_write) + void *ptr, target_ulong len, int is_write) { hwaddr phys_addr; target_ulong l, page; + uint8_t *buf =3D ptr; =20 cpu_synchronize_state(cpu); while (len > 0) { --=20 2.21.1