From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:cb43:0:0:0:0:0 with SMTP id b64csp543759lfg; Thu, 20 Feb 2020 05:06:44 -0800 (PST) X-Google-Smtp-Source: APXvYqwthr54BycgKSD9sCOCRQ8ICasu1fFzIRLD23Pk2k8bk6Kk+8yBq7/nwMmtpBxlLrKOS7+T X-Received: by 2002:aca:dc8b:: with SMTP id t133mr1921494oig.98.1582204004734; Thu, 20 Feb 2020 05:06:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582204004; cv=none; d=google.com; s=arc-20160816; b=akvf5k7IbhkQu1YIWif0WDIpwoqvHU/qAGCwa3soRJjByKK5M8AIBwP38r2VIFfwTa o/o1rDJquFhIUxJ5t+NZrsnDQAU3HcOmlRYm11zFcfpGRbt+M4qqvLp0hQOvY81rVVk/ xms5p48ZluGCUe0FK9eYiM2zbgNBQog5RRHnh1nwypDlt2CaCz1uQDqACe7q+roHqfM3 UxZFzdFMI78zEoNJWgQCNICIOvyrjAkdBkG/NhhJ8GUez3KDsfOXRMJBQp99SIGtM1sT j9bj4px2S3PaGgxi6h6qrm7nDMjUD3JcydRrk1PuB/yFXEiH48m0qoavqqHSCe7gHxcm QECw== 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=afmBLGH/B/Ms0UWZ94UmoIT7hbpf9let5QJOgK6MO7U=; b=DAJ1WToZxsqfApfRTVIrUXAIMtiVoKlNa7KBfJ2vhitbeKzZOuboo5tvSIf39DVZTs XHykGOBy2kHp1Do6VgwCFrpdVkmjEdqj2BErYuelnynTzdeoYEYg+WBNJ70wPwAxrGGJ rNm1zjEw+0lnHmofIvEKdoL4jtEcLm7fTUm5DAT0GgEBu37CNn+6EHi+5Y2lSR3tVN0r eWAW/CJSek4TZbu8VUjuJ99EfGZtknVkVUaBq1x8eK6pnf3z2p8H2R/ilSaLCY7uC5jE QL+MdE58BngHCts5xU4Vdf9RDHoTFxvDdMSjr3gZbJh2KHwi093viS+9Eb/6ffo5sI4k RRAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Yg7aTLmh; 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.44; Thu, 20 Feb 2020 05:06:44 -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=Yg7aTLmh; 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 S1728199AbgBTNGn (ORCPT + 5 others); Thu, 20 Feb 2020 08:06:43 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:25997 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728183AbgBTNGn (ORCPT ); Thu, 20 Feb 2020 08:06:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582204001; 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=afmBLGH/B/Ms0UWZ94UmoIT7hbpf9let5QJOgK6MO7U=; b=Yg7aTLmh5YEeYhixivAegQA52T19jAXtnRscDvq7xxLfkZcqRGj4W7Z039pRcuHsp7DlnL 1euyAIFQ8PouAS/gHL6MVoxHY75Py9M3/qmTQmX3pcTr14mrsmubURmwqoD70ASeBCBlfH W0v6qD/NuVdUNIOZhifDqrRnBiPthjE= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-116-XK0m2gWDNyqxXoUKhRgZtQ-1; Thu, 20 Feb 2020 08:06:40 -0500 X-MC-Unique: XK0m2gWDNyqxXoUKhRgZtQ-1 Received: by mail-wr1-f69.google.com with SMTP id r1so1700327wrc.15 for ; Thu, 20 Feb 2020 05:06:40 -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=afmBLGH/B/Ms0UWZ94UmoIT7hbpf9let5QJOgK6MO7U=; b=e4gn/+0nnZ0HJ0VcnO3jbsLcT9GJ6hMsZoI5QNNAUeDSCpI0kZ8vBEgcCpa1l6GL1v EbQA67N13XtBSYlgVNwqMZM0oe2jjJNauTmpMdK0RZ35UGkCYJGLSn6AtsZ0KkYK5hRc itqxnnP042FEuTNEWibbn2bF1AjJ/cLkcqqBv2dGY8ZdIvYZ4TOdSeGQ2i7wfW+rO22n vu9uefnLY0QJHMwzeJvZz72kn5Yrx3HuO8uDFJFdzOcddxYPSS55gdgG2Mu8k2+haCp/ GowofxYo85Ow+xZnBy/EXjuPb9lZd43dHxUKxSwZ1zst2JpNdnY61xXJWYCzqIiq62kL ElxQ== X-Gm-Message-State: APjAAAVCunoqvWMihZ/9Bvw5frpQBxZ5Dw9gaW96dn6Os5z69kdMJX0h Z4JeYnaArHMr1urpTRS2i6cVigHkRcN/7G/n3yAtAs/4blSLdjetCPpslzWGZTOTULtdZ5frOtw 3QKWi3aG/QHM2 X-Received: by 2002:adf:82ce:: with SMTP id 72mr42311835wrc.14.1582203999000; Thu, 20 Feb 2020 05:06:39 -0800 (PST) X-Received: by 2002:adf:82ce:: with SMTP id 72mr42311818wrc.14.1582203998804; Thu, 20 Feb 2020 05:06:38 -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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:38 -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 12/20] hw/ide: Let the DMAIntFunc prototype use a boolean 'is_write' argument Date: Thu, 20 Feb 2020 14:05:40 +0100 Message-Id: <20200220130548.29974-13-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: ZS5xX7qwEaUV The 'is_write' argument is either 0 or 1. Convert it to a boolean type. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/ide/internal.h | 2 +- hw/dma/rc4030.c | 6 +++--- hw/ide/ahci.c | 2 +- hw/ide/core.c | 2 +- hw/ide/macio.c | 2 +- hw/ide/pci.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h index ce766ac485..1bc1fc73e5 100644 --- a/include/hw/ide/internal.h +++ b/include/hw/ide/internal.h @@ -322,7 +322,7 @@ typedef void EndTransferFunc(IDEState *); typedef void DMAStartFunc(IDEDMA *, IDEState *, BlockCompletionFunc *); typedef void DMAVoidFunc(IDEDMA *); -typedef int DMAIntFunc(IDEDMA *, int); +typedef int DMAIntFunc(IDEDMA *, bool); typedef int32_t DMAInt32Func(IDEDMA *, int32_t len); typedef void DMAu32Func(IDEDMA *, uint32_t); typedef void DMAStopFunc(IDEDMA *, bool); diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c index ca0becd756..21e2c360ac 100644 --- a/hw/dma/rc4030.c +++ b/hw/dma/rc4030.c @@ -590,7 +590,7 @@ static const VMStateDescription vmstate_rc4030 = { }; static void rc4030_do_dma(void *opaque, int n, uint8_t *buf, - int len, int is_write) + int len, bool is_write) { rc4030State *s = opaque; hwaddr dma_addr; @@ -630,13 +630,13 @@ struct rc4030DMAState { void rc4030_dma_read(void *dma, uint8_t *buf, int len) { rc4030_dma s = dma; - rc4030_do_dma(s->opaque, s->n, buf, len, 0); + rc4030_do_dma(s->opaque, s->n, buf, len, false); } void rc4030_dma_write(void *dma, uint8_t *buf, int len) { rc4030_dma s = dma; - rc4030_do_dma(s->opaque, s->n, buf, len, 1); + rc4030_do_dma(s->opaque, s->n, buf, len, true); } static rc4030_dma *rc4030_allocate_dmas(void *opaque, int n) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 68264a22e8..13d91e109a 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1461,7 +1461,7 @@ static void ahci_commit_buf(IDEDMA *dma, uint32_t tx_bytes) ad->cur_cmd->status = cpu_to_le32(tx_bytes); } -static int ahci_dma_rw_buf(IDEDMA *dma, int is_write) +static int ahci_dma_rw_buf(IDEDMA *dma, bool is_write) { AHCIDevice *ad = DO_UPCAST(AHCIDevice, dma, dma); IDEState *s = &ad->port.ifs[0]; diff --git a/hw/ide/core.c b/hw/ide/core.c index 80000eb766..689bb36409 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2570,7 +2570,7 @@ static void ide_init1(IDEBus *bus, int unit) ide_sector_write_timer_cb, s); } -static int ide_nop_int(IDEDMA *dma, int x) +static int ide_nop_int(IDEDMA *dma, bool is_write) { return 0; } diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 7a8470e921..a9f25e5d02 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -376,7 +376,7 @@ static void macio_ide_reset(DeviceState *dev) ide_bus_reset(&d->bus); } -static int ide_nop_int(IDEDMA *dma, int x) +static int ide_nop_int(IDEDMA *dma, bool is_write) { return 0; } diff --git a/hw/ide/pci.c b/hw/ide/pci.c index cce1da804d..1a6a287e76 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -181,7 +181,7 @@ static int32_t bmdma_prepare_buf(IDEDMA *dma, int32_t limit) } /* return 0 if buffer completed */ -static int bmdma_rw_buf(IDEDMA *dma, int is_write) +static int bmdma_rw_buf(IDEDMA *dma, bool is_write) { BMDMAState *bm = DO_UPCAST(BMDMAState, dma, dma); IDEState *s = bmdma_active_if(bm); -- 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 0A73FC11D07 for ; Thu, 20 Feb 2020 13:06:55 +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 D02A3208C4 for ; Thu, 20 Feb 2020 13:06:54 +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="VvTkBGI9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D02A3208C4 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 1j4lXQ-0001T1-AM; Thu, 20 Feb 2020 13:06:44 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j4lXO-0001RZ-Ta for xen-devel@lists.xenproject.org; Thu, 20 Feb 2020 13:06:42 +0000 X-Inumbo-ID: d6be2ca4-53e1-11ea-bc8e-bc764e2007e4 Received: from us-smtp-1.mimecast.com (unknown [205.139.110.120]) by us1-rack-iad1.inumbo.com (Halon) with ESMTP id d6be2ca4-53e1-11ea-bc8e-bc764e2007e4; Thu, 20 Feb 2020 13:06:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582204002; 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=+QWKOueI8xj2IyxqHiN0HDA2FYFFiq+hf4rVm2QXvB4=; b=VvTkBGI9MFwt+yQNtKJ+kXhLb06Wmk5A+xl98vSTZkqz88z39Df9I+fIPXpJpxkxrv/Uqt dOY58/uHbJH3sLLcZ6htSd2zUwoKu3YlDdzMlaHFBNQDOZBwQ1keHQE8orTh/XSmqdDyKM mpSaUytEm+gmsO0JXd7bbyL4xLVBhW8= 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-116-x-FizCD8PyqLhXnHx2PpIA-1; Thu, 20 Feb 2020 08:06:40 -0500 X-MC-Unique: x-FizCD8PyqLhXnHx2PpIA-1 Received: by mail-wr1-f70.google.com with SMTP id p8so1714031wrw.5 for ; Thu, 20 Feb 2020 05:06:40 -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=afmBLGH/B/Ms0UWZ94UmoIT7hbpf9let5QJOgK6MO7U=; b=SMGsdSrrFXXvpy7QVdfCUpk4RGowSdVsajFzaFNeRGVH9m7/TtFbfnHoljhcO2Huao dtrblDC/HTbJ8n/zuZmGCutdDNPk/az94BK11JW4p56Yj77AGOuMu8caha9vdWzrWg3O vZ2WHwhDDhhnWr6qo6jM5/YJxYV1fKbS56fpcz9n4CKAELQZ2iCJxx3glRGGl2yM1ifN 0h0DgFkldQbsNfQVLLJM859eeUNRJxO1kuo5eSb1QKovD+owYX5uybuuAf/mbUo4Hcfb tEMyqLkOiMxR7NuxbnF7sUvd8lkjQwDZNqk3GGSjx87HCPuypa2PSUZImE9eULgJIPD0 JmOg== X-Gm-Message-State: APjAAAXCs9gZpNha/4pB8lEncSei96a7cswJJnTD9Wxr2Abri/gUdPu3 WT3I791mJ7ObFSzKYIaEEgdRVSQ2pVbIuQQ9QgC8DpON7xYEyZJf4qFEsva9J5qKGL6U8wNDOfR 9yUemosA1QDY0e4f4UJKNXs6L304= X-Received: by 2002:adf:82ce:: with SMTP id 72mr42311844wrc.14.1582203999001; Thu, 20 Feb 2020 05:06:39 -0800 (PST) X-Google-Smtp-Source: APXvYqw/3uQMphtI1ikMZVT/CqYmBN8hXBmJPGI/dMUcHwpK44vfqMtR6BuBqN22Zj6SP9un5Qj48Q== X-Received: by 2002:adf:82ce:: with SMTP id 72mr42311818wrc.14.1582203998804; Thu, 20 Feb 2020 05:06:38 -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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:38 -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:40 +0100 Message-Id: <20200220130548.29974-13-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 12/20] hw/ide: Let the DMAIntFunc prototype use a boolean 'is_write' argument X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Dmitry Fleytman , kvm@vger.kernel.org, "Michael S. Tsirkin" , Jason Wang , Gerd Hoffmann , "Edgar E. Iglesias" , Stefano Stabellini , Matthew Rosato , qemu-block@nongnu.org, David Hildenbrand , Halil Pasic , Christian Borntraeger , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Marcel Apfelbaum , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , Thomas Huth , Eduardo Habkost , Stefan Weil , Alistair Francis , Richard Henderson , Paul Durrant , Eric Auger , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , David Gibson , Igor Mitsyanko , Cornelia Huck , Michael Walle , qemu-ppc@nongnu.org, Paolo Bonzini Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" VGhlICdpc193cml0ZScgYXJndW1lbnQgaXMgZWl0aGVyIDAgb3IgMS4KQ29udmVydCBpdCB0byBh IGJvb2xlYW4gdHlwZS4KClNpZ25lZC1vZmYtYnk6IFBoaWxpcHBlIE1hdGhpZXUtRGF1ZMOpIDxw aGlsbWRAcmVkaGF0LmNvbT4KLS0tCiBpbmNsdWRlL2h3L2lkZS9pbnRlcm5hbC5oIHwgMiArLQog aHcvZG1hL3JjNDAzMC5jICAgICAgICAgICB8IDYgKysrLS0tCiBody9pZGUvYWhjaS5jICAgICAg ICAgICAgIHwgMiArLQogaHcvaWRlL2NvcmUuYyAgICAgICAgICAgICB8IDIgKy0KIGh3L2lkZS9t YWNpby5jICAgICAgICAgICAgfCAyICstCiBody9pZGUvcGNpLmMgICAgICAgICAgICAgIHwgMiAr LQogNiBmaWxlcyBjaGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvaW5jbHVkZS9ody9pZGUvaW50ZXJuYWwuaCBiL2luY2x1ZGUvaHcvaWRlL2ludGVy bmFsLmgKaW5kZXggY2U3NjZhYzQ4NS4uMWJjMWZjNzNlNSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9o dy9pZGUvaW50ZXJuYWwuaAorKysgYi9pbmNsdWRlL2h3L2lkZS9pbnRlcm5hbC5oCkBAIC0zMjIs NyArMzIyLDcgQEAgdHlwZWRlZiB2b2lkIEVuZFRyYW5zZmVyRnVuYyhJREVTdGF0ZSAqKTsKIAog dHlwZWRlZiB2b2lkIERNQVN0YXJ0RnVuYyhJREVETUEgKiwgSURFU3RhdGUgKiwgQmxvY2tDb21w bGV0aW9uRnVuYyAqKTsKIHR5cGVkZWYgdm9pZCBETUFWb2lkRnVuYyhJREVETUEgKik7Ci10eXBl ZGVmIGludCBETUFJbnRGdW5jKElERURNQSAqLCBpbnQpOwordHlwZWRlZiBpbnQgRE1BSW50RnVu YyhJREVETUEgKiwgYm9vbCk7CiB0eXBlZGVmIGludDMyX3QgRE1BSW50MzJGdW5jKElERURNQSAq LCBpbnQzMl90IGxlbik7CiB0eXBlZGVmIHZvaWQgRE1BdTMyRnVuYyhJREVETUEgKiwgdWludDMy X3QpOwogdHlwZWRlZiB2b2lkIERNQVN0b3BGdW5jKElERURNQSAqLCBib29sKTsKZGlmZiAtLWdp dCBhL2h3L2RtYS9yYzQwMzAuYyBiL2h3L2RtYS9yYzQwMzAuYwppbmRleCBjYTBiZWNkNzU2Li4y MWUyYzM2MGFjIDEwMDY0NAotLS0gYS9ody9kbWEvcmM0MDMwLmMKKysrIGIvaHcvZG1hL3JjNDAz MC5jCkBAIC01OTAsNyArNTkwLDcgQEAgc3RhdGljIGNvbnN0IFZNU3RhdGVEZXNjcmlwdGlvbiB2 bXN0YXRlX3JjNDAzMCA9IHsKIH07CiAKIHN0YXRpYyB2b2lkIHJjNDAzMF9kb19kbWEodm9pZCAq b3BhcXVlLCBpbnQgbiwgdWludDhfdCAqYnVmLAotICAgICAgICAgICAgICAgICAgICAgICAgICBp bnQgbGVuLCBpbnQgaXNfd3JpdGUpCisgICAgICAgICAgICAgICAgICAgICAgICAgIGludCBsZW4s IGJvb2wgaXNfd3JpdGUpCiB7CiAgICAgcmM0MDMwU3RhdGUgKnMgPSBvcGFxdWU7CiAgICAgaHdh ZGRyIGRtYV9hZGRyOwpAQCAtNjMwLDEzICs2MzAsMTMgQEAgc3RydWN0IHJjNDAzMERNQVN0YXRl IHsKIHZvaWQgcmM0MDMwX2RtYV9yZWFkKHZvaWQgKmRtYSwgdWludDhfdCAqYnVmLCBpbnQgbGVu KQogewogICAgIHJjNDAzMF9kbWEgcyA9IGRtYTsKLSAgICByYzQwMzBfZG9fZG1hKHMtPm9wYXF1 ZSwgcy0+biwgYnVmLCBsZW4sIDApOworICAgIHJjNDAzMF9kb19kbWEocy0+b3BhcXVlLCBzLT5u LCBidWYsIGxlbiwgZmFsc2UpOwogfQogCiB2b2lkIHJjNDAzMF9kbWFfd3JpdGUodm9pZCAqZG1h LCB1aW50OF90ICpidWYsIGludCBsZW4pCiB7CiAgICAgcmM0MDMwX2RtYSBzID0gZG1hOwotICAg IHJjNDAzMF9kb19kbWEocy0+b3BhcXVlLCBzLT5uLCBidWYsIGxlbiwgMSk7CisgICAgcmM0MDMw X2RvX2RtYShzLT5vcGFxdWUsIHMtPm4sIGJ1ZiwgbGVuLCB0cnVlKTsKIH0KIAogc3RhdGljIHJj NDAzMF9kbWEgKnJjNDAzMF9hbGxvY2F0ZV9kbWFzKHZvaWQgKm9wYXF1ZSwgaW50IG4pCmRpZmYg LS1naXQgYS9ody9pZGUvYWhjaS5jIGIvaHcvaWRlL2FoY2kuYwppbmRleCA2ODI2NGEyMmU4Li4x M2Q5MWUxMDlhIDEwMDY0NAotLS0gYS9ody9pZGUvYWhjaS5jCisrKyBiL2h3L2lkZS9haGNpLmMK QEAgLTE0NjEsNyArMTQ2MSw3IEBAIHN0YXRpYyB2b2lkIGFoY2lfY29tbWl0X2J1ZihJREVETUEg KmRtYSwgdWludDMyX3QgdHhfYnl0ZXMpCiAgICAgYWQtPmN1cl9jbWQtPnN0YXR1cyA9IGNwdV90 b19sZTMyKHR4X2J5dGVzKTsKIH0KIAotc3RhdGljIGludCBhaGNpX2RtYV9yd19idWYoSURFRE1B ICpkbWEsIGludCBpc193cml0ZSkKK3N0YXRpYyBpbnQgYWhjaV9kbWFfcndfYnVmKElERURNQSAq ZG1hLCBib29sIGlzX3dyaXRlKQogewogICAgIEFIQ0lEZXZpY2UgKmFkID0gRE9fVVBDQVNUKEFI Q0lEZXZpY2UsIGRtYSwgZG1hKTsKICAgICBJREVTdGF0ZSAqcyA9ICZhZC0+cG9ydC5pZnNbMF07 CmRpZmYgLS1naXQgYS9ody9pZGUvY29yZS5jIGIvaHcvaWRlL2NvcmUuYwppbmRleCA4MDAwMGVi NzY2Li42ODliYjM2NDA5IDEwMDY0NAotLS0gYS9ody9pZGUvY29yZS5jCisrKyBiL2h3L2lkZS9j b3JlLmMKQEAgLTI1NzAsNyArMjU3MCw3IEBAIHN0YXRpYyB2b2lkIGlkZV9pbml0MShJREVCdXMg KmJ1cywgaW50IHVuaXQpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgaWRlX3NlY3Rvcl93cml0ZV90aW1lcl9jYiwgcyk7CiB9CiAKLXN0YXRpYyBpbnQgaWRlX25v cF9pbnQoSURFRE1BICpkbWEsIGludCB4KQorc3RhdGljIGludCBpZGVfbm9wX2ludChJREVETUEg KmRtYSwgYm9vbCBpc193cml0ZSkKIHsKICAgICByZXR1cm4gMDsKIH0KZGlmZiAtLWdpdCBhL2h3 L2lkZS9tYWNpby5jIGIvaHcvaWRlL21hY2lvLmMKaW5kZXggN2E4NDcwZTkyMS4uYTlmMjVlNWQw MiAxMDA2NDQKLS0tIGEvaHcvaWRlL21hY2lvLmMKKysrIGIvaHcvaWRlL21hY2lvLmMKQEAgLTM3 Niw3ICszNzYsNyBAQCBzdGF0aWMgdm9pZCBtYWNpb19pZGVfcmVzZXQoRGV2aWNlU3RhdGUgKmRl dikKICAgICBpZGVfYnVzX3Jlc2V0KCZkLT5idXMpOwogfQogCi1zdGF0aWMgaW50IGlkZV9ub3Bf aW50KElERURNQSAqZG1hLCBpbnQgeCkKK3N0YXRpYyBpbnQgaWRlX25vcF9pbnQoSURFRE1BICpk bWEsIGJvb2wgaXNfd3JpdGUpCiB7CiAgICAgcmV0dXJuIDA7CiB9CmRpZmYgLS1naXQgYS9ody9p ZGUvcGNpLmMgYi9ody9pZGUvcGNpLmMKaW5kZXggY2NlMWRhODA0ZC4uMWE2YTI4N2U3NiAxMDA2 NDQKLS0tIGEvaHcvaWRlL3BjaS5jCisrKyBiL2h3L2lkZS9wY2kuYwpAQCAtMTgxLDcgKzE4MSw3 IEBAIHN0YXRpYyBpbnQzMl90IGJtZG1hX3ByZXBhcmVfYnVmKElERURNQSAqZG1hLCBpbnQzMl90 IGxpbWl0KQogfQogCiAvKiByZXR1cm4gMCBpZiBidWZmZXIgY29tcGxldGVkICovCi1zdGF0aWMg aW50IGJtZG1hX3J3X2J1ZihJREVETUEgKmRtYSwgaW50IGlzX3dyaXRlKQorc3RhdGljIGludCBi bWRtYV9yd19idWYoSURFRE1BICpkbWEsIGJvb2wgaXNfd3JpdGUpCiB7CiAgICAgQk1ETUFTdGF0 ZSAqYm0gPSBET19VUENBU1QoQk1ETUFTdGF0ZSwgZG1hLCBkbWEpOwogICAgIElERVN0YXRlICpz ID0gYm1kbWFfYWN0aXZlX2lmKGJtKTsKLS0gCjIuMjEuMQoKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRl dmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFp bG1hbi9saXN0aW5mby94ZW4tZGV2ZWw= 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 026DBC11D05 for ; Thu, 20 Feb 2020 13:11:39 +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 C68E2206ED for ; Thu, 20 Feb 2020 13:11:38 +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="VvTkBGI9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C68E2206ED 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]:41668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4lc9-0006Ol-Uy for qemu-devel@archiver.kernel.org; Thu, 20 Feb 2020 08:11:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56182) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4lXQ-0005in-6K for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4lXO-0005PX-UY for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:44 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:60827 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 1j4lXO-0005P3-Qw for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582204002; 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=+QWKOueI8xj2IyxqHiN0HDA2FYFFiq+hf4rVm2QXvB4=; b=VvTkBGI9MFwt+yQNtKJ+kXhLb06Wmk5A+xl98vSTZkqz88z39Df9I+fIPXpJpxkxrv/Uqt dOY58/uHbJH3sLLcZ6htSd2zUwoKu3YlDdzMlaHFBNQDOZBwQ1keHQE8orTh/XSmqdDyKM mpSaUytEm+gmsO0JXd7bbyL4xLVBhW8= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-181-t6Zt-jZJNg2qFOv7TpU_xw-1; Thu, 20 Feb 2020 08:06:40 -0500 Received: by mail-wr1-f69.google.com with SMTP id m15so1683358wrs.22 for ; Thu, 20 Feb 2020 05:06:39 -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=afmBLGH/B/Ms0UWZ94UmoIT7hbpf9let5QJOgK6MO7U=; b=shfy+K2YVrbWzCacxvtqTdTNbXh+gek6tglRXoskHSzNkUNvKcG8taheBPr/GTvsyv mDDrnI374adYNWyEymwOryCMT3kx7asvtJUaDREobpZO8cNtBaPcjgi+79tLO0xTtQ8e nX8vzcaZVaLoMWAvqAqONkm8pc/lZJw1mbH/YcDUoYw6lDMu8PpVRJSGE8rNQdecmvAB fh4SZM14I3bs9onR7JJSbZn89MarVyNMazZE5ckYxtuydSeBvZec/9HmOwhhm4zgI2qh dTT9b1saqrvOACDCtYVPtoiAEK5HXJ88ukDBdfWszW1dKL2ZAuySBLDI4U464qADSW/u EqKg== X-Gm-Message-State: APjAAAUMoKOha5m5Z5zofTerbm89zMs+eNd/5J/JWTWi1xMK6Kr2erGy YJTaZZufgXeehiwP+HqT4/Gk8vlA5Ch22qG8VQTZzoyD74fP/ycP+vFbk53wau7f3fDCiakrtS0 NPjetU8UvFvpdhWE= X-Received: by 2002:adf:82ce:: with SMTP id 72mr42311856wrc.14.1582203999002; Thu, 20 Feb 2020 05:06:39 -0800 (PST) X-Google-Smtp-Source: APXvYqw/3uQMphtI1ikMZVT/CqYmBN8hXBmJPGI/dMUcHwpK44vfqMtR6BuBqN22Zj6SP9un5Qj48Q== X-Received: by 2002:adf:82ce:: with SMTP id 72mr42311818wrc.14.1582203998804; Thu, 20 Feb 2020 05:06:38 -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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:38 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Subject: [PATCH v3 12/20] hw/ide: Let the DMAIntFunc prototype use a boolean 'is_write' argument Date: Thu, 20 Feb 2020 14:05:40 +0100 Message-Id: <20200220130548.29974-13-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: t6Zt-jZJNg2qFOv7TpU_xw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Dmitry Fleytman , kvm@vger.kernel.org, "Michael S. Tsirkin" , Jason Wang , Gerd Hoffmann , "Edgar E. Iglesias" , Stefano Stabellini , Matthew Rosato , qemu-block@nongnu.org, David Hildenbrand , Halil Pasic , Christian Borntraeger , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , Thomas Huth , Eduardo Habkost , Stefan Weil , Alistair Francis , Richard Henderson , Paul Durrant , Eric Auger , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , David Gibson , Igor Mitsyanko , Cornelia Huck , Michael Walle , qemu-ppc@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The 'is_write' argument is either 0 or 1. Convert it to a boolean type. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/ide/internal.h | 2 +- hw/dma/rc4030.c | 6 +++--- hw/ide/ahci.c | 2 +- hw/ide/core.c | 2 +- hw/ide/macio.c | 2 +- hw/ide/pci.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h index ce766ac485..1bc1fc73e5 100644 --- a/include/hw/ide/internal.h +++ b/include/hw/ide/internal.h @@ -322,7 +322,7 @@ typedef void EndTransferFunc(IDEState *); =20 typedef void DMAStartFunc(IDEDMA *, IDEState *, BlockCompletionFunc *); typedef void DMAVoidFunc(IDEDMA *); -typedef int DMAIntFunc(IDEDMA *, int); +typedef int DMAIntFunc(IDEDMA *, bool); typedef int32_t DMAInt32Func(IDEDMA *, int32_t len); typedef void DMAu32Func(IDEDMA *, uint32_t); typedef void DMAStopFunc(IDEDMA *, bool); diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c index ca0becd756..21e2c360ac 100644 --- a/hw/dma/rc4030.c +++ b/hw/dma/rc4030.c @@ -590,7 +590,7 @@ static const VMStateDescription vmstate_rc4030 =3D { }; =20 static void rc4030_do_dma(void *opaque, int n, uint8_t *buf, - int len, int is_write) + int len, bool is_write) { rc4030State *s =3D opaque; hwaddr dma_addr; @@ -630,13 +630,13 @@ struct rc4030DMAState { void rc4030_dma_read(void *dma, uint8_t *buf, int len) { rc4030_dma s =3D dma; - rc4030_do_dma(s->opaque, s->n, buf, len, 0); + rc4030_do_dma(s->opaque, s->n, buf, len, false); } =20 void rc4030_dma_write(void *dma, uint8_t *buf, int len) { rc4030_dma s =3D dma; - rc4030_do_dma(s->opaque, s->n, buf, len, 1); + rc4030_do_dma(s->opaque, s->n, buf, len, true); } =20 static rc4030_dma *rc4030_allocate_dmas(void *opaque, int n) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 68264a22e8..13d91e109a 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1461,7 +1461,7 @@ static void ahci_commit_buf(IDEDMA *dma, uint32_t tx_= bytes) ad->cur_cmd->status =3D cpu_to_le32(tx_bytes); } =20 -static int ahci_dma_rw_buf(IDEDMA *dma, int is_write) +static int ahci_dma_rw_buf(IDEDMA *dma, bool is_write) { AHCIDevice *ad =3D DO_UPCAST(AHCIDevice, dma, dma); IDEState *s =3D &ad->port.ifs[0]; diff --git a/hw/ide/core.c b/hw/ide/core.c index 80000eb766..689bb36409 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2570,7 +2570,7 @@ static void ide_init1(IDEBus *bus, int unit) ide_sector_write_timer_cb, s); } =20 -static int ide_nop_int(IDEDMA *dma, int x) +static int ide_nop_int(IDEDMA *dma, bool is_write) { return 0; } diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 7a8470e921..a9f25e5d02 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -376,7 +376,7 @@ static void macio_ide_reset(DeviceState *dev) ide_bus_reset(&d->bus); } =20 -static int ide_nop_int(IDEDMA *dma, int x) +static int ide_nop_int(IDEDMA *dma, bool is_write) { return 0; } diff --git a/hw/ide/pci.c b/hw/ide/pci.c index cce1da804d..1a6a287e76 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -181,7 +181,7 @@ static int32_t bmdma_prepare_buf(IDEDMA *dma, int32_t l= imit) } =20 /* return 0 if buffer completed */ -static int bmdma_rw_buf(IDEDMA *dma, int is_write) +static int bmdma_rw_buf(IDEDMA *dma, bool is_write) { BMDMAState *bm =3D DO_UPCAST(BMDMAState, dma, dma); IDEState *s =3D bmdma_active_if(bm); --=20 2.21.1