From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:cb43:0:0:0:0:0 with SMTP id b64csp543634lfg; Thu, 20 Feb 2020 05:06:37 -0800 (PST) X-Google-Smtp-Source: APXvYqytacpBG5RwWmuHHbu2hYBS+mS8LA1PILw0aoLaZ3nN19d01cza6u7WEQobsd7Qq/2BuYdf X-Received: by 2002:a9d:bb8:: with SMTP id 53mr21234420oth.150.1582203997627; Thu, 20 Feb 2020 05:06:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582203997; cv=none; d=google.com; s=arc-20160816; b=paE9BCs7yME9WG+AtMIrebqOMJw0OdXcsWHn7P9TdtmL9KINyUWAfFjLRjVA7goIkm EKkthYCjvsP7/NC/9tcCTXuXcXuf72b76fcD0O6oNo8bTQayPffuvlPfTLS1bK/4GN3/ Il3A1QQZCOS53j4QXvltKZgvGGMprboYp9k1h7KVGpdaFXqFP6YsmpixM2Fo41r4W7cs zPFs7buvHTAC8woarT7Oe1LfqrjVkseGIazlXoeCTzbPI9fHB3FXk2IVuaFS1SF4V3OG EOwqcnByUe8pSaPcHnwQAXk08DJqpewJ3Hync9zrIVmQ0vtaUZ88xIwFt01o4M6tYoUX lMVw== 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=/ld+m5dlIbdFkFHFURC0jskPtvz279hvl5fOCIwyBcI=; b=AfDG87qUIsPC0vJo3K+eznLs9B3QYy4oBiUOMyA9CzIztxtUxWuHCySGauDQfRFHTn N4vM1f0Jk/vye3Qiaql895iGmnsChxh0hknm3ekhoZkIAFwRU1mF+bIcrpYaeAtdr5Du U0uBBHfMtDOPx4rxkWPX2K4JUgh/2KQwdLDDDqtuhcaytG/7cxbHTFonwzCWq2oIDwv5 3v9wZzuxPnIuYO0g3zkwwaduf6y4zSuBMjJGWj8vbeJgLIZKY91JDXDU289H2zM/EZeo Lxhc0+MdMs2RephdnPSNb+7IdzXWVKuR9aC0qcbbxJy/B2tr4tjoeje1teeKlmKG3Zy4 7iJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XoYQ3too; 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.37; Thu, 20 Feb 2020 05:06:37 -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=XoYQ3too; 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 S1728194AbgBTNGg (ORCPT + 5 others); Thu, 20 Feb 2020 08:06:36 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:31685 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728183AbgBTNGg (ORCPT ); Thu, 20 Feb 2020 08:06:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582203995; 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=/ld+m5dlIbdFkFHFURC0jskPtvz279hvl5fOCIwyBcI=; b=XoYQ3tooq/QFJJPbBoZXFerXYa1NfLGz4+Nkfdn2LYGYvSOPDJL2Zq49jOlLTkgUqD1Zxc l2lDqOeIW23UqGpaa2Phr66AeI3OomJAqoYCeyhJv0XiwOOnOYjzfURyied/6pFKU0KULa ZE4Xu/HqYBt0v7OyK0KD6k2uzPEZ9h8= 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-207-PIM-lqNtPdWMDZpjCUSyfw-1; Thu, 20 Feb 2020 08:06:33 -0500 X-MC-Unique: PIM-lqNtPdWMDZpjCUSyfw-1 Received: by mail-wm1-f69.google.com with SMTP id p2so579953wma.3 for ; Thu, 20 Feb 2020 05:06:32 -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=/ld+m5dlIbdFkFHFURC0jskPtvz279hvl5fOCIwyBcI=; b=oItBxCXnq9Y+tg+Wa5eoI5b7VhVURzFX+2W6qkDpWa+p1a/mIocPyIdhWkdMJnXSRU iRsWgaoEE7bmuq8lm0R4zcDRoh+D+OioN+OTar04lDMmUpLIfsPJBw71d1WikWlt2VKK /kj46qlm+EYxzbf8zNUavQoWFs1I9p0CcsmRzRQd6BzT8QIKpGH/Bewdi018ZOxQpQoB RP0LATS6ZS65PW4zRx9yoHTQwDlEawz40+CPjUuxBFgS3y7DbTD4OcNWVZtmdHKBA5HA lCUblK3kiesE6CEyvtJ48LJz3eKOVk43hClB08zWerS9i2uYIsWUXxCcOItQMWe6c78b nurQ== X-Gm-Message-State: APjAAAXyi3tz0cpvhQ5qEIcrp4k4+4dXRh/3MXpqk9UkabK0U4LdIZai Vo2qo63DhdcQHewOaeyB5d575pkegQz6GbelmSg6K45RIsDZU3pW5JDxgP2oyS7chM/ykzMP4RT AQCJ/gqfbVVK5 X-Received: by 2002:adf:e781:: with SMTP id n1mr45109052wrm.56.1582203991748; Thu, 20 Feb 2020 05:06:31 -0800 (PST) X-Received: by 2002:adf:e781:: with SMTP id n1mr45109010wrm.56.1582203991459; Thu, 20 Feb 2020 05:06:31 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:30 -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 10/20] Remove unnecessary cast when using the cpu_[physical]_memory API Date: Thu, 20 Feb 2020 14:05:38 +0100 Message-Id: <20200220130548.29974-11-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: 8/wC7LqzXMjl This commit was produced with the included Coccinelle script scripts/coccinelle/exec_rw_const. Suggested-by: Stefan Weil Signed-off-by: Philippe Mathieu-Daudé --- scripts/coccinelle/exec_rw_const.cocci | 10 ++++++++++ hw/display/omap_lcdc.c | 10 +++++----- hw/dma/etraxfs_dma.c | 25 ++++++++++--------------- hw/scsi/vmw_pvscsi.c | 8 +++----- target/i386/hax-all.c | 6 +++--- 5 files changed, 31 insertions(+), 28 deletions(-) diff --git a/scripts/coccinelle/exec_rw_const.cocci b/scripts/coccinelle/exec_rw_const.cocci index 5ed956a834..70cf52d58e 100644 --- a/scripts/coccinelle/exec_rw_const.cocci +++ b/scripts/coccinelle/exec_rw_const.cocci @@ -34,6 +34,16 @@ type T; + address_space_write_rom(E1, E2, E3, E4, E5) | +- cpu_physical_memory_rw(E1, (T *)E2, E3, E4) ++ cpu_physical_memory_rw(E1, E2, E3, E4) +| +- cpu_physical_memory_read(E1, (T *)E2, E3) ++ cpu_physical_memory_read(E1, E2, E3) +| +- cpu_physical_memory_write(E1, (T *)E2, E3) ++ cpu_physical_memory_write(E1, E2, E3) +| + - dma_memory_read(E1, E2, (T *)E3, E4) + dma_memory_read(E1, E2, E3, E4) | diff --git a/hw/display/omap_lcdc.c b/hw/display/omap_lcdc.c index 6ad13f2e9e..fa4a381db6 100644 --- a/hw/display/omap_lcdc.c +++ b/hw/display/omap_lcdc.c @@ -91,9 +91,9 @@ static void omap_update_display(void *opaque) frame_offset = 0; if (omap_lcd->plm != 2) { - cpu_physical_memory_read(omap_lcd->dma->phys_framebuffer[ - omap_lcd->dma->current_frame], - (void *)omap_lcd->palette, 0x200); + cpu_physical_memory_read( + omap_lcd->dma->phys_framebuffer[omap_lcd->dma->current_frame], + omap_lcd->palette, 0x200); switch (omap_lcd->palette[0] >> 12 & 7) { case 3 ... 7: frame_offset += 0x200; @@ -244,8 +244,8 @@ static void omap_lcd_update(struct omap_lcd_panel_s *s) { if (s->plm != 2 && !s->palette_done) { cpu_physical_memory_read( - s->dma->phys_framebuffer[s->dma->current_frame], - (void *)s->palette, 0x200); + s->dma->phys_framebuffer[s->dma->current_frame], + s->palette, 0x200); s->palette_done = 1; omap_lcd_interrupts(s); } diff --git a/hw/dma/etraxfs_dma.c b/hw/dma/etraxfs_dma.c index 47e1c6df12..c4334e87bf 100644 --- a/hw/dma/etraxfs_dma.c +++ b/hw/dma/etraxfs_dma.c @@ -225,9 +225,8 @@ static void channel_load_g(struct fs_dma_ctrl *ctrl, int c) hwaddr addr = channel_reg(ctrl, c, RW_GROUP); /* Load and decode. FIXME: handle endianness. */ - cpu_physical_memory_read (addr, - (void *) &ctrl->channels[c].current_g, - sizeof ctrl->channels[c].current_g); + cpu_physical_memory_read(addr, &ctrl->channels[c].current_g, + sizeof(ctrl->channels[c].current_g)); } static void dump_c(int ch, struct dma_descr_context *c) @@ -257,9 +256,8 @@ static void channel_load_c(struct fs_dma_ctrl *ctrl, int c) hwaddr addr = channel_reg(ctrl, c, RW_GROUP_DOWN); /* Load and decode. FIXME: handle endianness. */ - cpu_physical_memory_read (addr, - (void *) &ctrl->channels[c].current_c, - sizeof ctrl->channels[c].current_c); + cpu_physical_memory_read(addr, &ctrl->channels[c].current_c, + sizeof(ctrl->channels[c].current_c)); D(dump_c(c, &ctrl->channels[c].current_c)); /* I guess this should update the current pos. */ @@ -275,9 +273,8 @@ static void channel_load_d(struct fs_dma_ctrl *ctrl, int c) /* Load and decode. FIXME: handle endianness. */ D(printf("%s ch=%d addr=" TARGET_FMT_plx "\n", __func__, c, addr)); - cpu_physical_memory_read (addr, - (void *) &ctrl->channels[c].current_d, - sizeof ctrl->channels[c].current_d); + cpu_physical_memory_read(addr, &ctrl->channels[c].current_d, + sizeof(ctrl->channels[c].current_d)); D(dump_d(c, &ctrl->channels[c].current_d)); ctrl->channels[c].regs[RW_DATA] = addr; @@ -290,9 +287,8 @@ static void channel_store_c(struct fs_dma_ctrl *ctrl, int c) /* Encode and store. FIXME: handle endianness. */ D(printf("%s ch=%d addr=" TARGET_FMT_plx "\n", __func__, c, addr)); D(dump_d(c, &ctrl->channels[c].current_d)); - cpu_physical_memory_write (addr, - (void *) &ctrl->channels[c].current_c, - sizeof ctrl->channels[c].current_c); + cpu_physical_memory_write(addr, &ctrl->channels[c].current_c, + sizeof(ctrl->channels[c].current_c)); } static void channel_store_d(struct fs_dma_ctrl *ctrl, int c) @@ -301,9 +297,8 @@ static void channel_store_d(struct fs_dma_ctrl *ctrl, int c) /* Encode and store. FIXME: handle endianness. */ D(printf("%s ch=%d addr=" TARGET_FMT_plx "\n", __func__, c, addr)); - cpu_physical_memory_write (addr, - (void *) &ctrl->channels[c].current_d, - sizeof ctrl->channels[c].current_d); + cpu_physical_memory_write(addr, &ctrl->channels[c].current_d, + sizeof(ctrl->channels[c].current_d)); } static inline void channel_stop(struct fs_dma_ctrl *ctrl, int c) diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index e4ee2e6643..c91352cf46 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -404,8 +404,7 @@ pvscsi_cmp_ring_put(PVSCSIState *s, struct PVSCSIRingCmpDesc *cmp_desc) cmp_descr_pa = pvscsi_ring_pop_cmp_descr(&s->rings); trace_pvscsi_cmp_ring_put(cmp_descr_pa); - cpu_physical_memory_write(cmp_descr_pa, (void *)cmp_desc, - sizeof(*cmp_desc)); + cpu_physical_memory_write(cmp_descr_pa, cmp_desc, sizeof(*cmp_desc)); } static void @@ -415,8 +414,7 @@ pvscsi_msg_ring_put(PVSCSIState *s, struct PVSCSIRingMsgDesc *msg_desc) msg_descr_pa = pvscsi_ring_pop_msg_descr(&s->rings); trace_pvscsi_msg_ring_put(msg_descr_pa); - cpu_physical_memory_write(msg_descr_pa, (void *)msg_desc, - sizeof(*msg_desc)); + cpu_physical_memory_write(msg_descr_pa, msg_desc, sizeof(*msg_desc)); } static void @@ -491,7 +489,7 @@ pvscsi_get_next_sg_elem(PVSCSISGState *sg) { struct PVSCSISGElement elem; - cpu_physical_memory_read(sg->elemAddr, (void *)&elem, sizeof(elem)); + cpu_physical_memory_read(sg->elemAddr, &elem, sizeof(elem)); if ((elem.flags & ~PVSCSI_KNOWN_FLAGS) != 0) { /* * There is PVSCSI_SGE_FLAG_CHAIN_ELEMENT flag described in diff --git a/target/i386/hax-all.c b/target/i386/hax-all.c index a8b6e5aeb8..a9cc51e6ce 100644 --- a/target/i386/hax-all.c +++ b/target/i386/hax-all.c @@ -367,7 +367,7 @@ static int hax_accel_init(MachineState *ms) static int hax_handle_fastmmio(CPUArchState *env, struct hax_fastmmio *hft) { if (hft->direction < 2) { - cpu_physical_memory_rw(hft->gpa, (uint8_t *) &hft->value, hft->size, + cpu_physical_memory_rw(hft->gpa, &hft->value, hft->size, hft->direction); } else { /* @@ -376,8 +376,8 @@ static int hax_handle_fastmmio(CPUArchState *env, struct hax_fastmmio *hft) * hft->direction == 2: gpa ==> gpa2 */ uint64_t value; - cpu_physical_memory_rw(hft->gpa, (uint8_t *) &value, hft->size, 0); - cpu_physical_memory_rw(hft->gpa2, (uint8_t *) &value, hft->size, 1); + cpu_physical_memory_rw(hft->gpa, &value, hft->size, 0); + cpu_physical_memory_rw(hft->gpa2, &value, hft->size, 1); } return 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 0DE46C11D07 for ; Thu, 20 Feb 2020 13:06:51 +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 CD0BF206ED for ; Thu, 20 Feb 2020 13:06:50 +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="B+e4Abv/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD0BF206ED 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 1j4lXJ-0001MX-0A; Thu, 20 Feb 2020 13:06:37 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j4lXH-0001LF-Sf for xen-devel@lists.xenproject.org; Thu, 20 Feb 2020 13:06:35 +0000 X-Inumbo-ID: d27210a2-53e1-11ea-b0fd-bc764e2007e4 Received: from us-smtp-delivery-1.mimecast.com (unknown [205.139.110.61]) by us1-rack-iad1.inumbo.com (Halon) with ESMTP id d27210a2-53e1-11ea-b0fd-bc764e2007e4; Thu, 20 Feb 2020 13:06:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582203995; 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=Vu5bnXCWmoR0uDiabSQGY0CwtpVH4vjEupEa47euXok=; b=B+e4Abv//ugZdLn38Zqbu49kfI3GmQc/vdGlllKKIzcUl6wBkv0Wl/pcH73IVlaupm4qzw ufJcmdYRMlVkfwMaYinNt/J2hto8QV6N+iqmLSUEIcAtHzGWzz7E+7PIIa51YklWgv451p rSeo7ZP4O/pxvOzG7m6qR6WICjC8UXQ= 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-128-2nsEbd49MZ2DVas3SsuWZg-1; Thu, 20 Feb 2020 08:06:33 -0500 Received: by mail-wm1-f70.google.com with SMTP id g26so799059wmk.6 for ; Thu, 20 Feb 2020 05:06:32 -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=/ld+m5dlIbdFkFHFURC0jskPtvz279hvl5fOCIwyBcI=; b=XitgwzLxm9XtvZL7o08PEf1bUTtJd60cqG2Irjo/j2VFhPSYIAPK5AXkBjjo0GvUDs Hgky7eBpB15YK5R0mFyXaM8jApH+fsI6nvS69eCzgyw3mzesNMWRBpfZ34GU8/cCJIYT Dhv7TvNiB0g/VVHp7Md8j2bJR3RDiEk9NYSFS5REjHdsePjs+CRsQXGjufEoAdEIWW7y AxEfuDvT4GXRY62SgJn7NDDQsXDblxPCBQEZRjCzkXCjs+goicvifGYM9g51X6Z03rcs u6Kq2sktdd4ajIIuELcbZSdp/Lz92NEcF5iXRzhMTDxxSBQCQegz3T0YaL436RPx8TX0 RHHQ== X-Gm-Message-State: APjAAAVcvNy/INCkbJCLIvhhZV6BrB3aIiohy8ECgyshlpZ72eaIsI4v LBxgPX28LlWRPj6QZkBi8bhhczHLF/p/dM66FHmuTxQKNvrol0yDBa2m4NukE6kpkl1rt9iVDco odduL+xS2nD4pAorVLTqGf83NIJI= X-Received: by 2002:adf:e781:: with SMTP id n1mr45109041wrm.56.1582203991748; Thu, 20 Feb 2020 05:06:31 -0800 (PST) X-Google-Smtp-Source: APXvYqwouSCwy3rqeENoKe0gZr/3kvydEDFXzHky1eaSJGgeUp7K/B6TN0eEopUiJDH/U8pAJl2oNQ== X-Received: by 2002:adf:e781:: with SMTP id n1mr45109010wrm.56.1582203991459; Thu, 20 Feb 2020 05:06:31 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:30 -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:38 +0100 Message-Id: <20200220130548.29974-11-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: 2nsEbd49MZ2DVas3SsuWZg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [Xen-devel] [PATCH v3 10/20] Remove unnecessary cast when using the cpu_[physical]_memory API 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" VGhpcyBjb21taXQgd2FzIHByb2R1Y2VkIHdpdGggdGhlIGluY2x1ZGVkIENvY2NpbmVsbGUgc2Ny aXB0CnNjcmlwdHMvY29jY2luZWxsZS9leGVjX3J3X2NvbnN0LgoKU3VnZ2VzdGVkLWJ5OiBTdGVm YW4gV2VpbCA8c3dAd2VpbG5ldHouZGU+ClNpZ25lZC1vZmYtYnk6IFBoaWxpcHBlIE1hdGhpZXUt RGF1ZMOpIDxwaGlsbWRAcmVkaGF0LmNvbT4KLS0tCiBzY3JpcHRzL2NvY2NpbmVsbGUvZXhlY19y d19jb25zdC5jb2NjaSB8IDEwICsrKysrKysrKysKIGh3L2Rpc3BsYXkvb21hcF9sY2RjLmMgICAg ICAgICAgICAgICAgIHwgMTAgKysrKystLS0tLQogaHcvZG1hL2V0cmF4ZnNfZG1hLmMgICAgICAg ICAgICAgICAgICAgfCAyNSArKysrKysrKysrLS0tLS0tLS0tLS0tLS0tCiBody9zY3NpL3Ztd19w dnNjc2kuYyAgICAgICAgICAgICAgICAgICB8ICA4ICsrKy0tLS0tCiB0YXJnZXQvaTM4Ni9oYXgt YWxsLmMgICAgICAgICAgICAgICAgICB8ICA2ICsrKy0tLQogNSBmaWxlcyBjaGFuZ2VkLCAzMSBp bnNlcnRpb25zKCspLCAyOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zY3JpcHRzL2NvY2Np bmVsbGUvZXhlY19yd19jb25zdC5jb2NjaSBiL3NjcmlwdHMvY29jY2luZWxsZS9leGVjX3J3X2Nv bnN0LmNvY2NpCmluZGV4IDVlZDk1NmE4MzQuLjcwY2Y1MmQ1OGUgMTAwNjQ0Ci0tLSBhL3Njcmlw dHMvY29jY2luZWxsZS9leGVjX3J3X2NvbnN0LmNvY2NpCisrKyBiL3NjcmlwdHMvY29jY2luZWxs ZS9leGVjX3J3X2NvbnN0LmNvY2NpCkBAIC0zNCw2ICszNCwxNiBAQCB0eXBlIFQ7CiArIGFkZHJl c3Nfc3BhY2Vfd3JpdGVfcm9tKEUxLCBFMiwgRTMsIEU0LCBFNSkKIHwKIAorLSBjcHVfcGh5c2lj YWxfbWVtb3J5X3J3KEUxLCAoVCAqKUUyLCBFMywgRTQpCisrIGNwdV9waHlzaWNhbF9tZW1vcnlf cncoRTEsIEUyLCBFMywgRTQpCit8CistIGNwdV9waHlzaWNhbF9tZW1vcnlfcmVhZChFMSwgKFQg KilFMiwgRTMpCisrIGNwdV9waHlzaWNhbF9tZW1vcnlfcmVhZChFMSwgRTIsIEUzKQorfAorLSBj cHVfcGh5c2ljYWxfbWVtb3J5X3dyaXRlKEUxLCAoVCAqKUUyLCBFMykKKysgY3B1X3BoeXNpY2Fs X21lbW9yeV93cml0ZShFMSwgRTIsIEUzKQorfAorCiAtIGRtYV9tZW1vcnlfcmVhZChFMSwgRTIs IChUICopRTMsIEU0KQogKyBkbWFfbWVtb3J5X3JlYWQoRTEsIEUyLCBFMywgRTQpCiB8CmRpZmYg LS1naXQgYS9ody9kaXNwbGF5L29tYXBfbGNkYy5jIGIvaHcvZGlzcGxheS9vbWFwX2xjZGMuYwpp bmRleCA2YWQxM2YyZTllLi5mYTRhMzgxZGI2IDEwMDY0NAotLS0gYS9ody9kaXNwbGF5L29tYXBf bGNkYy5jCisrKyBiL2h3L2Rpc3BsYXkvb21hcF9sY2RjLmMKQEAgLTkxLDkgKzkxLDkgQEAgc3Rh dGljIHZvaWQgb21hcF91cGRhdGVfZGlzcGxheSh2b2lkICpvcGFxdWUpCiAKICAgICBmcmFtZV9v ZmZzZXQgPSAwOwogICAgIGlmIChvbWFwX2xjZC0+cGxtICE9IDIpIHsKLSAgICAgICAgY3B1X3Bo eXNpY2FsX21lbW9yeV9yZWFkKG9tYXBfbGNkLT5kbWEtPnBoeXNfZnJhbWVidWZmZXJbCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb21hcF9sY2QtPmRtYS0+Y3VycmVudF9mcmFt ZV0sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAodm9pZCAqKW9tYXBfbGNkLT5w YWxldHRlLCAweDIwMCk7CisgICAgICAgIGNwdV9waHlzaWNhbF9tZW1vcnlfcmVhZCgKKyAgICAg ICAgICAgICAgICBvbWFwX2xjZC0+ZG1hLT5waHlzX2ZyYW1lYnVmZmVyW29tYXBfbGNkLT5kbWEt PmN1cnJlbnRfZnJhbWVdLAorICAgICAgICAgICAgICAgIG9tYXBfbGNkLT5wYWxldHRlLCAweDIw MCk7CiAgICAgICAgIHN3aXRjaCAob21hcF9sY2QtPnBhbGV0dGVbMF0gPj4gMTIgJiA3KSB7CiAg ICAgICAgIGNhc2UgMyAuLi4gNzoKICAgICAgICAgICAgIGZyYW1lX29mZnNldCArPSAweDIwMDsK QEAgLTI0NCw4ICsyNDQsOCBAQCBzdGF0aWMgdm9pZCBvbWFwX2xjZF91cGRhdGUoc3RydWN0IG9t YXBfbGNkX3BhbmVsX3MgKnMpIHsKIAogICAgIGlmIChzLT5wbG0gIT0gMiAmJiAhcy0+cGFsZXR0 ZV9kb25lKSB7CiAgICAgICAgIGNwdV9waHlzaWNhbF9tZW1vcnlfcmVhZCgKLSAgICAgICAgICAg IHMtPmRtYS0+cGh5c19mcmFtZWJ1ZmZlcltzLT5kbWEtPmN1cnJlbnRfZnJhbWVdLAotICAgICAg ICAgICAgKHZvaWQgKilzLT5wYWxldHRlLCAweDIwMCk7CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcy0+ZG1hLT5waHlzX2ZyYW1lYnVmZmVyW3MtPmRtYS0+Y3VycmVudF9mcmFtZV0sCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcy0+cGFsZXR0ZSwgMHgyMDApOwogICAgICAgICBz LT5wYWxldHRlX2RvbmUgPSAxOwogICAgICAgICBvbWFwX2xjZF9pbnRlcnJ1cHRzKHMpOwogICAg IH0KZGlmZiAtLWdpdCBhL2h3L2RtYS9ldHJheGZzX2RtYS5jIGIvaHcvZG1hL2V0cmF4ZnNfZG1h LmMKaW5kZXggNDdlMWM2ZGYxMi4uYzQzMzRlODdiZiAxMDA2NDQKLS0tIGEvaHcvZG1hL2V0cmF4 ZnNfZG1hLmMKKysrIGIvaHcvZG1hL2V0cmF4ZnNfZG1hLmMKQEAgLTIyNSw5ICsyMjUsOCBAQCBz dGF0aWMgdm9pZCBjaGFubmVsX2xvYWRfZyhzdHJ1Y3QgZnNfZG1hX2N0cmwgKmN0cmwsIGludCBj KQogCWh3YWRkciBhZGRyID0gY2hhbm5lbF9yZWcoY3RybCwgYywgUldfR1JPVVApOwogCiAJLyog TG9hZCBhbmQgZGVjb2RlLiBGSVhNRTogaGFuZGxlIGVuZGlhbm5lc3MuICAqLwotCWNwdV9waHlz aWNhbF9tZW1vcnlfcmVhZCAoYWRkciwgCi0JCQkJICAodm9pZCAqKSAmY3RybC0+Y2hhbm5lbHNb Y10uY3VycmVudF9nLCAKLQkJCQkgIHNpemVvZiBjdHJsLT5jaGFubmVsc1tjXS5jdXJyZW50X2cp OworICAgIGNwdV9waHlzaWNhbF9tZW1vcnlfcmVhZChhZGRyLCAmY3RybC0+Y2hhbm5lbHNbY10u Y3VycmVudF9nLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzaXplb2YoY3RybC0+Y2hh bm5lbHNbY10uY3VycmVudF9nKSk7CiB9CiAKIHN0YXRpYyB2b2lkIGR1bXBfYyhpbnQgY2gsIHN0 cnVjdCBkbWFfZGVzY3JfY29udGV4dCAqYykKQEAgLTI1Nyw5ICsyNTYsOCBAQCBzdGF0aWMgdm9p ZCBjaGFubmVsX2xvYWRfYyhzdHJ1Y3QgZnNfZG1hX2N0cmwgKmN0cmwsIGludCBjKQogCWh3YWRk ciBhZGRyID0gY2hhbm5lbF9yZWcoY3RybCwgYywgUldfR1JPVVBfRE9XTik7CiAKIAkvKiBMb2Fk IGFuZCBkZWNvZGUuIEZJWE1FOiBoYW5kbGUgZW5kaWFubmVzcy4gICovCi0JY3B1X3BoeXNpY2Fs X21lbW9yeV9yZWFkIChhZGRyLCAKLQkJCQkgICh2b2lkICopICZjdHJsLT5jaGFubmVsc1tjXS5j dXJyZW50X2MsIAotCQkJCSAgc2l6ZW9mIGN0cmwtPmNoYW5uZWxzW2NdLmN1cnJlbnRfYyk7Cisg ICAgY3B1X3BoeXNpY2FsX21lbW9yeV9yZWFkKGFkZHIsICZjdHJsLT5jaGFubmVsc1tjXS5jdXJy ZW50X2MsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNpemVvZihjdHJsLT5jaGFubmVs c1tjXS5jdXJyZW50X2MpKTsKIAogCUQoZHVtcF9jKGMsICZjdHJsLT5jaGFubmVsc1tjXS5jdXJy ZW50X2MpKTsKIAkvKiBJIGd1ZXNzIHRoaXMgc2hvdWxkIHVwZGF0ZSB0aGUgY3VycmVudCBwb3Mu ICAqLwpAQCAtMjc1LDkgKzI3Myw4IEBAIHN0YXRpYyB2b2lkIGNoYW5uZWxfbG9hZF9kKHN0cnVj dCBmc19kbWFfY3RybCAqY3RybCwgaW50IGMpCiAKIAkvKiBMb2FkIGFuZCBkZWNvZGUuIEZJWE1F OiBoYW5kbGUgZW5kaWFubmVzcy4gICovCiAJRChwcmludGYoIiVzIGNoPSVkIGFkZHI9IiBUQVJH RVRfRk1UX3BseCAiXG4iLCBfX2Z1bmNfXywgYywgYWRkcikpOwotCWNwdV9waHlzaWNhbF9tZW1v cnlfcmVhZCAoYWRkciwKLQkJCQkgICh2b2lkICopICZjdHJsLT5jaGFubmVsc1tjXS5jdXJyZW50 X2QsIAotCQkJCSAgc2l6ZW9mIGN0cmwtPmNoYW5uZWxzW2NdLmN1cnJlbnRfZCk7CisgICAgY3B1 X3BoeXNpY2FsX21lbW9yeV9yZWFkKGFkZHIsICZjdHJsLT5jaGFubmVsc1tjXS5jdXJyZW50X2Qs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNpemVvZihjdHJsLT5jaGFubmVsc1tjXS5j dXJyZW50X2QpKTsKIAogCUQoZHVtcF9kKGMsICZjdHJsLT5jaGFubmVsc1tjXS5jdXJyZW50X2Qp KTsKIAljdHJsLT5jaGFubmVsc1tjXS5yZWdzW1JXX0RBVEFdID0gYWRkcjsKQEAgLTI5MCw5ICsy ODcsOCBAQCBzdGF0aWMgdm9pZCBjaGFubmVsX3N0b3JlX2Moc3RydWN0IGZzX2RtYV9jdHJsICpj dHJsLCBpbnQgYykKIAkvKiBFbmNvZGUgYW5kIHN0b3JlLiBGSVhNRTogaGFuZGxlIGVuZGlhbm5l c3MuICAqLwogCUQocHJpbnRmKCIlcyBjaD0lZCBhZGRyPSIgVEFSR0VUX0ZNVF9wbHggIlxuIiwg X19mdW5jX18sIGMsIGFkZHIpKTsKIAlEKGR1bXBfZChjLCAmY3RybC0+Y2hhbm5lbHNbY10uY3Vy cmVudF9kKSk7Ci0JY3B1X3BoeXNpY2FsX21lbW9yeV93cml0ZSAoYWRkciwKLQkJCQkgICh2b2lk ICopICZjdHJsLT5jaGFubmVsc1tjXS5jdXJyZW50X2MsCi0JCQkJICBzaXplb2YgY3RybC0+Y2hh bm5lbHNbY10uY3VycmVudF9jKTsKKyAgICBjcHVfcGh5c2ljYWxfbWVtb3J5X3dyaXRlKGFkZHIs ICZjdHJsLT5jaGFubmVsc1tjXS5jdXJyZW50X2MsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBzaXplb2YoY3RybC0+Y2hhbm5lbHNbY10uY3VycmVudF9jKSk7CiB9CiAKIHN0YXRpYyB2 b2lkIGNoYW5uZWxfc3RvcmVfZChzdHJ1Y3QgZnNfZG1hX2N0cmwgKmN0cmwsIGludCBjKQpAQCAt MzAxLDkgKzI5Nyw4IEBAIHN0YXRpYyB2b2lkIGNoYW5uZWxfc3RvcmVfZChzdHJ1Y3QgZnNfZG1h X2N0cmwgKmN0cmwsIGludCBjKQogCiAJLyogRW5jb2RlIGFuZCBzdG9yZS4gRklYTUU6IGhhbmRs ZSBlbmRpYW5uZXNzLiAgKi8KIAlEKHByaW50ZigiJXMgY2g9JWQgYWRkcj0iIFRBUkdFVF9GTVRf cGx4ICJcbiIsIF9fZnVuY19fLCBjLCBhZGRyKSk7Ci0JY3B1X3BoeXNpY2FsX21lbW9yeV93cml0 ZSAoYWRkciwKLQkJCQkgICh2b2lkICopICZjdHJsLT5jaGFubmVsc1tjXS5jdXJyZW50X2QsIAot CQkJCSAgc2l6ZW9mIGN0cmwtPmNoYW5uZWxzW2NdLmN1cnJlbnRfZCk7CisgICAgY3B1X3BoeXNp Y2FsX21lbW9yeV93cml0ZShhZGRyLCAmY3RybC0+Y2hhbm5lbHNbY10uY3VycmVudF9kLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgc2l6ZW9mKGN0cmwtPmNoYW5uZWxzW2NdLmN1cnJl bnRfZCkpOwogfQogCiBzdGF0aWMgaW5saW5lIHZvaWQgY2hhbm5lbF9zdG9wKHN0cnVjdCBmc19k bWFfY3RybCAqY3RybCwgaW50IGMpCmRpZmYgLS1naXQgYS9ody9zY3NpL3Ztd19wdnNjc2kuYyBi L2h3L3Njc2kvdm13X3B2c2NzaS5jCmluZGV4IGU0ZWUyZTY2NDMuLmM5MTM1MmNmNDYgMTAwNjQ0 Ci0tLSBhL2h3L3Njc2kvdm13X3B2c2NzaS5jCisrKyBiL2h3L3Njc2kvdm13X3B2c2NzaS5jCkBA IC00MDQsOCArNDA0LDcgQEAgcHZzY3NpX2NtcF9yaW5nX3B1dChQVlNDU0lTdGF0ZSAqcywgc3Ry dWN0IFBWU0NTSVJpbmdDbXBEZXNjICpjbXBfZGVzYykKIAogICAgIGNtcF9kZXNjcl9wYSA9IHB2 c2NzaV9yaW5nX3BvcF9jbXBfZGVzY3IoJnMtPnJpbmdzKTsKICAgICB0cmFjZV9wdnNjc2lfY21w X3JpbmdfcHV0KGNtcF9kZXNjcl9wYSk7Ci0gICAgY3B1X3BoeXNpY2FsX21lbW9yeV93cml0ZShj bXBfZGVzY3JfcGEsICh2b2lkICopY21wX2Rlc2MsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBzaXplb2YoKmNtcF9kZXNjKSk7CisgICAgY3B1X3BoeXNpY2FsX21lbW9yeV93cml0ZShj bXBfZGVzY3JfcGEsIGNtcF9kZXNjLCBzaXplb2YoKmNtcF9kZXNjKSk7CiB9CiAKIHN0YXRpYyB2 b2lkCkBAIC00MTUsOCArNDE0LDcgQEAgcHZzY3NpX21zZ19yaW5nX3B1dChQVlNDU0lTdGF0ZSAq cywgc3RydWN0IFBWU0NTSVJpbmdNc2dEZXNjICptc2dfZGVzYykKIAogICAgIG1zZ19kZXNjcl9w YSA9IHB2c2NzaV9yaW5nX3BvcF9tc2dfZGVzY3IoJnMtPnJpbmdzKTsKICAgICB0cmFjZV9wdnNj c2lfbXNnX3JpbmdfcHV0KG1zZ19kZXNjcl9wYSk7Ci0gICAgY3B1X3BoeXNpY2FsX21lbW9yeV93 cml0ZShtc2dfZGVzY3JfcGEsICh2b2lkICopbXNnX2Rlc2MsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBzaXplb2YoKm1zZ19kZXNjKSk7CisgICAgY3B1X3BoeXNpY2FsX21lbW9yeV93 cml0ZShtc2dfZGVzY3JfcGEsIG1zZ19kZXNjLCBzaXplb2YoKm1zZ19kZXNjKSk7CiB9CiAKIHN0 YXRpYyB2b2lkCkBAIC00OTEsNyArNDg5LDcgQEAgcHZzY3NpX2dldF9uZXh0X3NnX2VsZW0oUFZT Q1NJU0dTdGF0ZSAqc2cpCiB7CiAgICAgc3RydWN0IFBWU0NTSVNHRWxlbWVudCBlbGVtOwogCi0g ICAgY3B1X3BoeXNpY2FsX21lbW9yeV9yZWFkKHNnLT5lbGVtQWRkciwgKHZvaWQgKikmZWxlbSwg c2l6ZW9mKGVsZW0pKTsKKyAgICBjcHVfcGh5c2ljYWxfbWVtb3J5X3JlYWQoc2ctPmVsZW1BZGRy LCAmZWxlbSwgc2l6ZW9mKGVsZW0pKTsKICAgICBpZiAoKGVsZW0uZmxhZ3MgJiB+UFZTQ1NJX0tO T1dOX0ZMQUdTKSAhPSAwKSB7CiAgICAgICAgIC8qCiAgICAgICAgICAgICAqIFRoZXJlIGlzIFBW U0NTSV9TR0VfRkxBR19DSEFJTl9FTEVNRU5UIGZsYWcgZGVzY3JpYmVkIGluCmRpZmYgLS1naXQg YS90YXJnZXQvaTM4Ni9oYXgtYWxsLmMgYi90YXJnZXQvaTM4Ni9oYXgtYWxsLmMKaW5kZXggYThi NmU1YWViOC4uYTljYzUxZTZjZSAxMDA2NDQKLS0tIGEvdGFyZ2V0L2kzODYvaGF4LWFsbC5jCisr KyBiL3RhcmdldC9pMzg2L2hheC1hbGwuYwpAQCAtMzY3LDcgKzM2Nyw3IEBAIHN0YXRpYyBpbnQg aGF4X2FjY2VsX2luaXQoTWFjaGluZVN0YXRlICptcykKIHN0YXRpYyBpbnQgaGF4X2hhbmRsZV9m YXN0bW1pbyhDUFVBcmNoU3RhdGUgKmVudiwgc3RydWN0IGhheF9mYXN0bW1pbyAqaGZ0KQogewog ICAgIGlmIChoZnQtPmRpcmVjdGlvbiA8IDIpIHsKLSAgICAgICAgY3B1X3BoeXNpY2FsX21lbW9y eV9ydyhoZnQtPmdwYSwgKHVpbnQ4X3QgKikgJmhmdC0+dmFsdWUsIGhmdC0+c2l6ZSwKKyAgICAg ICAgY3B1X3BoeXNpY2FsX21lbW9yeV9ydyhoZnQtPmdwYSwgJmhmdC0+dmFsdWUsIGhmdC0+c2l6 ZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBoZnQtPmRpcmVjdGlvbik7CiAgICAg fSBlbHNlIHsKICAgICAgICAgLyoKQEAgLTM3Niw4ICszNzYsOCBAQCBzdGF0aWMgaW50IGhheF9o YW5kbGVfZmFzdG1taW8oQ1BVQXJjaFN0YXRlICplbnYsIHN0cnVjdCBoYXhfZmFzdG1taW8gKmhm dCkKICAgICAgICAgICogIGhmdC0+ZGlyZWN0aW9uID09IDI6IGdwYSA9PT4gZ3BhMgogICAgICAg ICAgKi8KICAgICAgICAgdWludDY0X3QgdmFsdWU7Ci0gICAgICAgIGNwdV9waHlzaWNhbF9tZW1v cnlfcncoaGZ0LT5ncGEsICh1aW50OF90ICopICZ2YWx1ZSwgaGZ0LT5zaXplLCAwKTsKLSAgICAg ICAgY3B1X3BoeXNpY2FsX21lbW9yeV9ydyhoZnQtPmdwYTIsICh1aW50OF90ICopICZ2YWx1ZSwg aGZ0LT5zaXplLCAxKTsKKyAgICAgICAgY3B1X3BoeXNpY2FsX21lbW9yeV9ydyhoZnQtPmdwYSwg JnZhbHVlLCBoZnQtPnNpemUsIDApOworICAgICAgICBjcHVfcGh5c2ljYWxfbWVtb3J5X3J3KGhm dC0+Z3BhMiwgJnZhbHVlLCBoZnQtPnNpemUsIDEpOwogICAgIH0KIAogICAgIHJldHVybiAwOwot LSAKMi4yMS4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcK aHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA== 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 6F8A3C11D04 for ; Thu, 20 Feb 2020 13:13: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 26234208C4 for ; Thu, 20 Feb 2020 13:13: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="B+e4Abv/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 26234208C4 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]:41736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4leE-0001MX-Ak for qemu-devel@archiver.kernel.org; Thu, 20 Feb 2020 08:13:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56074) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4lXJ-0005P2-EM for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4lXH-0005Ij-QH for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:37 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:52498 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 1j4lXH-0005I3-LY for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582203995; 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=Vu5bnXCWmoR0uDiabSQGY0CwtpVH4vjEupEa47euXok=; b=B+e4Abv//ugZdLn38Zqbu49kfI3GmQc/vdGlllKKIzcUl6wBkv0Wl/pcH73IVlaupm4qzw ufJcmdYRMlVkfwMaYinNt/J2hto8QV6N+iqmLSUEIcAtHzGWzz7E+7PIIa51YklWgv451p rSeo7ZP4O/pxvOzG7m6qR6WICjC8UXQ= 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-336-sDINMfaHM7C8TOknOsZeOg-1; Thu, 20 Feb 2020 08:06:33 -0500 Received: by mail-wm1-f69.google.com with SMTP id o24so809972wmh.0 for ; Thu, 20 Feb 2020 05:06:32 -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=/ld+m5dlIbdFkFHFURC0jskPtvz279hvl5fOCIwyBcI=; b=iz81IWHMbcQA15/B1SzdcmXuwIIaQN2xvWoMBFz05aODEJpswpX/hHRnvtETpV67dU 9pP14VhSN0e70zWyrzIHSJtl00FySfU6/R5LQ5+vkDgzu3vPnbhSBZBwPgnVDM32W12b y7RrjyApRCi5yunILnK7EBZKHZwLSKT6MSlNYxltcIWLvH9NoceJTwB23LTSRDbWDqry 5PUrJ/CBN9tXedGr8AO1lS2KIWFNTLqpvi7R6Xyxk7Q7M/Kfx7kvxfz0r1zIdvEHRfxy 5xccO7CPvaFYeu3eItEoOSsaISlebkl0JKhSPPCaJoylXcInch/N4WWDsDir5x4igYQL OoNw== X-Gm-Message-State: APjAAAVav1Kq6eTelMmzmjsFz9G1NXUbIFUgaRij6lS7BrGvkhCYFC/L 5HWhnI5/8Oi0RB4LulpeHzfscY87IV9s1KA9/thLjSvLyUjKIjO/TjiMgLZn+DN+xh7mfvvsxXC gfcf3K7XbTSG1BOo= X-Received: by 2002:adf:e781:: with SMTP id n1mr45109049wrm.56.1582203991748; Thu, 20 Feb 2020 05:06:31 -0800 (PST) X-Google-Smtp-Source: APXvYqwouSCwy3rqeENoKe0gZr/3kvydEDFXzHky1eaSJGgeUp7K/B6TN0eEopUiJDH/U8pAJl2oNQ== X-Received: by 2002:adf:e781:: with SMTP id n1mr45109010wrm.56.1582203991459; Thu, 20 Feb 2020 05:06:31 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:30 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Subject: [PATCH v3 10/20] Remove unnecessary cast when using the cpu_[physical]_memory API Date: Thu, 20 Feb 2020 14:05:38 +0100 Message-Id: <20200220130548.29974-11-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: sDINMfaHM7C8TOknOsZeOg-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.120 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" This commit was produced with the included Coccinelle script scripts/coccinelle/exec_rw_const. Suggested-by: Stefan Weil Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- scripts/coccinelle/exec_rw_const.cocci | 10 ++++++++++ hw/display/omap_lcdc.c | 10 +++++----- hw/dma/etraxfs_dma.c | 25 ++++++++++--------------- hw/scsi/vmw_pvscsi.c | 8 +++----- target/i386/hax-all.c | 6 +++--- 5 files changed, 31 insertions(+), 28 deletions(-) diff --git a/scripts/coccinelle/exec_rw_const.cocci b/scripts/coccinelle/ex= ec_rw_const.cocci index 5ed956a834..70cf52d58e 100644 --- a/scripts/coccinelle/exec_rw_const.cocci +++ b/scripts/coccinelle/exec_rw_const.cocci @@ -34,6 +34,16 @@ type T; + address_space_write_rom(E1, E2, E3, E4, E5) | =20 +- cpu_physical_memory_rw(E1, (T *)E2, E3, E4) ++ cpu_physical_memory_rw(E1, E2, E3, E4) +| +- cpu_physical_memory_read(E1, (T *)E2, E3) ++ cpu_physical_memory_read(E1, E2, E3) +| +- cpu_physical_memory_write(E1, (T *)E2, E3) ++ cpu_physical_memory_write(E1, E2, E3) +| + - dma_memory_read(E1, E2, (T *)E3, E4) + dma_memory_read(E1, E2, E3, E4) | diff --git a/hw/display/omap_lcdc.c b/hw/display/omap_lcdc.c index 6ad13f2e9e..fa4a381db6 100644 --- a/hw/display/omap_lcdc.c +++ b/hw/display/omap_lcdc.c @@ -91,9 +91,9 @@ static void omap_update_display(void *opaque) =20 frame_offset =3D 0; if (omap_lcd->plm !=3D 2) { - cpu_physical_memory_read(omap_lcd->dma->phys_framebuffer[ - omap_lcd->dma->current_frame], - (void *)omap_lcd->palette, 0x200); + cpu_physical_memory_read( + omap_lcd->dma->phys_framebuffer[omap_lcd->dma->current_fra= me], + omap_lcd->palette, 0x200); switch (omap_lcd->palette[0] >> 12 & 7) { case 3 ... 7: frame_offset +=3D 0x200; @@ -244,8 +244,8 @@ static void omap_lcd_update(struct omap_lcd_panel_s *s)= { =20 if (s->plm !=3D 2 && !s->palette_done) { cpu_physical_memory_read( - s->dma->phys_framebuffer[s->dma->current_frame], - (void *)s->palette, 0x200); + s->dma->phys_framebuffer[s->dma->current_frame= ], + s->palette, 0x200); s->palette_done =3D 1; omap_lcd_interrupts(s); } diff --git a/hw/dma/etraxfs_dma.c b/hw/dma/etraxfs_dma.c index 47e1c6df12..c4334e87bf 100644 --- a/hw/dma/etraxfs_dma.c +++ b/hw/dma/etraxfs_dma.c @@ -225,9 +225,8 @@ static void channel_load_g(struct fs_dma_ctrl *ctrl, in= t c) =09hwaddr addr =3D channel_reg(ctrl, c, RW_GROUP); =20 =09/* Load and decode. FIXME: handle endianness. */ -=09cpu_physical_memory_read (addr,=20 -=09=09=09=09 (void *) &ctrl->channels[c].current_g,=20 -=09=09=09=09 sizeof ctrl->channels[c].current_g); + cpu_physical_memory_read(addr, &ctrl->channels[c].current_g, + sizeof(ctrl->channels[c].current_g)); } =20 static void dump_c(int ch, struct dma_descr_context *c) @@ -257,9 +256,8 @@ static void channel_load_c(struct fs_dma_ctrl *ctrl, in= t c) =09hwaddr addr =3D channel_reg(ctrl, c, RW_GROUP_DOWN); =20 =09/* Load and decode. FIXME: handle endianness. */ -=09cpu_physical_memory_read (addr,=20 -=09=09=09=09 (void *) &ctrl->channels[c].current_c,=20 -=09=09=09=09 sizeof ctrl->channels[c].current_c); + cpu_physical_memory_read(addr, &ctrl->channels[c].current_c, + sizeof(ctrl->channels[c].current_c)); =20 =09D(dump_c(c, &ctrl->channels[c].current_c)); =09/* I guess this should update the current pos. */ @@ -275,9 +273,8 @@ static void channel_load_d(struct fs_dma_ctrl *ctrl, in= t c) =20 =09/* Load and decode. FIXME: handle endianness. */ =09D(printf("%s ch=3D%d addr=3D" TARGET_FMT_plx "\n", __func__, c, addr)); -=09cpu_physical_memory_read (addr, -=09=09=09=09 (void *) &ctrl->channels[c].current_d,=20 -=09=09=09=09 sizeof ctrl->channels[c].current_d); + cpu_physical_memory_read(addr, &ctrl->channels[c].current_d, + sizeof(ctrl->channels[c].current_d)); =20 =09D(dump_d(c, &ctrl->channels[c].current_d)); =09ctrl->channels[c].regs[RW_DATA] =3D addr; @@ -290,9 +287,8 @@ static void channel_store_c(struct fs_dma_ctrl *ctrl, i= nt c) =09/* Encode and store. FIXME: handle endianness. */ =09D(printf("%s ch=3D%d addr=3D" TARGET_FMT_plx "\n", __func__, c, addr)); =09D(dump_d(c, &ctrl->channels[c].current_d)); -=09cpu_physical_memory_write (addr, -=09=09=09=09 (void *) &ctrl->channels[c].current_c, -=09=09=09=09 sizeof ctrl->channels[c].current_c); + cpu_physical_memory_write(addr, &ctrl->channels[c].current_c, + sizeof(ctrl->channels[c].current_c)); } =20 static void channel_store_d(struct fs_dma_ctrl *ctrl, int c) @@ -301,9 +297,8 @@ static void channel_store_d(struct fs_dma_ctrl *ctrl, i= nt c) =20 =09/* Encode and store. FIXME: handle endianness. */ =09D(printf("%s ch=3D%d addr=3D" TARGET_FMT_plx "\n", __func__, c, addr)); -=09cpu_physical_memory_write (addr, -=09=09=09=09 (void *) &ctrl->channels[c].current_d,=20 -=09=09=09=09 sizeof ctrl->channels[c].current_d); + cpu_physical_memory_write(addr, &ctrl->channels[c].current_d, + sizeof(ctrl->channels[c].current_d)); } =20 static inline void channel_stop(struct fs_dma_ctrl *ctrl, int c) diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index e4ee2e6643..c91352cf46 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -404,8 +404,7 @@ pvscsi_cmp_ring_put(PVSCSIState *s, struct PVSCSIRingCm= pDesc *cmp_desc) =20 cmp_descr_pa =3D pvscsi_ring_pop_cmp_descr(&s->rings); trace_pvscsi_cmp_ring_put(cmp_descr_pa); - cpu_physical_memory_write(cmp_descr_pa, (void *)cmp_desc, - sizeof(*cmp_desc)); + cpu_physical_memory_write(cmp_descr_pa, cmp_desc, sizeof(*cmp_desc)); } =20 static void @@ -415,8 +414,7 @@ pvscsi_msg_ring_put(PVSCSIState *s, struct PVSCSIRingMs= gDesc *msg_desc) =20 msg_descr_pa =3D pvscsi_ring_pop_msg_descr(&s->rings); trace_pvscsi_msg_ring_put(msg_descr_pa); - cpu_physical_memory_write(msg_descr_pa, (void *)msg_desc, - sizeof(*msg_desc)); + cpu_physical_memory_write(msg_descr_pa, msg_desc, sizeof(*msg_desc)); } =20 static void @@ -491,7 +489,7 @@ pvscsi_get_next_sg_elem(PVSCSISGState *sg) { struct PVSCSISGElement elem; =20 - cpu_physical_memory_read(sg->elemAddr, (void *)&elem, sizeof(elem)); + cpu_physical_memory_read(sg->elemAddr, &elem, sizeof(elem)); if ((elem.flags & ~PVSCSI_KNOWN_FLAGS) !=3D 0) { /* * There is PVSCSI_SGE_FLAG_CHAIN_ELEMENT flag described in diff --git a/target/i386/hax-all.c b/target/i386/hax-all.c index a8b6e5aeb8..a9cc51e6ce 100644 --- a/target/i386/hax-all.c +++ b/target/i386/hax-all.c @@ -367,7 +367,7 @@ static int hax_accel_init(MachineState *ms) static int hax_handle_fastmmio(CPUArchState *env, struct hax_fastmmio *hft= ) { if (hft->direction < 2) { - cpu_physical_memory_rw(hft->gpa, (uint8_t *) &hft->value, hft->siz= e, + cpu_physical_memory_rw(hft->gpa, &hft->value, hft->size, hft->direction); } else { /* @@ -376,8 +376,8 @@ static int hax_handle_fastmmio(CPUArchState *env, struc= t hax_fastmmio *hft) * hft->direction =3D=3D 2: gpa =3D=3D> gpa2 */ uint64_t value; - cpu_physical_memory_rw(hft->gpa, (uint8_t *) &value, hft->size, 0)= ; - cpu_physical_memory_rw(hft->gpa2, (uint8_t *) &value, hft->size, 1= ); + cpu_physical_memory_rw(hft->gpa, &value, hft->size, 0); + cpu_physical_memory_rw(hft->gpa2, &value, hft->size, 1); } =20 return 0; --=20 2.21.1