From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:cb43:0:0:0:0:0 with SMTP id b64csp543032lfg; Thu, 20 Feb 2020 05:06:08 -0800 (PST) X-Google-Smtp-Source: APXvYqxHXluMekrLljqwGYluxk+9Plnjtkwg8/W7f+CAfkVIB9tygArKn8NMb6RuHKtOf/aVqQko X-Received: by 2002:a9d:51ca:: with SMTP id d10mr23362776oth.76.1582203968223; Thu, 20 Feb 2020 05:06:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582203968; cv=none; d=google.com; s=arc-20160816; b=qmNkYf3YZ0FBIecZa3jKk3TZZZPzDmeJ8FTv51iJ7tW+saRGy+YiV/HOgnS63994wh +o+tGWAfgtNpj0pvwyrgtIgVGu50QkU7YThnQLXXLFLP4iYDYCt5CcNkROSD94kQryJG qMdEliUL7MIk75oPb+rtA44pZN1olJWKoPOLe27opXcLTOmn5Z4WY2U3rBqBF75l8+Am EhTJ8HIaF4wgT1PI7dmM50xVyx36diLjhGxvtuF/AUU+sutj5v37SkzbXl9phexABlhU DYfk2NEBP0wGEc5J1ZSga1o7EdhC+/b8w6lm6nOeP/4i8qkYMeBxTRXGJMbrsJi3sgeQ P1aw== 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=JJNOlxhz3YaDnBzT0LwFaaq/SOy/0tsQ/KrZZBdtHoE=; b=s3y+5H1V6cY36B5NVpOcrabMRTqp6VJgtXoOXC5+RWtvhhJGswDvrv8wIa3dsOugsl VV4BS82HCJJd3zP/w/mhQxnZGyJpboSVrCsxtujg09xRVIgtUW6qtRMH2+a64UJFnUjs K1SN0QKavFHqlh3kPpEJZpW0qNm2EMJLYoLiBocY7iCGVfhI0ood0Uz/eb2WYomhRzQ1 uW33pWbDHvjqbb0i/p75YE2DQ5g+UgX4qOkTev12oPLqdfoKuSE/wh2gAqvKBixi9hS2 ox6MIVGeuZzahtBs0cL8lKj4vOpf8jGUE06/4rq/NMl4EHMroH7rUbbbmULbT/D0ujIg InVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Y6RpI0xc; 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.08; Thu, 20 Feb 2020 05:06:08 -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=Y6RpI0xc; 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 S1728123AbgBTNGG (ORCPT + 5 others); Thu, 20 Feb 2020 08:06:06 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:33098 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728114AbgBTNGF (ORCPT ); Thu, 20 Feb 2020 08:06:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582203964; 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=JJNOlxhz3YaDnBzT0LwFaaq/SOy/0tsQ/KrZZBdtHoE=; b=Y6RpI0xcRZrTEKai7CZeblPtb3EmoD464k8GgDfsXisL2G5s422AwB1AfhfduqOyUdPwzy Qg8RWQYYVqy12EefFThVfREF6feSBAN+tCstcGGQxvVNPLzRbTaoQP+j+AvGWKzsEficL+ eVynyR/NP1vg0r70dqvCwFV/6PF23rA= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-411-UaOXaiRvPSu9JNCLFxldug-1; Thu, 20 Feb 2020 08:06:02 -0500 X-MC-Unique: UaOXaiRvPSu9JNCLFxldug-1 Received: by mail-wm1-f71.google.com with SMTP id b205so806416wmh.2 for ; Thu, 20 Feb 2020 05:06:02 -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=JJNOlxhz3YaDnBzT0LwFaaq/SOy/0tsQ/KrZZBdtHoE=; b=rQVg/+wkPpCZENhNonxFW5IKS4LXGdQtiHlGviu78oUvncb6H77Duw3ZCWqFMtm366 BzSZtMWCo3Q4+XMw3lpdzlpY7zT3M6+Cme7dr7bgcXxPET/VOjcnV7bSmeXwthCe+EIP zDSDRjHKMF57LfVPUTreJvVv8V9oqBNj+vaVoQksUppTdOj2eR7DUqmLEy54WcPjaNzB /g2pGA0txXCvvz5LthDLQEH0XkiBBtMjOEOdjtfQ2BE+fxd0VpTKZ1vtX58hUr3A5Y59 /McXeOGB3zkBwipeirVVhJzuzEDMBcvkG8/g384eRSVMSIhXJbNgu4spL1n0/MjiUXpF eeXg== X-Gm-Message-State: APjAAAVx68s8Dm/oAg4spGUGoVkVsBAnkUXyYErNV50SIhliutlBkJXR 8YmJcln70Sipjre8NAdDTtHwI/9vi0saD7mrZcNPqID/tf+vJNkhFrsaaz9yUNStgWGxhaF2OrI fvCQa0hZT5itq X-Received: by 2002:a7b:c1d0:: with SMTP id a16mr4485847wmj.175.1582203961576; Thu, 20 Feb 2020 05:06:01 -0800 (PST) X-Received: by 2002:a7b:c1d0:: with SMTP id a16mr4485824wmj.175.1582203961311; Thu, 20 Feb 2020 05:06:01 -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.05.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:00 -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 02/20] hw: Remove unnecessary cast when calling dma_memory_read() Date: Thu, 20 Feb 2020 14:05:30 +0100 Message-Id: <20200220130548.29974-3-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: I9PBwJtgMst0 Since its introduction in commit d86a77f8abb, dma_memory_read() always accepted void pointer argument. Remove the unnecessary casts. This commit was produced with the included Coccinelle script scripts/coccinelle/exec_rw_const. Signed-off-by: Philippe Mathieu-Daudé --- scripts/coccinelle/exec_rw_const.cocci | 15 +++++++++++++++ hw/arm/smmu-common.c | 3 +-- hw/arm/smmuv3.c | 10 ++++------ hw/sd/sdhci.c | 15 +++++---------- 4 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 scripts/coccinelle/exec_rw_const.cocci diff --git a/scripts/coccinelle/exec_rw_const.cocci b/scripts/coccinelle/exec_rw_const.cocci new file mode 100644 index 0000000000..a0054f009d --- /dev/null +++ b/scripts/coccinelle/exec_rw_const.cocci @@ -0,0 +1,15 @@ +// Usage: +// spatch --sp-file scripts/coccinelle/exec_rw_const.cocci --dir . --in-place + +// Remove useless cast +@@ +expression E1, E2, E3, E4; +type T; +@@ +( +- dma_memory_read(E1, E2, (T *)E3, E4) ++ dma_memory_read(E1, E2, E3, E4) +| +- dma_memory_write(E1, E2, (T *)E3, E4) ++ dma_memory_write(E1, E2, E3, E4) +) diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index 23eb117041..0f2573f004 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -74,8 +74,7 @@ static int get_pte(dma_addr_t baseaddr, uint32_t index, uint64_t *pte, dma_addr_t addr = baseaddr + index * sizeof(*pte); /* TODO: guarantee 64-bit single-copy atomicity */ - ret = dma_memory_read(&address_space_memory, addr, - (uint8_t *)pte, sizeof(*pte)); + ret = dma_memory_read(&address_space_memory, addr, pte, sizeof(*pte)); if (ret != MEMTX_OK) { info->type = SMMU_PTW_ERR_WALK_EABT; diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 8b5f157dc7..57a79df55b 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -279,8 +279,7 @@ static int smmu_get_ste(SMMUv3State *s, dma_addr_t addr, STE *buf, trace_smmuv3_get_ste(addr); /* TODO: guarantee 64-bit single-copy atomicity */ - ret = dma_memory_read(&address_space_memory, addr, - (void *)buf, sizeof(*buf)); + ret = dma_memory_read(&address_space_memory, addr, buf, sizeof(*buf)); if (ret != MEMTX_OK) { qemu_log_mask(LOG_GUEST_ERROR, "Cannot fetch pte at address=0x%"PRIx64"\n", addr); @@ -301,8 +300,7 @@ static int smmu_get_cd(SMMUv3State *s, STE *ste, uint32_t ssid, trace_smmuv3_get_cd(addr); /* TODO: guarantee 64-bit single-copy atomicity */ - ret = dma_memory_read(&address_space_memory, addr, - (void *)buf, sizeof(*buf)); + ret = dma_memory_read(&address_space_memory, addr, buf, sizeof(*buf)); if (ret != MEMTX_OK) { qemu_log_mask(LOG_GUEST_ERROR, "Cannot fetch pte at address=0x%"PRIx64"\n", addr); @@ -406,8 +404,8 @@ static int smmu_find_ste(SMMUv3State *s, uint32_t sid, STE *ste, l2_ste_offset = sid & ((1 << s->sid_split) - 1); l1ptr = (dma_addr_t)(strtab_base + l1_ste_offset * sizeof(l1std)); /* TODO: guarantee 64-bit single-copy atomicity */ - ret = dma_memory_read(&address_space_memory, l1ptr, - (uint8_t *)&l1std, sizeof(l1std)); + ret = dma_memory_read(&address_space_memory, l1ptr, &l1std, + sizeof(l1std)); if (ret != MEMTX_OK) { qemu_log_mask(LOG_GUEST_ERROR, "Could not read L1PTR at 0X%"PRIx64"\n", l1ptr); diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 69dc3e6b90..d5abdaad41 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -701,8 +701,7 @@ static void get_adma_description(SDHCIState *s, ADMADescr *dscr) hwaddr entry_addr = (hwaddr)s->admasysaddr; switch (SDHC_DMA_TYPE(s->hostctl1)) { case SDHC_CTRL_ADMA2_32: - dma_memory_read(s->dma_as, entry_addr, (uint8_t *)&adma2, - sizeof(adma2)); + dma_memory_read(s->dma_as, entry_addr, &adma2, sizeof(adma2)); adma2 = le64_to_cpu(adma2); /* The spec does not specify endianness of descriptor table. * We currently assume that it is LE. @@ -713,8 +712,7 @@ static void get_adma_description(SDHCIState *s, ADMADescr *dscr) dscr->incr = 8; break; case SDHC_CTRL_ADMA1_32: - dma_memory_read(s->dma_as, entry_addr, (uint8_t *)&adma1, - sizeof(adma1)); + dma_memory_read(s->dma_as, entry_addr, &adma1, sizeof(adma1)); adma1 = le32_to_cpu(adma1); dscr->addr = (hwaddr)(adma1 & 0xFFFFF000); dscr->attr = (uint8_t)extract32(adma1, 0, 7); @@ -726,13 +724,10 @@ static void get_adma_description(SDHCIState *s, ADMADescr *dscr) } break; case SDHC_CTRL_ADMA2_64: - dma_memory_read(s->dma_as, entry_addr, - (uint8_t *)(&dscr->attr), 1); - dma_memory_read(s->dma_as, entry_addr + 2, - (uint8_t *)(&dscr->length), 2); + dma_memory_read(s->dma_as, entry_addr, (&dscr->attr), 1); + dma_memory_read(s->dma_as, entry_addr + 2, (&dscr->length), 2); dscr->length = le16_to_cpu(dscr->length); - dma_memory_read(s->dma_as, entry_addr + 4, - (uint8_t *)(&dscr->addr), 8); + dma_memory_read(s->dma_as, entry_addr + 4, (&dscr->addr), 8); dscr->addr = le64_to_cpu(dscr->addr); dscr->attr &= (uint8_t) ~0xC0; dscr->incr = 12; -- 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 9CE94C11D05 for ; Thu, 20 Feb 2020 13:06:28 +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 6FC7E206ED for ; Thu, 20 Feb 2020 13:06:28 +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="fxc8Ix2y" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6FC7E206ED 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 1j4lWw-00012l-3m; Thu, 20 Feb 2020 13:06:14 +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 1j4lWu-00012J-Rz for xen-devel@lists.xenproject.org; Thu, 20 Feb 2020 13:06:12 +0000 X-Inumbo-ID: c0595f39-53e1-11ea-8526-12813bfff9fa Received: from us-smtp-delivery-1.mimecast.com (unknown [207.211.31.81]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id c0595f39-53e1-11ea-8526-12813bfff9fa; Thu, 20 Feb 2020 13:06:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582203964; 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=2dyL776lIMWtwu3QHoE9WDBeqqqUYswvxKzWPwHYPB4=; b=fxc8Ix2yXMGPFKj5KjtSgDAdUCw/3m+VZUng5610eXwCeRzNvov/pin0edM6+0tVHpiTfH p/a3KJfsD0c/chEfkJ08y23kD41y8/LleNW2lbfGtbQwFjNQ94rbpIq64ZjW5XcYYC6TXz akfgPla3Lh1VRhB+SxpCKiXZbUL3FOg= 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-111-vYZgtVnnOtyIUzdwFdrP5w-1; Thu, 20 Feb 2020 08:06:02 -0500 X-MC-Unique: vYZgtVnnOtyIUzdwFdrP5w-1 Received: by mail-wr1-f70.google.com with SMTP id a12so1702573wrn.19 for ; Thu, 20 Feb 2020 05:06:02 -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=JJNOlxhz3YaDnBzT0LwFaaq/SOy/0tsQ/KrZZBdtHoE=; b=UEST+I5eptFkQcdqxO9QDZSEqmszz+Eemye416m1NPmoAzQfegr3CD/m8VuYvQuV2I ZRCysh3MUUzoPcq4pN5buvmGkDKLIAHj3uuf7rQ+jmmRlg1sjZPef9TgNOhWZDcX5RLR Z5y4f5wvQDklyy10U7pF3iZF0NXR9kN/LaBsFWNuRMPO12gtqA8hma2j+Tz8JeGB+x7i kGfOlM+m3xaYzYkQp6TpjGM95C+PNg4+F1/qoPCMZ+f/JSnCsx65B+levRh7CxqHZT5a yFTmqygQvxPQIN4LrooKL7Mu1kTx7rKjIHEmW8EbLI6I/B3TTWMjspJketBr1bA3oiCx c5+A== X-Gm-Message-State: APjAAAXvFKsCPGEMfHHzRVRXfAtBV2tt/BUVFIIg0U9aHuurYmFWxgLN 8yH34vSFUtEeR7vdIDHlNZsK49SHMj/knC+iFjTBiGOqG4PBG6LCmoo0hkhnGD4aaX5VSeWr3j3 OW6zysEgFUViIka55O1PmjfcCYOM= X-Received: by 2002:a7b:c1d0:: with SMTP id a16mr4485859wmj.175.1582203961579; Thu, 20 Feb 2020 05:06:01 -0800 (PST) X-Google-Smtp-Source: APXvYqz8KNQ719hweoepCwU/16r5sB1wpPqBKHDZc0xAJklXBupLNm7eWc89eDGk1e864X9IS4bitQ== X-Received: by 2002:a7b:c1d0:: with SMTP id a16mr4485824wmj.175.1582203961311; Thu, 20 Feb 2020 05:06:01 -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.05.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:00 -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:30 +0100 Message-Id: <20200220130548.29974-3-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200220130548.29974-1-philmd@redhat.com> References: <20200220130548.29974-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [Xen-devel] [PATCH v3 02/20] hw: Remove unnecessary cast when calling dma_memory_read() 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" U2luY2UgaXRzIGludHJvZHVjdGlvbiBpbiBjb21taXQgZDg2YTc3ZjhhYmIsIGRtYV9tZW1vcnlf cmVhZCgpCmFsd2F5cyBhY2NlcHRlZCB2b2lkIHBvaW50ZXIgYXJndW1lbnQuIFJlbW92ZSB0aGUg dW5uZWNlc3NhcnkKY2FzdHMuCgpUaGlzIGNvbW1pdCB3YXMgcHJvZHVjZWQgd2l0aCB0aGUgaW5j bHVkZWQgQ29jY2luZWxsZSBzY3JpcHQKc2NyaXB0cy9jb2NjaW5lbGxlL2V4ZWNfcndfY29uc3Qu CgpTaWduZWQtb2ZmLWJ5OiBQaGlsaXBwZSBNYXRoaWV1LURhdWTDqSA8cGhpbG1kQHJlZGhhdC5j b20+Ci0tLQogc2NyaXB0cy9jb2NjaW5lbGxlL2V4ZWNfcndfY29uc3QuY29jY2kgfCAxNSArKysr KysrKysrKysrKysKIGh3L2FybS9zbW11LWNvbW1vbi5jICAgICAgICAgICAgICAgICAgIHwgIDMg Ky0tCiBody9hcm0vc21tdXYzLmMgICAgICAgICAgICAgICAgICAgICAgICB8IDEwICsrKystLS0t LS0KIGh3L3NkL3NkaGNpLmMgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMTUgKysrKystLS0t LS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygt KQogY3JlYXRlIG1vZGUgMTAwNjQ0IHNjcmlwdHMvY29jY2luZWxsZS9leGVjX3J3X2NvbnN0LmNv Y2NpCgpkaWZmIC0tZ2l0IGEvc2NyaXB0cy9jb2NjaW5lbGxlL2V4ZWNfcndfY29uc3QuY29jY2kg Yi9zY3JpcHRzL2NvY2NpbmVsbGUvZXhlY19yd19jb25zdC5jb2NjaQpuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwLi5hMDA1NGYwMDlkCi0tLSAvZGV2L251bGwKKysrIGIvc2Ny aXB0cy9jb2NjaW5lbGxlL2V4ZWNfcndfY29uc3QuY29jY2kKQEAgLTAsMCArMSwxNSBAQAorLy8g VXNhZ2U6CisvLyAgc3BhdGNoIC0tc3AtZmlsZSBzY3JpcHRzL2NvY2NpbmVsbGUvZXhlY19yd19j b25zdC5jb2NjaSAtLWRpciAuIC0taW4tcGxhY2UKKworLy8gUmVtb3ZlIHVzZWxlc3MgY2FzdAor QEAKK2V4cHJlc3Npb24gRTEsIEUyLCBFMywgRTQ7Cit0eXBlIFQ7CitAQAorKAorLSBkbWFfbWVt b3J5X3JlYWQoRTEsIEUyLCAoVCAqKUUzLCBFNCkKKysgZG1hX21lbW9yeV9yZWFkKEUxLCBFMiwg RTMsIEU0KQorfAorLSBkbWFfbWVtb3J5X3dyaXRlKEUxLCBFMiwgKFQgKilFMywgRTQpCisrIGRt YV9tZW1vcnlfd3JpdGUoRTEsIEUyLCBFMywgRTQpCispCmRpZmYgLS1naXQgYS9ody9hcm0vc21t dS1jb21tb24uYyBiL2h3L2FybS9zbW11LWNvbW1vbi5jCmluZGV4IDIzZWIxMTcwNDEuLjBmMjU3 M2YwMDQgMTAwNjQ0Ci0tLSBhL2h3L2FybS9zbW11LWNvbW1vbi5jCisrKyBiL2h3L2FybS9zbW11 LWNvbW1vbi5jCkBAIC03NCw4ICs3NCw3IEBAIHN0YXRpYyBpbnQgZ2V0X3B0ZShkbWFfYWRkcl90 IGJhc2VhZGRyLCB1aW50MzJfdCBpbmRleCwgdWludDY0X3QgKnB0ZSwKICAgICBkbWFfYWRkcl90 IGFkZHIgPSBiYXNlYWRkciArIGluZGV4ICogc2l6ZW9mKCpwdGUpOwogCiAgICAgLyogVE9ETzog Z3VhcmFudGVlIDY0LWJpdCBzaW5nbGUtY29weSBhdG9taWNpdHkgKi8KLSAgICByZXQgPSBkbWFf bWVtb3J5X3JlYWQoJmFkZHJlc3Nfc3BhY2VfbWVtb3J5LCBhZGRyLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAodWludDhfdCAqKXB0ZSwgc2l6ZW9mKCpwdGUpKTsKKyAgICByZXQgPSBkbWFf bWVtb3J5X3JlYWQoJmFkZHJlc3Nfc3BhY2VfbWVtb3J5LCBhZGRyLCBwdGUsIHNpemVvZigqcHRl KSk7CiAKICAgICBpZiAocmV0ICE9IE1FTVRYX09LKSB7CiAgICAgICAgIGluZm8tPnR5cGUgPSBT TU1VX1BUV19FUlJfV0FMS19FQUJUOwpkaWZmIC0tZ2l0IGEvaHcvYXJtL3NtbXV2My5jIGIvaHcv YXJtL3NtbXV2My5jCmluZGV4IDhiNWYxNTdkYzcuLjU3YTc5ZGY1NWIgMTAwNjQ0Ci0tLSBhL2h3 L2FybS9zbW11djMuYworKysgYi9ody9hcm0vc21tdXYzLmMKQEAgLTI3OSw4ICsyNzksNyBAQCBz dGF0aWMgaW50IHNtbXVfZ2V0X3N0ZShTTU1VdjNTdGF0ZSAqcywgZG1hX2FkZHJfdCBhZGRyLCBT VEUgKmJ1ZiwKIAogICAgIHRyYWNlX3NtbXV2M19nZXRfc3RlKGFkZHIpOwogICAgIC8qIFRPRE86 IGd1YXJhbnRlZSA2NC1iaXQgc2luZ2xlLWNvcHkgYXRvbWljaXR5ICovCi0gICAgcmV0ID0gZG1h X21lbW9yeV9yZWFkKCZhZGRyZXNzX3NwYWNlX21lbW9yeSwgYWRkciwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgKHZvaWQgKilidWYsIHNpemVvZigqYnVmKSk7CisgICAgcmV0ID0gZG1hX21l bW9yeV9yZWFkKCZhZGRyZXNzX3NwYWNlX21lbW9yeSwgYWRkciwgYnVmLCBzaXplb2YoKmJ1Zikp OwogICAgIGlmIChyZXQgIT0gTUVNVFhfT0spIHsKICAgICAgICAgcWVtdV9sb2dfbWFzayhMT0df R1VFU1RfRVJST1IsCiAgICAgICAgICAgICAgICAgICAgICAgIkNhbm5vdCBmZXRjaCBwdGUgYXQg YWRkcmVzcz0weCUiUFJJeDY0IlxuIiwgYWRkcik7CkBAIC0zMDEsOCArMzAwLDcgQEAgc3RhdGlj IGludCBzbW11X2dldF9jZChTTU1VdjNTdGF0ZSAqcywgU1RFICpzdGUsIHVpbnQzMl90IHNzaWQs CiAKICAgICB0cmFjZV9zbW11djNfZ2V0X2NkKGFkZHIpOwogICAgIC8qIFRPRE86IGd1YXJhbnRl ZSA2NC1iaXQgc2luZ2xlLWNvcHkgYXRvbWljaXR5ICovCi0gICAgcmV0ID0gZG1hX21lbW9yeV9y ZWFkKCZhZGRyZXNzX3NwYWNlX21lbW9yeSwgYWRkciwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICh2b2lkICopYnVmLCBzaXplb2YoKmJ1ZikpOworICAgIHJldCA9IGRtYV9tZW1vcnlfcmVh ZCgmYWRkcmVzc19zcGFjZV9tZW1vcnksIGFkZHIsIGJ1Ziwgc2l6ZW9mKCpidWYpKTsKICAgICBp ZiAocmV0ICE9IE1FTVRYX09LKSB7CiAgICAgICAgIHFlbXVfbG9nX21hc2soTE9HX0dVRVNUX0VS Uk9SLAogICAgICAgICAgICAgICAgICAgICAgICJDYW5ub3QgZmV0Y2ggcHRlIGF0IGFkZHJlc3M9 MHglIlBSSXg2NCJcbiIsIGFkZHIpOwpAQCAtNDA2LDggKzQwNCw4IEBAIHN0YXRpYyBpbnQgc21t dV9maW5kX3N0ZShTTU1VdjNTdGF0ZSAqcywgdWludDMyX3Qgc2lkLCBTVEUgKnN0ZSwKICAgICAg ICAgbDJfc3RlX29mZnNldCA9IHNpZCAmICgoMSA8PCBzLT5zaWRfc3BsaXQpIC0gMSk7CiAgICAg ICAgIGwxcHRyID0gKGRtYV9hZGRyX3QpKHN0cnRhYl9iYXNlICsgbDFfc3RlX29mZnNldCAqIHNp emVvZihsMXN0ZCkpOwogICAgICAgICAvKiBUT0RPOiBndWFyYW50ZWUgNjQtYml0IHNpbmdsZS1j b3B5IGF0b21pY2l0eSAqLwotICAgICAgICByZXQgPSBkbWFfbWVtb3J5X3JlYWQoJmFkZHJlc3Nf c3BhY2VfbWVtb3J5LCBsMXB0ciwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICh1aW50 OF90ICopJmwxc3RkLCBzaXplb2YobDFzdGQpKTsKKyAgICAgICAgcmV0ID0gZG1hX21lbW9yeV9y ZWFkKCZhZGRyZXNzX3NwYWNlX21lbW9yeSwgbDFwdHIsICZsMXN0ZCwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHNpemVvZihsMXN0ZCkpOwogICAgICAgICBpZiAocmV0ICE9IE1FTVRY X09LKSB7CiAgICAgICAgICAgICBxZW11X2xvZ19tYXNrKExPR19HVUVTVF9FUlJPUiwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCByZWFkIEwxUFRSIGF0IDBYJSJQUkl4NjQi XG4iLCBsMXB0cik7CmRpZmYgLS1naXQgYS9ody9zZC9zZGhjaS5jIGIvaHcvc2Qvc2RoY2kuYwpp bmRleCA2OWRjM2U2YjkwLi5kNWFiZGFhZDQxIDEwMDY0NAotLS0gYS9ody9zZC9zZGhjaS5jCisr KyBiL2h3L3NkL3NkaGNpLmMKQEAgLTcwMSw4ICs3MDEsNyBAQCBzdGF0aWMgdm9pZCBnZXRfYWRt YV9kZXNjcmlwdGlvbihTREhDSVN0YXRlICpzLCBBRE1BRGVzY3IgKmRzY3IpCiAgICAgaHdhZGRy IGVudHJ5X2FkZHIgPSAoaHdhZGRyKXMtPmFkbWFzeXNhZGRyOwogICAgIHN3aXRjaCAoU0RIQ19E TUFfVFlQRShzLT5ob3N0Y3RsMSkpIHsKICAgICBjYXNlIFNESENfQ1RSTF9BRE1BMl8zMjoKLSAg ICAgICAgZG1hX21lbW9yeV9yZWFkKHMtPmRtYV9hcywgZW50cnlfYWRkciwgKHVpbnQ4X3QgKikm YWRtYTIsCi0gICAgICAgICAgICAgICAgICAgICAgICBzaXplb2YoYWRtYTIpKTsKKyAgICAgICAg ZG1hX21lbW9yeV9yZWFkKHMtPmRtYV9hcywgZW50cnlfYWRkciwgJmFkbWEyLCBzaXplb2YoYWRt YTIpKTsKICAgICAgICAgYWRtYTIgPSBsZTY0X3RvX2NwdShhZG1hMik7CiAgICAgICAgIC8qIFRo ZSBzcGVjIGRvZXMgbm90IHNwZWNpZnkgZW5kaWFubmVzcyBvZiBkZXNjcmlwdG9yIHRhYmxlLgog ICAgICAgICAgKiBXZSBjdXJyZW50bHkgYXNzdW1lIHRoYXQgaXQgaXMgTEUuCkBAIC03MTMsOCAr NzEyLDcgQEAgc3RhdGljIHZvaWQgZ2V0X2FkbWFfZGVzY3JpcHRpb24oU0RIQ0lTdGF0ZSAqcywg QURNQURlc2NyICpkc2NyKQogICAgICAgICBkc2NyLT5pbmNyID0gODsKICAgICAgICAgYnJlYWs7 CiAgICAgY2FzZSBTREhDX0NUUkxfQURNQTFfMzI6Ci0gICAgICAgIGRtYV9tZW1vcnlfcmVhZChz LT5kbWFfYXMsIGVudHJ5X2FkZHIsICh1aW50OF90ICopJmFkbWExLAotICAgICAgICAgICAgICAg ICAgICAgICAgc2l6ZW9mKGFkbWExKSk7CisgICAgICAgIGRtYV9tZW1vcnlfcmVhZChzLT5kbWFf YXMsIGVudHJ5X2FkZHIsICZhZG1hMSwgc2l6ZW9mKGFkbWExKSk7CiAgICAgICAgIGFkbWExID0g bGUzMl90b19jcHUoYWRtYTEpOwogICAgICAgICBkc2NyLT5hZGRyID0gKGh3YWRkcikoYWRtYTEg JiAweEZGRkZGMDAwKTsKICAgICAgICAgZHNjci0+YXR0ciA9ICh1aW50OF90KWV4dHJhY3QzMihh ZG1hMSwgMCwgNyk7CkBAIC03MjYsMTMgKzcyNCwxMCBAQCBzdGF0aWMgdm9pZCBnZXRfYWRtYV9k ZXNjcmlwdGlvbihTREhDSVN0YXRlICpzLCBBRE1BRGVzY3IgKmRzY3IpCiAgICAgICAgIH0KICAg ICAgICAgYnJlYWs7CiAgICAgY2FzZSBTREhDX0NUUkxfQURNQTJfNjQ6Ci0gICAgICAgIGRtYV9t ZW1vcnlfcmVhZChzLT5kbWFfYXMsIGVudHJ5X2FkZHIsCi0gICAgICAgICAgICAgICAgICAgICAg ICAodWludDhfdCAqKSgmZHNjci0+YXR0ciksIDEpOwotICAgICAgICBkbWFfbWVtb3J5X3JlYWQo cy0+ZG1hX2FzLCBlbnRyeV9hZGRyICsgMiwKLSAgICAgICAgICAgICAgICAgICAgICAgICh1aW50 OF90ICopKCZkc2NyLT5sZW5ndGgpLCAyKTsKKyAgICAgICAgZG1hX21lbW9yeV9yZWFkKHMtPmRt YV9hcywgZW50cnlfYWRkciwgKCZkc2NyLT5hdHRyKSwgMSk7CisgICAgICAgIGRtYV9tZW1vcnlf cmVhZChzLT5kbWFfYXMsIGVudHJ5X2FkZHIgKyAyLCAoJmRzY3ItPmxlbmd0aCksIDIpOwogICAg ICAgICBkc2NyLT5sZW5ndGggPSBsZTE2X3RvX2NwdShkc2NyLT5sZW5ndGgpOwotICAgICAgICBk bWFfbWVtb3J5X3JlYWQocy0+ZG1hX2FzLCBlbnRyeV9hZGRyICsgNCwKLSAgICAgICAgICAgICAg ICAgICAgICAgICh1aW50OF90ICopKCZkc2NyLT5hZGRyKSwgOCk7CisgICAgICAgIGRtYV9tZW1v cnlfcmVhZChzLT5kbWFfYXMsIGVudHJ5X2FkZHIgKyA0LCAoJmRzY3ItPmFkZHIpLCA4KTsKICAg ICAgICAgZHNjci0+YWRkciA9IGxlNjRfdG9fY3B1KGRzY3ItPmFkZHIpOwogICAgICAgICBkc2Ny LT5hdHRyICY9ICh1aW50OF90KSB+MHhDMDsKICAgICAgICAgZHNjci0+aW5jciA9IDEyOwotLSAK Mi4yMS4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K WGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0 cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA== 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 C617EC11D04 for ; Thu, 20 Feb 2020 13:08:32 +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 91809206ED for ; Thu, 20 Feb 2020 13:08:32 +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="JCvJ16ma" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 91809206ED 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]:41544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4lZ9-0008B6-PF for qemu-devel@archiver.kernel.org; Thu, 20 Feb 2020 08:08:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55647) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4lWu-0004L1-Hj for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4lWs-0004pp-TV for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:12 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:31490 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 1j4lWs-0004ny-P9 for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582203968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2dyL776lIMWtwu3QHoE9WDBeqqqUYswvxKzWPwHYPB4=; b=JCvJ16maPY37AqOfLAfiw+cJdb9rrxvgOiTkH2CWeSdoumPkFJgWVEhhKXCPsQQZurxK5e 90x/aX+AR0+DKFgfcTK+5GAcGLKxNzkQL7fWMo0rKPjUKLvp9XqR2IA1wimsT2gZ3WPaM5 tsqW3Zy96sL9H+8tbBVnn9F074RiVnI= 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-12-KodaD4z6Ove54oQYbyvvxg-1; Thu, 20 Feb 2020 08:06:02 -0500 X-MC-Unique: KodaD4z6Ove54oQYbyvvxg-1 Received: by mail-wr1-f72.google.com with SMTP id o9so1713641wrw.14 for ; Thu, 20 Feb 2020 05:06:02 -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=JJNOlxhz3YaDnBzT0LwFaaq/SOy/0tsQ/KrZZBdtHoE=; b=jhI+Xt+HK5VXjfmPRcm5CWuuiv0UjuycVk5JmRRkWEu1pN76l/FNscUTPPDnJo4hVb HLE8l2qYX3FmPbb7PTApE/1GEpT9Khz8rrdK/dsVVY62xoSjXIQy8mAwLOcLx860yIJB 2+iryi9MEJtXINbrgYCts7Ce3jOXDcDUPGQSzpq7p4JIwzwLdJugv/fbP7ArDyI5+iyN 99LbR6ae2EtDh5LCzEGhjFOZXzGqaF3K5JJBUMwg4LzZ6zyZYnUkxyynmCprpzkEX0c8 yugqmayd8W2zeA8nWdQlsMQk9MoBpFQpbM4GgkMsFueF5iwHVTa32/56JZ4hfnf26FM5 impg== X-Gm-Message-State: APjAAAUJRZWkUZzleKaWZ86uufwUVV4FNC0/3vBXduPnYG3kZy4Wuf3x zDFWk7cVwoxG6j13HWV29W1t18myFRPlwD/07yFtHYXl1mvVr+JiR48S2LV4oI0vL4cQBGz5Ggk KTQ89v41IDEyYsh8= X-Received: by 2002:a7b:c1d0:: with SMTP id a16mr4485845wmj.175.1582203961576; Thu, 20 Feb 2020 05:06:01 -0800 (PST) X-Google-Smtp-Source: APXvYqz8KNQ719hweoepCwU/16r5sB1wpPqBKHDZc0xAJklXBupLNm7eWc89eDGk1e864X9IS4bitQ== X-Received: by 2002:a7b:c1d0:: with SMTP id a16mr4485824wmj.175.1582203961311; Thu, 20 Feb 2020 05:06:01 -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.05.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:00 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Subject: [PATCH v3 02/20] hw: Remove unnecessary cast when calling dma_memory_read() Date: Thu, 20 Feb 2020 14:05:30 +0100 Message-Id: <20200220130548.29974-3-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200220130548.29974-1-philmd@redhat.com> References: <20200220130548.29974-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Dmitry Fleytman , kvm@vger.kernel.org, "Michael S. Tsirkin" , Jason Wang , Gerd Hoffmann , "Edgar E. Iglesias" , Stefano Stabellini , Matthew Rosato , qemu-block@nongnu.org, David Hildenbrand , Halil Pasic , Christian Borntraeger , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , Thomas Huth , Eduardo Habkost , Stefan Weil , Alistair Francis , Richard Henderson , Paul Durrant , Eric Auger , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , David Gibson , Igor Mitsyanko , Cornelia Huck , Michael Walle , qemu-ppc@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Since its introduction in commit d86a77f8abb, dma_memory_read() always accepted void pointer argument. Remove the unnecessary casts. This commit was produced with the included Coccinelle script scripts/coccinelle/exec_rw_const. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- scripts/coccinelle/exec_rw_const.cocci | 15 +++++++++++++++ hw/arm/smmu-common.c | 3 +-- hw/arm/smmuv3.c | 10 ++++------ hw/sd/sdhci.c | 15 +++++---------- 4 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 scripts/coccinelle/exec_rw_const.cocci diff --git a/scripts/coccinelle/exec_rw_const.cocci b/scripts/coccinelle/ex= ec_rw_const.cocci new file mode 100644 index 0000000000..a0054f009d --- /dev/null +++ b/scripts/coccinelle/exec_rw_const.cocci @@ -0,0 +1,15 @@ +// Usage: +// spatch --sp-file scripts/coccinelle/exec_rw_const.cocci --dir . --in-p= lace + +// Remove useless cast +@@ +expression E1, E2, E3, E4; +type T; +@@ +( +- dma_memory_read(E1, E2, (T *)E3, E4) ++ dma_memory_read(E1, E2, E3, E4) +| +- dma_memory_write(E1, E2, (T *)E3, E4) ++ dma_memory_write(E1, E2, E3, E4) +) diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index 23eb117041..0f2573f004 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -74,8 +74,7 @@ static int get_pte(dma_addr_t baseaddr, uint32_t index, u= int64_t *pte, dma_addr_t addr =3D baseaddr + index * sizeof(*pte); =20 /* TODO: guarantee 64-bit single-copy atomicity */ - ret =3D dma_memory_read(&address_space_memory, addr, - (uint8_t *)pte, sizeof(*pte)); + ret =3D dma_memory_read(&address_space_memory, addr, pte, sizeof(*pte)= ); =20 if (ret !=3D MEMTX_OK) { info->type =3D SMMU_PTW_ERR_WALK_EABT; diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 8b5f157dc7..57a79df55b 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -279,8 +279,7 @@ static int smmu_get_ste(SMMUv3State *s, dma_addr_t addr= , STE *buf, =20 trace_smmuv3_get_ste(addr); /* TODO: guarantee 64-bit single-copy atomicity */ - ret =3D dma_memory_read(&address_space_memory, addr, - (void *)buf, sizeof(*buf)); + ret =3D dma_memory_read(&address_space_memory, addr, buf, sizeof(*buf)= ); if (ret !=3D MEMTX_OK) { qemu_log_mask(LOG_GUEST_ERROR, "Cannot fetch pte at address=3D0x%"PRIx64"\n", addr)= ; @@ -301,8 +300,7 @@ static int smmu_get_cd(SMMUv3State *s, STE *ste, uint32= _t ssid, =20 trace_smmuv3_get_cd(addr); /* TODO: guarantee 64-bit single-copy atomicity */ - ret =3D dma_memory_read(&address_space_memory, addr, - (void *)buf, sizeof(*buf)); + ret =3D dma_memory_read(&address_space_memory, addr, buf, sizeof(*buf)= ); if (ret !=3D MEMTX_OK) { qemu_log_mask(LOG_GUEST_ERROR, "Cannot fetch pte at address=3D0x%"PRIx64"\n", addr)= ; @@ -406,8 +404,8 @@ static int smmu_find_ste(SMMUv3State *s, uint32_t sid, = STE *ste, l2_ste_offset =3D sid & ((1 << s->sid_split) - 1); l1ptr =3D (dma_addr_t)(strtab_base + l1_ste_offset * sizeof(l1std)= ); /* TODO: guarantee 64-bit single-copy atomicity */ - ret =3D dma_memory_read(&address_space_memory, l1ptr, - (uint8_t *)&l1std, sizeof(l1std)); + ret =3D dma_memory_read(&address_space_memory, l1ptr, &l1std, + sizeof(l1std)); if (ret !=3D MEMTX_OK) { qemu_log_mask(LOG_GUEST_ERROR, "Could not read L1PTR at 0X%"PRIx64"\n", l1ptr); diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 69dc3e6b90..d5abdaad41 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -701,8 +701,7 @@ static void get_adma_description(SDHCIState *s, ADMADes= cr *dscr) hwaddr entry_addr =3D (hwaddr)s->admasysaddr; switch (SDHC_DMA_TYPE(s->hostctl1)) { case SDHC_CTRL_ADMA2_32: - dma_memory_read(s->dma_as, entry_addr, (uint8_t *)&adma2, - sizeof(adma2)); + dma_memory_read(s->dma_as, entry_addr, &adma2, sizeof(adma2)); adma2 =3D le64_to_cpu(adma2); /* The spec does not specify endianness of descriptor table. * We currently assume that it is LE. @@ -713,8 +712,7 @@ static void get_adma_description(SDHCIState *s, ADMADes= cr *dscr) dscr->incr =3D 8; break; case SDHC_CTRL_ADMA1_32: - dma_memory_read(s->dma_as, entry_addr, (uint8_t *)&adma1, - sizeof(adma1)); + dma_memory_read(s->dma_as, entry_addr, &adma1, sizeof(adma1)); adma1 =3D le32_to_cpu(adma1); dscr->addr =3D (hwaddr)(adma1 & 0xFFFFF000); dscr->attr =3D (uint8_t)extract32(adma1, 0, 7); @@ -726,13 +724,10 @@ static void get_adma_description(SDHCIState *s, ADMAD= escr *dscr) } break; case SDHC_CTRL_ADMA2_64: - dma_memory_read(s->dma_as, entry_addr, - (uint8_t *)(&dscr->attr), 1); - dma_memory_read(s->dma_as, entry_addr + 2, - (uint8_t *)(&dscr->length), 2); + dma_memory_read(s->dma_as, entry_addr, (&dscr->attr), 1); + dma_memory_read(s->dma_as, entry_addr + 2, (&dscr->length), 2); dscr->length =3D le16_to_cpu(dscr->length); - dma_memory_read(s->dma_as, entry_addr + 4, - (uint8_t *)(&dscr->addr), 8); + dma_memory_read(s->dma_as, entry_addr + 4, (&dscr->addr), 8); dscr->addr =3D le64_to_cpu(dscr->addr); dscr->attr &=3D (uint8_t) ~0xC0; dscr->incr =3D 12; --=20 2.21.1