From patchwork Tue Jan 11 18:43:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12710361 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id B9CDBC433F5 for ; Tue, 11 Jan 2022 18:50:01 +0000 (UTC) Received: from localhost ([::1]:34964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7MDY-0006c6-6t for qemu-devel@archiver.kernel.org; Tue, 11 Jan 2022 13:50:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7M76-0003lx-40; Tue, 11 Jan 2022 13:43:21 -0500 Received: from [2a00:1450:4864:20::429] (port=38825 helo=mail-wr1-x429.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7M74-0005uG-9B; Tue, 11 Jan 2022 13:43:19 -0500 Received: by mail-wr1-x429.google.com with SMTP id a5so30745605wrh.5; Tue, 11 Jan 2022 10:43:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=16X6YPXfQYq3LeBUyprEXLgjHcskW+mAxX1ULb+aP4w=; b=NxNoLECDYRzxUMSiaH6KN9l5tPRGURj1dLj/NJigSZK1nrkmUoUyRLFZg+E1J749XN 50Jqo7zxXGo83El80U+zq6wS1s8XMT4v+FHC4L9R20X5hbXlgzCFONw8aT4y4+drjqs7 ptmWdnRi1ZHP3aegoe1TprDssMpv1eKHED2IfTMBjlO2mhP4N/kzn6jPrOe3o7l24H7G jTKnJKL11o4NEvOiO1yO0e08NBWWcwtKgluPSSIBug9sGbwid9xcm1X8nSl/0EJuFeiK xXRuLyyktbzUC6b2Fyh1CoOChUl+/aJfry9k17uLre/qAI752kmiVH3+FuteOZRAQ1oU ntuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=16X6YPXfQYq3LeBUyprEXLgjHcskW+mAxX1ULb+aP4w=; b=Ov1Hdq0iK9U1JsEInrRcBle/dVrg4jzStQyMy1/vxs+Uw4zXMFfYk/LGbm8Km7GS+b /w82SXXWfWRkQtV/8yfVdMyz9Nqp/dxgT4AypULBucPgVNNikbJkXLn/URgiTieMAVoT 7gV9cV4Fok+pSrDM9q5Vm0NU4B37HjfO7t+wfIQR9BiOXpJ9S7N4eLMb9Of5gk1+9G6b x6Tp13kdVlmvjyFhucb5Efic9kRBnjVFwGmE1QzjnELO8j+4KRCET6aOOvLEAOfyRkI1 A4tcmsdgWp70lGkBx7rL7iuQkpfL3lqU7Z2ak9LGO0pOjKP91Y70L+liwQHuS8bXior/ l8ew== X-Gm-Message-State: AOAM532gqnCqn+8Weadix8Bztj8Jbeor8GcqF3PmLrf50atDoTN7KQ3W ztIGiqEkYw1caXcyW8g7O5BqtZuhYSuCVg== X-Google-Smtp-Source: ABdhPJzbru5/Y5K9K9xfkICEU7jqIZci4y3V44ua8Bc4f8Ko6KxHDvT4j0WeMfVke68w6HfL887grA== X-Received: by 2002:a05:6000:1449:: with SMTP id v9mr4879243wrx.280.1641926596273; Tue, 11 Jan 2022 10:43:16 -0800 (PST) Received: from nuc.. (83.red-83-50-87.dynamicip.rima-tde.net. [83.50.87.83]) by smtp.gmail.com with ESMTPSA id b1sm11121019wrd.92.2022.01.11.10.43.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 10:43:15 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 01/10] stubs: Restrict fw_cfg to system emulation Date: Tue, 11 Jan 2022 19:43:00 +0100 Message-Id: <20220111184309.28637-2-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220111184309.28637-1-f4bug@amsat.org> References: <20220111184309.28637-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::429 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x429.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-block@nongnu.org, "Michael S. Tsirkin" , David Hildenbrand , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Xu , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" fw_cfg_arch_key_name() stub is only required for sysemu. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: David Hildenbrand Reviewed-by: Richard Henderson --- stubs/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/meson.build b/stubs/meson.build index 71469c1d50a..363f6fa785d 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -11,7 +11,6 @@ stub_ss.add(files('dump.c')) stub_ss.add(files('error-printf.c')) stub_ss.add(files('fdset.c')) -stub_ss.add(files('fw_cfg.c')) stub_ss.add(files('gdbstub.c')) stub_ss.add(files('get-vm-name.c')) if linux_io_uring.found() @@ -51,6 +50,7 @@ stub_ss.add(files('replay-tools.c')) endif if have_system + stub_ss.add(files('fw_cfg.c')) stub_ss.add(files('semihost.c')) stub_ss.add(files('usb-dev-stub.c')) stub_ss.add(files('xen-hw-stub.c')) From patchwork Tue Jan 11 18:43:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12710368 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 5E1AEC433F5 for ; Tue, 11 Jan 2022 19:01:43 +0000 (UTC) Received: from localhost ([::1]:52098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7MOs-0002OU-6C for qemu-devel@archiver.kernel.org; Tue, 11 Jan 2022 14:01:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7M7F-0003qh-Kg; Tue, 11 Jan 2022 13:43:29 -0500 Received: from [2a00:1450:4864:20::42b] (port=33288 helo=mail-wr1-x42b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7M7A-0005v4-Om; Tue, 11 Jan 2022 13:43:29 -0500 Received: by mail-wr1-x42b.google.com with SMTP id d19so14880wrb.0; Tue, 11 Jan 2022 10:43:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BFQEkNDw+pjRjww0vCiwQyACSZhEnWGP9jxosSkqEcY=; b=PRv1NgfAQethOjcPYN4vqSS/d5sF8HC0hqfytOH9WK2sifOGbLP2ggqQeALaLY2kjN r4bIA/ruMLk8Ss0+4e0Bm4/mtpky5XhFEg7DhTTOwkg0ni58SLrRZDRCMQrlz1hnbwuH qVYuSXMTlvU1BLBeJGn0gXGuIMFUgLsWKt7TPHPaos9wxPSurMIfv7LxNI9C4bz9fjgL 9pChmxyTSOLClk1Yq6o0s092YKofTFZiSXY3RJLyzLVXFRQJfsBUBlbphXkSSlPBfa1z +f4z+ggLH+W+FrYV8A+4f2V42nCMrw/GUhCsPNSTuqJVmDa6q1z4f4yNrcJIK1PNm+Oc xK8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BFQEkNDw+pjRjww0vCiwQyACSZhEnWGP9jxosSkqEcY=; b=VKj9+SN1olSetfZBUb7Xqtpjg4FLQTNuUUyOcEb0a8MEmPn66DyofcfgFBcpCTSy38 ghN522nNkbU+wtKGS1S39bvfVrvGzg9eG+fkwIuik+uzaZ3ObvefI7fqOE7DP39bFjbJ EKLa7BAWrTzgJ8pXq9SynzAHdsvLyqiUpPUVdFZC1O0MvR44RDKgH9hMsCGVELsE1yoN L1i7nELSksJ00LyuvoxWiyXMBxUjmsJui+zKlIG2Pv00kt3SdCWoVgrs4OTKGv1nr8lQ bh4Fq3gRxwyRlJnnojXJ9GXAene341Lfv5bH/8Ub5eZ+8V8pfSF6pazF1UjnQTr2pjUi LN1Q== X-Gm-Message-State: AOAM5313wFvRyI7WD0yy5D485ID2w74Io+JXfEbOWBTyuAz5ySuEJxsK mv8uZVTbRQkyZ5wt9uXq7OiiaQKbdYtkog== X-Google-Smtp-Source: ABdhPJwSRtqjb4isnTQzQHyPZHeUP7Z+bejct95ZNX76jharvaA66jAZJGpAM9O83TYOlx/Ziz3EaQ== X-Received: by 2002:adf:f9cb:: with SMTP id w11mr5046533wrr.106.1641926601235; Tue, 11 Jan 2022 10:43:21 -0800 (PST) Received: from nuc.. (83.red-83-50-87.dynamicip.rima-tde.net. [83.50.87.83]) by smtp.gmail.com with ESMTPSA id d5sm9875216wrs.61.2022.01.11.10.43.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 10:43:20 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 02/10] hw/nvram: Restrict fw_cfg QOM interface to sysemu and tools Date: Tue, 11 Jan 2022 19:43:01 +0100 Message-Id: <20220111184309.28637-3-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220111184309.28637-1-f4bug@amsat.org> References: <20220111184309.28637-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42b (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-block@nongnu.org, "Michael S. Tsirkin" , David Hildenbrand , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Xu , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé fw_cfg QOM interface is required by system emulation and qemu-storage-daemon. User-mode emulation doesn't need it. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: David Hildenbrand --- hw/nvram/meson.build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/nvram/meson.build b/hw/nvram/meson.build index 202a5466e63..f5ee9f6b88c 100644 --- a/hw/nvram/meson.build +++ b/hw/nvram/meson.build @@ -1,5 +1,7 @@ -# QOM interfaces must be available anytime QOM is used. -qom_ss.add(files('fw_cfg-interface.c')) +if have_system or have_tools + # QOM interfaces must be available anytime QOM is used. + qom_ss.add(files('fw_cfg-interface.c')) +endif softmmu_ss.add(files('fw_cfg.c')) softmmu_ss.add(when: 'CONFIG_CHRP_NVRAM', if_true: files('chrp_nvram.c')) From patchwork Tue Jan 11 18:43:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12710399 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 136E7C433EF for ; Tue, 11 Jan 2022 19:07:38 +0000 (UTC) Received: from localhost ([::1]:60688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7MUb-0000Na-7S for qemu-devel@archiver.kernel.org; Tue, 11 Jan 2022 14:07:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7M7G-0003ra-IW; Tue, 11 Jan 2022 13:43:30 -0500 Received: from [2a00:1450:4864:20::42d] (port=44849 helo=mail-wr1-x42d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7M7E-0005wE-Dl; Tue, 11 Jan 2022 13:43:30 -0500 Received: by mail-wr1-x42d.google.com with SMTP id k18so34640915wrg.11; Tue, 11 Jan 2022 10:43:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pVCkQBogdod12tDiJmcawodJWct1WKObHrq2vHnhIuA=; b=JvDcYi3ve3d3TsOdBVFIRDTvTUXXR7WUSICVt+U/lAngtRrRbNbPLmT4x5YY7iUm5U 2nQWHvVayJ7i8B2tf8G2wqi722xTdKegSYN32DdUZuJ9/uOkeze989C1M9UoHIBSI2yl QukgxNJgU2WW2aayalWbbxep6olwIabh0jFwmbRTukdKjcLt9g2KVmgIHUcOMzhIji0D EL0CLkm7W+YeosEjWINkIdDARW1GnJRFhDWAfJB9bjHPsEhZjy2/IwBazzsFvdV+Jd3+ WbhZvxEoFJczuQQzNHEwvpq/wYUIb1KYwYw4w8cbcalHKaAr0mlKCH0pHDpFpQzJIqFx aClA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=pVCkQBogdod12tDiJmcawodJWct1WKObHrq2vHnhIuA=; b=6ki0sqzUh3AAnBLyuiYLBAdCJAObGxDR+SISt11UOTyioeQpZmaTNKpMbeObPnLGGb 486k2qeIk9oQPCqdHrC4cbCceunAPT4fqBmoKppt9oW8n9TIqo/pZArocWf9cY9/tmEO wvTyg1ZxQrBDN6j/GYZ0hdQhbx7WsxpLoYmsU+Ry8pBHds7DCmwCu/THivNDbpSSksub ZMdlyh/V36eAyWif5eW1FH3hF4AlH/G0T53dG6Fl1HMwFogJzRLoSrFH+IRFEI3jXBfz ztvqeXh+881Bn6UHuXUp0f0dEaacEsVCdv8Bbx3E1W+JVNCLNgCRH8q9lCvNKbsQWhiC RucA== X-Gm-Message-State: AOAM530UBIqaYuiGPIDiDzfkHNU2BwoEvjNdw5fedxJnp1sXFRZH4OFg +FdFTYqKqIknJ5CfkTFkuYfkRabCdSaPzQ== X-Google-Smtp-Source: ABdhPJyEjXuhE3+CuRtUJhXN0W8JAVjShvy5WWMKemcn2zsxz3yS2Oc1abgfM8imL3eOr/w/tEIUWw== X-Received: by 2002:a5d:6210:: with SMTP id y16mr4700274wru.454.1641926606338; Tue, 11 Jan 2022 10:43:26 -0800 (PST) Received: from nuc.. (83.red-83-50-87.dynamicip.rima-tde.net. [83.50.87.83]) by smtp.gmail.com with ESMTPSA id bi24sm2550816wmb.9.2022.01.11.10.43.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 10:43:25 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 03/10] hw/pci: Restrict pci-bus stub to sysemu Date: Tue, 11 Jan 2022 19:43:02 +0100 Message-Id: <20220111184309.28637-4-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220111184309.28637-1-f4bug@amsat.org> References: <20220111184309.28637-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-block@nongnu.org, "Michael S. Tsirkin" , David Hildenbrand , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Peter Xu , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Neither tools nor user-mode emulation require the PCI bus stub. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Michael S. Tsirkin Reviewed-by: Richard Henderson Reviewed-by: David Hildenbrand Signed-off-by: Philippe Mathieu-Daudé --- stubs/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/meson.build b/stubs/meson.build index 363f6fa785d..d359cbe1ad7 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -26,7 +26,6 @@ stub_ss.add(files('module-opts.c')) stub_ss.add(files('monitor.c')) stub_ss.add(files('monitor-core.c')) -stub_ss.add(files('pci-bus.c')) stub_ss.add(files('qemu-timer-notify-cb.c')) stub_ss.add(files('qmp_memory_device.c')) stub_ss.add(files('qmp-command-available.c')) @@ -51,6 +50,7 @@ endif if have_system stub_ss.add(files('fw_cfg.c')) + stub_ss.add(files('pci-bus.c')) stub_ss.add(files('semihost.c')) stub_ss.add(files('usb-dev-stub.c')) stub_ss.add(files('xen-hw-stub.c')) From patchwork Tue Jan 11 18:43:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12710401 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id E9824C433FE for ; Tue, 11 Jan 2022 19:12:53 +0000 (UTC) Received: from localhost ([::1]:39028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7MZg-00051Q-R5 for qemu-devel@archiver.kernel.org; Tue, 11 Jan 2022 14:12:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7M7K-0003vB-Kw; Tue, 11 Jan 2022 13:43:35 -0500 Received: from [2a00:1450:4864:20::42c] (port=42931 helo=mail-wr1-x42c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7M7J-0005x2-4T; Tue, 11 Jan 2022 13:43:34 -0500 Received: by mail-wr1-x42c.google.com with SMTP id k30so17130596wrd.9; Tue, 11 Jan 2022 10:43:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vXKALJ9Nu0jmF9J3PAVqCeW9IO5VC/1PKk5EvcGi5w4=; b=S1NDalDoSqmALxJhCjDz19+gNkjEysmPv3ly2IAYh4RDFnwwqZyxownJDxs3Wytp4/ /9e2ShOSr1lG0vq6tXcvKBDUnWtYxILycyptExmYYzhyfa9ET97YP9Iuh0FCxZAiWwH0 nsoBlfG/B2QjfDmirg1+4m9BqmyNr52sljNn/2juGCT3hD/u0yyQDW/AJWCdk17KOk8V eKpgReIwTE3KXNAcvYOHVlvMX1HC32SO5hokN3X1cYMXRFLOIbcq+T8VbkZoXHkeID71 YX62Lcmv29q+Rbvz8ZXeQeiLfW3sNvWMPkQIu+ej6kCLcXVsX0QFfCzKZk0VlO7xGd3l G0fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vXKALJ9Nu0jmF9J3PAVqCeW9IO5VC/1PKk5EvcGi5w4=; b=jFYzsidag8w89oqL7hM9VCbeObBUp6Cg9lWYWDshe2cK+0JeIAZD/SnoTBOrNx+lCX sKhNS/Omghvbcn131UQyyNz0FoaAhAH4dfmik3MNFU9/gMeqWvsdMeUR+Kt3gSYs4m8e nrujRQIkmCfZ6wfyLQgNkcs8Q34G1By/fshDaCQaETBqU0J3ErArQzWD2Cr25LJloBbf 982e5xwmBf/swZo68rAApZtVnQvI4yi3G04FAqhGXnNwFTa5bfTNB+dosmKj9GrFnF0U Ggc8gY8VaZyOPaWQgSV+NWt9VWNancGU2nBGCum+s0aO4SOdqbsnEQcQWeaDGPjT0cgD l4Jw== X-Gm-Message-State: AOAM532ilPjhi4PLyL7Y8NDMFr5SsxUJo9Skz0Mc/t+AKU/oTlfq6xmb nOy7/TJjpfUga5HObnXw56AA52gue8Aqfw== X-Google-Smtp-Source: ABdhPJxAYbvc6pNab+X/7N2NFyoS5b5GylEV2i2et+R6FDB6Y0C/NLPzpde46csFF93+oVC9r4cw1A== X-Received: by 2002:a05:6000:1ac6:: with SMTP id i6mr4991329wry.373.1641926611183; Tue, 11 Jan 2022 10:43:31 -0800 (PST) Received: from nuc.. (83.red-83-50-87.dynamicip.rima-tde.net. [83.50.87.83]) by smtp.gmail.com with ESMTPSA id d11sm10648594wri.101.2022.01.11.10.43.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 10:43:30 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 04/10] hw/pci: Document pci_dma_map() Date: Tue, 11 Jan 2022 19:43:03 +0100 Message-Id: <20220111184309.28637-5-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220111184309.28637-1-f4bug@amsat.org> References: <20220111184309.28637-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42c (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42c.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-block@nongnu.org, "Michael S. Tsirkin" , David Hildenbrand , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Peter Xu , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Michael S. Tsirkin Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- include/hw/pci/pci.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 483d5c7c727..023abc0f791 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -881,6 +881,18 @@ PCI_DMA_DEFINE_LDST(q_be, q_be, 64); #undef PCI_DMA_DEFINE_LDST +/** + * pci_dma_map: Map device PCI address space range into host virtual address + * @dev: #PCIDevice to be accessed + * @addr: address within that device's address space + * @plen: pointer to length of buffer; updated on return to indicate + * if only a subset of the requested range has been mapped + * @dir: indicates the transfer direction + * + * Return: A host pointer, or %NULL if the resources needed to + * perform the mapping are exhausted (in that case *@plen + * is set to zero). + */ static inline void *pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t *plen, DMADirection dir) { From patchwork Tue Jan 11 18:43:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12710362 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id F26FAC433EF for ; Tue, 11 Jan 2022 18:54:15 +0000 (UTC) Received: from localhost ([::1]:38778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7MHe-00017B-VO for qemu-devel@archiver.kernel.org; Tue, 11 Jan 2022 13:54:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58160) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7M7Q-00040Z-LG; Tue, 11 Jan 2022 13:43:41 -0500 Received: from [2a00:1450:4864:20::430] (port=39626 helo=mail-wr1-x430.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7M7O-0005yT-50; Tue, 11 Jan 2022 13:43:39 -0500 Received: by mail-wr1-x430.google.com with SMTP id s1so34723517wra.6; Tue, 11 Jan 2022 10:43:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I1fo9pTJV9kwudtw7Cm4x1xO6KpX2sCb2pysmnsHMNg=; b=YBip+L7kXC67CdgRkRIs8tBwvRYSeKRGy8J11NT+yxJPONKZTqynBQMztsqgedvN4D 32nOFVl6TZvo29eaNV5Pc3m57q6rgUSjHQ66VduSA4dA80ZsRh+mEDtzlh/FwsSIgKCM 8lk86MkKY6Un6KJjriA8irSg7SFIEGlN+lpSLFzvcvh4/seAw999TbKV8rl7GY+LpyVb 16CIinhBpkaHko/Nht65DwlGyRDMML//VToskBSv/fS1Bfs/kSDnhGSW57915/G3UOuK szdSAxOQS4vzIUf/cUYk0ywiLdtN+iufwg20xHavPlw/HIsFn9xNyriDagdr+gj6sd/B v2VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=I1fo9pTJV9kwudtw7Cm4x1xO6KpX2sCb2pysmnsHMNg=; b=PQQkQL11rJTuG7BssV5CIbNgC2OnwpoVWK/9fcqLW59KehM6B71P5xbi4+WBQJuFVC i3jsmuR1Djb3QUIQDfQhaum4t0kAGVVhAtxjMDvmTvw0Mc6UKu8O/zy2UbLvlfaCkENL tnDD56kOwvVwu3Hg72ieVoNVlcSUxqOELA01uic9o/g9KVMR4Oo3K2RRzqKynev1l8Aa rMNsAp0N/PGTU/ZjoTktaKWA9x9ybXuT8jXGR83MK07J5oAby+Z2NuxYx3dmQAXMQ2wV jIq08dNDTSvMGMgJ4BR2Ui2cNNhe+w99w5I+jRmXFSI59ee43xdJExYa7OHcNG3omeEs riUw== X-Gm-Message-State: AOAM5332+XPX/7xs8UDz4lxyIu1B7Mx9wY6ZG+Cdq3FQYcVnDB1pvPmM uUzALphFdL1xhdNs2SzgUcuewaGx8Vo+Cg== X-Google-Smtp-Source: ABdhPJyMms4DlD416KtIOB+RGNKtbViwU1pPCug71yEGdKbGit5AVFAfoQOZQ3eWqTymwYLhD4/RSw== X-Received: by 2002:adf:e291:: with SMTP id v17mr4886104wri.479.1641926616320; Tue, 11 Jan 2022 10:43:36 -0800 (PST) Received: from nuc.. (83.red-83-50-87.dynamicip.rima-tde.net. [83.50.87.83]) by smtp.gmail.com with ESMTPSA id o5sm2333871wmc.39.2022.01.11.10.43.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 10:43:35 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 05/10] hw/dma: Remove CONFIG_USER_ONLY check Date: Tue, 11 Jan 2022 19:43:04 +0100 Message-Id: <20220111184309.28637-6-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220111184309.28637-1-f4bug@amsat.org> References: <20220111184309.28637-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::430 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x430.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-block@nongnu.org, "Michael S. Tsirkin" , David Hildenbrand , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Peter Xu , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé DMA API should not be included in user-mode emulation. If so, build should fail. Remove the CONFIG_USER_ONLY check. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: David Hildenbrand Signed-off-by: Philippe Mathieu-Daudé --- include/sysemu/dma.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h index b3faef41b2f..0db2478a506 100644 --- a/include/sysemu/dma.h +++ b/include/sysemu/dma.h @@ -31,8 +31,6 @@ struct QEMUSGList { AddressSpace *as; }; -#ifndef CONFIG_USER_ONLY - /* * When an IOMMU is present, bus addresses become distinct from * CPU/memory physical addresses and may be a different size. Because @@ -288,7 +286,6 @@ void qemu_sglist_init(QEMUSGList *qsg, DeviceState *dev, int alloc_hint, AddressSpace *as); void qemu_sglist_add(QEMUSGList *qsg, dma_addr_t base, dma_addr_t len); void qemu_sglist_destroy(QEMUSGList *qsg); -#endif typedef BlockAIOCB *DMAIOFunc(int64_t offset, QEMUIOVector *iov, BlockCompletionFunc *cb, void *cb_opaque, From patchwork Tue Jan 11 18:43:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12710400 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id D7926C433F5 for ; Tue, 11 Jan 2022 19:07:39 +0000 (UTC) Received: from localhost ([::1]:60936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7MUc-0000ZS-Si for qemu-devel@archiver.kernel.org; Tue, 11 Jan 2022 14:07:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7M7W-00044j-VL; Tue, 11 Jan 2022 13:43:47 -0500 Received: from [2a00:1450:4864:20::335] (port=39896 helo=mail-wm1-x335.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7M7T-0005z8-H7; Tue, 11 Jan 2022 13:43:45 -0500 Received: by mail-wm1-x335.google.com with SMTP id d18-20020a05600c251200b0034974323cfaso2012085wma.4; Tue, 11 Jan 2022 10:43:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h+lDAXEOTcm4u7MlOE1caLxtILFoWnaSvPcbQGLiji8=; b=JC0/+LYchDEJIrqYSOW/9UfetmvgTgvO5ZhnBDTvUX/0ZZzC1ZIsVierhl7+dBROx7 If17DzWgT6jJeAB7K//dBBlg3uAkGld0iIqvFNfBrh5A8nw1rwY/GKfgfHhYnFB+SiFq C0cPXZSUcXh1bmmEzGMJjoIGp4AbfVN1JkP9LyiaFoZueslE/QDzRW1l45Zcs0DEO7uu 5rBbtvdyjDye5iDHPtPPc0ZJrT2Mm7IBQod51EvxKjkpUqm2R8gaNAP9hE2lTgX96rH3 GJhzIoErOWPrUzM7RPPfXiWbRiz+BjCsvRv06bZIoXFGgaBXH29Le7kYh0MgLJU/zLUw Zpog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=h+lDAXEOTcm4u7MlOE1caLxtILFoWnaSvPcbQGLiji8=; b=7XivVedkAWff8zCwQprJWb+OhwojNKFHmLz/9QI8GTtn0XtzKduZh3vDjQp8xVzh8H TeIleR70yzlkjY+jO+5UD8RhXcoL4qtRhym4OY1LkdV5k1IUOwqRJFW1Mb/mt64EyAT/ fdTnir4iKmibCscLGXU6yY3a0zKUXS7QkytCiwu2oMaPsRJjqhrKKmJqaNalFUpjUCsS Ld1iylQgeBKOeTAZbwbI6gIDrsHoG2LD1PAOsZZ254agg+JFI9JS/baqWr88XvYOlC+U 2RYt3gbYzjkANb67asx6mhTZoYGpjta8k0UtrsSe1BsyQqKt6eNyCteYC7Z85lzYNdaY oh7g== X-Gm-Message-State: AOAM533ZJv/QyqOgNUR0CC0iBOJpp1B/LXi2vlIrYooMTLlrX1ySq/f2 fk4pmKOb4Y4nRVwubPk8oXECY7VQ2K8clQ== X-Google-Smtp-Source: ABdhPJyJWow6mrIf71LqkIIiyDhO1LLcZzexX3QTCwpP5nefautqjiIS9Rkj1xRnzyYLBvxrr81HAA== X-Received: by 2002:a7b:c4da:: with SMTP id g26mr3724346wmk.191.1641926621389; Tue, 11 Jan 2022 10:43:41 -0800 (PST) Received: from nuc.. (83.red-83-50-87.dynamicip.rima-tde.net. [83.50.87.83]) by smtp.gmail.com with ESMTPSA id 1sm10888427wrb.13.2022.01.11.10.43.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 10:43:41 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 06/10] hw/rdma/rdma_utils: Rename rdma_pci_dma_map 'len' argument Date: Tue, 11 Jan 2022 19:43:05 +0100 Message-Id: <20220111184309.28637-7-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220111184309.28637-1-f4bug@amsat.org> References: <20220111184309.28637-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::335 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x335.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-block@nongnu.org, "Michael S. Tsirkin" , David Hildenbrand , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Peter Xu , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Various APIs use 'pval' naming for 'pointer to val'. rdma_pci_dma_map() uses 'plen' for 'PCI length', but since 'PCI' is already explicit in the function name, simplify and rename the argument 'len'. No logical change. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: David Hildenbrand Signed-off-by: Philippe Mathieu-Daudé --- hw/rdma/rdma_utils.h | 2 +- hw/rdma/rdma_utils.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/rdma/rdma_utils.h b/hw/rdma/rdma_utils.h index 9fd0efd940b..0c6414e7e0a 100644 --- a/hw/rdma/rdma_utils.h +++ b/hw/rdma/rdma_utils.h @@ -38,7 +38,7 @@ typedef struct RdmaProtectedGSList { GSList *list; } RdmaProtectedGSList; -void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t plen); +void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t len); void rdma_pci_dma_unmap(PCIDevice *dev, void *buffer, dma_addr_t len); void rdma_protected_gqueue_init(RdmaProtectedGQueue *list); void rdma_protected_gqueue_destroy(RdmaProtectedGQueue *list); diff --git a/hw/rdma/rdma_utils.c b/hw/rdma/rdma_utils.c index 98df58f6897..61cb8ede0fd 100644 --- a/hw/rdma/rdma_utils.c +++ b/hw/rdma/rdma_utils.c @@ -17,29 +17,29 @@ #include "trace.h" #include "rdma_utils.h" -void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t plen) +void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t len) { void *p; - hwaddr len = plen; + hwaddr pci_len = len; if (!addr) { rdma_error_report("addr is NULL"); return NULL; } - p = pci_dma_map(dev, addr, &len, DMA_DIRECTION_TO_DEVICE); + p = pci_dma_map(dev, addr, &pci_len, DMA_DIRECTION_TO_DEVICE); if (!p) { rdma_error_report("pci_dma_map fail, addr=0x%"PRIx64", len=%"PRId64, - addr, len); + addr, pci_len); return NULL; } - if (len != plen) { - rdma_pci_dma_unmap(dev, p, len); + if (pci_len != len) { + rdma_pci_dma_unmap(dev, p, pci_len); return NULL; } - trace_rdma_pci_dma_map(addr, p, len); + trace_rdma_pci_dma_map(addr, p, pci_len); return p; } From patchwork Tue Jan 11 18:43:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12710366 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id C7FEDC433EF for ; Tue, 11 Jan 2022 18:58:03 +0000 (UTC) Received: from localhost ([::1]:46384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7MLK-0006zX-Im for qemu-devel@archiver.kernel.org; Tue, 11 Jan 2022 13:58:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7M7a-0004Ar-Lb; Tue, 11 Jan 2022 13:43:54 -0500 Received: from [2a00:1450:4864:20::330] (port=55089 helo=mail-wm1-x330.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7M7Y-0005zP-Bs; Tue, 11 Jan 2022 13:43:50 -0500 Received: by mail-wm1-x330.google.com with SMTP id p18so4977846wmg.4; Tue, 11 Jan 2022 10:43:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TmJh9nilMOL5P88jRqBbHzw20UHflj4hYEZLlrrj/J0=; b=kQBUB2UTbOCqVgSufgtVb9kxks20Te2nsnzUy/faRGXvvSbMEylGwWSPnrBBZd/KQL ewIvqg/+SDqmliCb2NQqSmcVzyS/Dxuxk+tAVV9TsLNZb5aT+z8lZpz7wEs30x/F+Vnw kqwKUI7tK51plr78VOP7/smRqzRHPGwgFJY26s74lVLo9WBIcOkkh9Ljq30Xw2Ul0u8b FQq37LrKZ31BGgXBKwYRJnt52N1gN+BzubyY0gMgDMPyFWQpcjSo1Jbj0+VYEavzWlGq xJaiL9xHvuD9Qf3vRk4bUx6WiJlqytOFqe0kgPxeF+P7SZCudfPFPj9KmLr0bUwDWRF1 PnHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TmJh9nilMOL5P88jRqBbHzw20UHflj4hYEZLlrrj/J0=; b=RTan7fOzXOu2exy0E6ShZQ8f0Mp97tsvgtS6yXYPggxNBM1Ruq53H37voMXGcWqUDR 5z3pmQlSNxKdbDn8iPaXl/omS3Ix8k/IzNvn4kFVlAmwQ1unZ+TFpRIvHDLE2nfLMDdN uv9mJeDEWjzby+WYQTjQRAhDVAdnGrxWZQNjiplAtsIKf8ICrdxkaMSZZ4Z42mQ17PuF ZH+194SXRL+IwcSUYo/UhU3BxXD74Udu5CIlrndMO6To2yh1kR6HTXFZJ0O4b3WeGy+1 HbHDX7TETdQL8m6lxUKXVC3mMpXzFenCeAdz2TpHMWVwi0lQU+18c+/x8EKJhIozb9UV M3IQ== X-Gm-Message-State: AOAM532ZSzsMHoNpqcMNWp/dzpBOeTD7RcgWTNbL61zFdzRlZYzfETf6 5/gjHN13siO8FJ6e8lVDuAmYNc4DK/S5Pw== X-Google-Smtp-Source: ABdhPJwY4OPwb2UIyuduDPTJ5Kzvs+2k0CT+RSndtV1/s7CUoPsRbn7HVqgSv7CY7EBhWdMgD3XiPg== X-Received: by 2002:a05:600c:5113:: with SMTP id o19mr3610820wms.145.1641926626272; Tue, 11 Jan 2022 10:43:46 -0800 (PST) Received: from nuc.. (83.red-83-50-87.dynamicip.rima-tde.net. [83.50.87.83]) by smtp.gmail.com with ESMTPSA id v13sm84255wro.90.2022.01.11.10.43.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 10:43:45 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 07/10] hw/scsi: Rename SCSIRequest::resid as 'residual' Date: Tue, 11 Jan 2022 19:43:06 +0100 Message-Id: <20220111184309.28637-8-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220111184309.28637-1-f4bug@amsat.org> References: <20220111184309.28637-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::330 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x330.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-block@nongnu.org, "Michael S. Tsirkin" , David Hildenbrand , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Peter Xu , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé The 'resid' field is slightly confusing and could be interpreted as some ID. Rename it as 'residual' which is clearer to review. No logical change. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: David Hildenbrand Signed-off-by: Philippe Mathieu-Daudé --- include/hw/scsi/scsi.h | 4 ++-- hw/scsi/megasas.c | 42 +++++++++++++++++++++++++----------------- hw/scsi/scsi-bus.c | 10 +++++----- hw/scsi/scsi-disk.c | 4 ++-- softmmu/dma-helpers.c | 26 +++++++++++++------------- 5 files changed, 47 insertions(+), 39 deletions(-) diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index 2ef80af6dca..b27d133b113 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -30,7 +30,7 @@ struct SCSIRequest { int16_t status; int16_t host_status; void *hba_private; - size_t resid; + size_t residual; SCSICommand cmd; NotifierList cancel_notifiers; @@ -125,7 +125,7 @@ struct SCSIBusInfo { void *hba_private); void (*transfer_data)(SCSIRequest *req, uint32_t arg); void (*fail)(SCSIRequest *req); - void (*complete)(SCSIRequest *req, size_t resid); + void (*complete)(SCSIRequest *req, size_t residual); void (*cancel)(SCSIRequest *req); void (*change)(SCSIBus *bus, SCSIDevice *dev, SCSISense sense); QEMUSGList *(*get_sg_list)(SCSIRequest *req); diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index dc9bbdb740e..cb019549371 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -1045,7 +1045,8 @@ static int megasas_pd_get_info_submit(SCSIDevice *sdev, int lun, uint64_t pd_size; uint16_t pd_id = ((sdev->id & 0xFF) << 8) | (lun & 0xFF); uint8_t cmdbuf[6]; - size_t len, resid; + size_t len; + size_t residual; if (!cmd->iov_buf) { cmd->iov_buf = g_malloc0(dcmd_size); @@ -1112,9 +1113,10 @@ static int megasas_pd_get_info_submit(SCSIDevice *sdev, int lun, info->connected_port_bitmap = 0x1; info->device_speed = 1; info->link_speed = 1; - resid = dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, MEMTXATTRS_UNSPECIFIED); + residual = dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); g_free(cmd->iov_buf); - cmd->iov_size = dcmd_size - resid; + cmd->iov_size = dcmd_size - residual; cmd->iov_buf = NULL; return MFI_STAT_OK; } @@ -1149,7 +1151,8 @@ static int megasas_dcmd_pd_get_info(MegasasState *s, MegasasCmd *cmd) static int megasas_dcmd_ld_get_list(MegasasState *s, MegasasCmd *cmd) { struct mfi_ld_list info; - size_t dcmd_size = sizeof(info), resid; + size_t dcmd_size = sizeof(info); + size_t residual; uint32_t num_ld_disks = 0, max_ld_disks; uint64_t ld_size; BusChild *kid; @@ -1184,8 +1187,9 @@ static int megasas_dcmd_ld_get_list(MegasasState *s, MegasasCmd *cmd) info.ld_count = cpu_to_le32(num_ld_disks); trace_megasas_dcmd_ld_get_list(cmd->index, num_ld_disks, max_ld_disks); - resid = dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTRS_UNSPECIFIED); - cmd->iov_size = dcmd_size - resid; + residual = dma_buf_read(&info, dcmd_size, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size = dcmd_size - residual; return MFI_STAT_OK; } @@ -1193,7 +1197,8 @@ static int megasas_dcmd_ld_list_query(MegasasState *s, MegasasCmd *cmd) { uint16_t flags; struct mfi_ld_targetid_list info; - size_t dcmd_size = sizeof(info), resid; + size_t dcmd_size = sizeof(info); + size_t residual; uint32_t num_ld_disks = 0, max_ld_disks = s->fw_luns; BusChild *kid; @@ -1233,8 +1238,9 @@ static int megasas_dcmd_ld_list_query(MegasasState *s, MegasasCmd *cmd) info.size = dcmd_size; trace_megasas_dcmd_ld_get_list(cmd->index, num_ld_disks, max_ld_disks); - resid = dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTRS_UNSPECIFIED); - cmd->iov_size = dcmd_size - resid; + residual = dma_buf_read(&info, dcmd_size, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size = dcmd_size - residual; return MFI_STAT_OK; } @@ -1244,7 +1250,8 @@ static int megasas_ld_get_info_submit(SCSIDevice *sdev, int lun, struct mfi_ld_info *info = cmd->iov_buf; size_t dcmd_size = sizeof(struct mfi_ld_info); uint8_t cdb[6]; - ssize_t len, resid; + ssize_t len; + size_t residual; uint16_t sdev_id = ((sdev->id & 0xFF) << 8) | (lun & 0xFF); uint64_t ld_size; @@ -1283,9 +1290,10 @@ static int megasas_ld_get_info_submit(SCSIDevice *sdev, int lun, info->ld_config.span[0].num_blocks = info->size; info->ld_config.span[0].array_ref = cpu_to_le16(sdev_id); - resid = dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, MEMTXATTRS_UNSPECIFIED); + residual = dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); g_free(cmd->iov_buf); - cmd->iov_size = dcmd_size - resid; + cmd->iov_size = dcmd_size - residual; cmd->iov_buf = NULL; return MFI_STAT_OK; } @@ -1617,13 +1625,13 @@ static int megasas_handle_dcmd(MegasasState *s, MegasasCmd *cmd) } static int megasas_finish_internal_dcmd(MegasasCmd *cmd, - SCSIRequest *req, size_t resid) + SCSIRequest *req, size_t residual) { int retval = MFI_STAT_OK; int lun = req->lun; trace_megasas_dcmd_internal_finish(cmd->index, cmd->dcmd_opcode, lun); - cmd->iov_size -= resid; + cmd->iov_size -= residual; switch (cmd->dcmd_opcode) { case MFI_DCMD_PD_GET_INFO: retval = megasas_pd_get_info_submit(req->dev, lun, cmd); @@ -1865,12 +1873,12 @@ static void megasas_xfer_complete(SCSIRequest *req, uint32_t len) } } -static void megasas_command_complete(SCSIRequest *req, size_t resid) +static void megasas_command_complete(SCSIRequest *req, size_t residual) { MegasasCmd *cmd = req->hba_private; uint8_t cmd_status = MFI_STAT_OK; - trace_megasas_command_complete(cmd->index, req->status, resid); + trace_megasas_command_complete(cmd->index, req->status, residual); if (req->io_canceled) { return; @@ -1880,7 +1888,7 @@ static void megasas_command_complete(SCSIRequest *req, size_t resid) /* * Internal command complete */ - cmd_status = megasas_finish_internal_dcmd(cmd, req, resid); + cmd_status = megasas_finish_internal_dcmd(cmd, req, residual); if (cmd_status == MFI_STAT_INVALID_STATUS) { return; } diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 2b5e9dca311..3466e680ac7 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -760,7 +760,7 @@ SCSIRequest *scsi_req_new(SCSIDevice *d, uint32_t tag, uint32_t lun, } req->cmd = cmd; - req->resid = req->cmd.xfer; + req->residual = req->cmd.xfer; switch (buf[0]) { case INQUIRY: @@ -1408,7 +1408,7 @@ void scsi_req_data(SCSIRequest *req, int len) trace_scsi_req_data(req->dev->id, req->lun, req->tag, len); assert(req->cmd.mode != SCSI_XFER_NONE); if (!req->sg) { - req->resid -= len; + req->residual -= len; req->bus->info->transfer_data(req, len); return; } @@ -1421,9 +1421,9 @@ void scsi_req_data(SCSIRequest *req, int len) buf = scsi_req_get_buf(req); if (req->cmd.mode == SCSI_XFER_FROM_DEV) { - req->resid = dma_buf_read(buf, len, req->sg, MEMTXATTRS_UNSPECIFIED); + req->residual = dma_buf_read(buf, len, req->sg, MEMTXATTRS_UNSPECIFIED); } else { - req->resid = dma_buf_write(buf, len, req->sg, MEMTXATTRS_UNSPECIFIED); + req->residual = dma_buf_write(buf, len, req->sg, MEMTXATTRS_UNSPECIFIED); } scsi_req_continue(req); } @@ -1512,7 +1512,7 @@ void scsi_req_complete(SCSIRequest *req, int status) scsi_req_ref(req); scsi_req_dequeue(req); - req->bus->info->complete(req, req->resid); + req->bus->info->complete(req, req->residual); /* Cancelled requests might end up being completed instead of cancelled */ notifier_list_notify(&req->cancel_notifiers, req); diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index d4914178ea0..9c0dc7b9468 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -420,7 +420,7 @@ static void scsi_do_read(SCSIDiskReq *r, int ret) if (r->req.sg) { dma_acct_start(s->qdev.conf.blk, &r->acct, r->req.sg, BLOCK_ACCT_READ); - r->req.resid -= r->req.sg->size; + r->req.residual -= r->req.sg->size; r->req.aiocb = dma_blk_io(blk_get_aio_context(s->qdev.conf.blk), r->req.sg, r->sector << BDRV_SECTOR_BITS, BDRV_SECTOR_SIZE, @@ -580,7 +580,7 @@ static void scsi_write_data(SCSIRequest *req) if (r->req.sg) { dma_acct_start(s->qdev.conf.blk, &r->acct, r->req.sg, BLOCK_ACCT_WRITE); - r->req.resid -= r->req.sg->size; + r->req.residual -= r->req.sg->size; r->req.aiocb = dma_blk_io(blk_get_aio_context(s->qdev.conf.blk), r->req.sg, r->sector << BDRV_SECTOR_BITS, BDRV_SECTOR_SIZE, diff --git a/softmmu/dma-helpers.c b/softmmu/dma-helpers.c index b0be1564797..4563a775aa7 100644 --- a/softmmu/dma-helpers.c +++ b/softmmu/dma-helpers.c @@ -294,49 +294,49 @@ BlockAIOCB *dma_blk_write(BlockBackend *blk, } -static MemTxResult dma_buf_rw(void *buf, int32_t len, uint64_t *residp, +static MemTxResult dma_buf_rw(void *buf, int32_t len, uint64_t *residual, QEMUSGList *sg, DMADirection dir, MemTxAttrs attrs) { uint8_t *ptr = buf; - uint64_t resid; + uint64_t xresidual; int sg_cur_index; MemTxResult res = MEMTX_OK; - resid = sg->size; + xresidual = sg->size; sg_cur_index = 0; - len = MIN(len, resid); + len = MIN(len, xresidual); while (len > 0) { ScatterGatherEntry entry = sg->sg[sg_cur_index++]; int32_t xfer = MIN(len, entry.len); res |= dma_memory_rw(sg->as, entry.base, ptr, xfer, dir, attrs); ptr += xfer; len -= xfer; - resid -= xfer; + xresidual -= xfer; } - if (residp) { - *residp = resid; + if (residual) { + *residual = xresidual; } return res; } uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs attrs) { - uint64_t resid; + uint64_t residual; - dma_buf_rw(ptr, len, &resid, sg, DMA_DIRECTION_FROM_DEVICE, attrs); + dma_buf_rw(ptr, len, &residual, sg, DMA_DIRECTION_FROM_DEVICE, attrs); - return resid; + return residual; } uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs attrs) { - uint64_t resid; + uint64_t residual; - dma_buf_rw(ptr, len, &resid, sg, DMA_DIRECTION_TO_DEVICE, attrs); + dma_buf_rw(ptr, len, &residual, sg, DMA_DIRECTION_TO_DEVICE, attrs); - return resid; + return residual; } void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie, From patchwork Tue Jan 11 18:43:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12710364 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 60C99C433F5 for ; Tue, 11 Jan 2022 18:57:01 +0000 (UTC) Received: from localhost ([::1]:44388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7MKK-0005fZ-CV for qemu-devel@archiver.kernel.org; Tue, 11 Jan 2022 13:57:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7M7f-0004Db-V6; Tue, 11 Jan 2022 13:43:56 -0500 Received: from [2a00:1450:4864:20::433] (port=37715 helo=mail-wr1-x433.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7M7d-0005zt-10; Tue, 11 Jan 2022 13:43:55 -0500 Received: by mail-wr1-x433.google.com with SMTP id t28so27952578wrb.4; Tue, 11 Jan 2022 10:43:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Dm0cTZ0uVSvTrDWViyeYPNq8wk38OYgLeR7LOGaCswA=; b=GTkvDChf/M1exQtEg5hKnj1aaRGNqPLaxBgTDY7j51nX2O+GALdD52PMiGBNY8cffI p6y5Cr66MTGhocVpOTuKvaWUy4uyhWZwCrpC8QD87yrKx/nK2Nfc9G7Bij5U8lODg2Gl 2iOEbPQWBhYlm1GcfDyblYkiH03pm5izReIu0+chgsCawKuVskj8J1+4UMBGc/3JRnAz a4mrwU+3svczI64J2/dU7wkgVWjN0fayfe8PuBiwYo08pEs7e4s/hCYZM5Yj54e6bzmG up0HUgiNMppx/5KamUS+8cHMzUf0AC8A/JC8StL1se52AzWYW0oOJYuMvfmBhaj/FJhF H9ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Dm0cTZ0uVSvTrDWViyeYPNq8wk38OYgLeR7LOGaCswA=; b=HcJ2RYS5vGLpDIhg7x3Nhd6qs938/TjlVewqWpgb7VtKD2XQtQmEyd9twQv0o2tgVm AfBnYtjxcfCtg3Z4gXPj96oakpxOg7BcH78Ssmdn63/vD6KmlS20HU5UvXhcxCUWMuC5 aytmyXfrn7ZHEbuyeRAs1n2c5/KeRITWHaJrQLGqHlkxvt0IhIjqyvZI6tEtG36jB4xE i4u9Y5dNtiasGXjYA38hxgY+KIe+Fzj2GoXOo9nS9/cI4G5rhhORahMjdYE2jzlS4u9u sVVduvhMxyuqcV84DUsON8v8Ol0lax5/PMvFVlm3w2jaXyiHSje7YPnkMCpz9qq3axfn hNAw== X-Gm-Message-State: AOAM531oKaDWxnU5H4Z809Qs8TL9tIJbFxDAmLBiT8395I/stY0UOsfT VR6rTa3zqTZRvWAmaQ8bIBEvSBZtC0xbEg== X-Google-Smtp-Source: ABdhPJwsjMfmd1A77RNyRNP/t4rHrWSfdSEqSRn0uS0PegxbAxv2977464Rjx2qJ36Oc63M+1J435A== X-Received: by 2002:adf:fd46:: with SMTP id h6mr4937917wrs.192.1641926631213; Tue, 11 Jan 2022 10:43:51 -0800 (PST) Received: from nuc.. (83.red-83-50-87.dynamicip.rima-tde.net. [83.50.87.83]) by smtp.gmail.com with ESMTPSA id a3sm11151508wri.89.2022.01.11.10.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 10:43:50 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 08/10] hw/dma: Fix format string issues using dma_addr_t Date: Tue, 11 Jan 2022 19:43:07 +0100 Message-Id: <20220111184309.28637-9-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220111184309.28637-1-f4bug@amsat.org> References: <20220111184309.28637-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::433 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x433.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-block@nongnu.org, "Michael S. Tsirkin" , David Hildenbrand , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Peter Xu , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Richard Henderson Reviewed-by: David Hildenbrand Signed-off-by: Philippe Mathieu-Daudé --- hw/ide/ahci.c | 2 +- hw/rdma/trace-events | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 205dfdc6622..6c727dd0c08 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1159,7 +1159,7 @@ static void process_ncq_command(AHCIState *s, int port, const uint8_t *cmd_fis, ahci_populate_sglist(ad, &ncq_tfs->sglist, ncq_tfs->cmdh, size, 0); if (ncq_tfs->sglist.size < size) { - error_report("ahci: PRDT length for NCQ command (0x%zx) " + error_report("ahci: PRDT length for NCQ command (0x" DMA_ADDR_FMT ") " "is smaller than the requested size (0x%zx)", ncq_tfs->sglist.size, size); ncq_err(ncq_tfs); diff --git a/hw/rdma/trace-events b/hw/rdma/trace-events index 9accb149734..c23175120e1 100644 --- a/hw/rdma/trace-events +++ b/hw/rdma/trace-events @@ -27,5 +27,5 @@ rdma_rm_alloc_qp(uint32_t rm_qpn, uint32_t backend_qpn, uint8_t qp_type) "rm_qpn rdma_rm_modify_qp(uint32_t qpn, uint32_t attr_mask, int qp_state, uint8_t sgid_idx) "qpn=0x%x, attr_mask=0x%x, qp_state=%d, sgid_idx=%d" # rdma_utils.c -rdma_pci_dma_map(uint64_t addr, void *vaddr, uint64_t len) "0x%"PRIx64" -> %p (len=%" PRId64")" +rdma_pci_dma_map(uint64_t addr, void *vaddr, uint64_t len) "0x%"PRIx64" -> %p (len=%" PRIu64")" rdma_pci_dma_unmap(void *vaddr) "%p" From patchwork Tue Jan 11 18:43:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12710402 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id E6729C433EF for ; Tue, 11 Jan 2022 19:12:53 +0000 (UTC) Received: from localhost ([::1]:39030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7MZg-00051R-U1 for qemu-devel@archiver.kernel.org; Tue, 11 Jan 2022 14:12:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58248) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7M7j-0004FV-JE; Tue, 11 Jan 2022 13:43:59 -0500 Received: from [2a00:1450:4864:20::433] (port=42943 helo=mail-wr1-x433.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7M7h-00060L-Uh; Tue, 11 Jan 2022 13:43:59 -0500 Received: by mail-wr1-x433.google.com with SMTP id k30so17132475wrd.9; Tue, 11 Jan 2022 10:43:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VcdXVqz6chAbbBWxyWqxGtBbnwx8MK1lJ9E6AYBD0J0=; b=WCga5ihu7X+b6Vu7V2KWJp1tqsisVwnzmHlfKRDvB5BUd4XMTwXMai6rLr0BRDoF+P eH4NZUkw0kJTbTDckZR2mtMCucSlbNnbU64TG4VujsbYnyFXdRGbgh5L43uMoRI6bveJ Qc3Iumo7kFqsMZd+5ExW6+PmZPPCAF8hRvqrkHRl2Qj27sWKYAZDP6MCwHs6ZBTT9a7c yBFU+nQ/RmLttPuw31hClIELdTN4hSELp9MbF8WsSwvCyQ3BLdV745ULOEXGra+hIyVz bQARd2m+RHZmdsuZgw6qA8rbh9Lx/X5/Bhq5PbbztmSnZKLgLkNmrwE/0dUNkaqeoDy2 UgbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=VcdXVqz6chAbbBWxyWqxGtBbnwx8MK1lJ9E6AYBD0J0=; b=tukvNQDbKheOynNiF9BjGNVZ1+qZM2DN03I1eNkh8IBOBx2ZynKCfFX4WfihmY5DMZ EoQyi/Ld3eaNtAnGcEshVGtB1oJvkyMeIRdlahnqohtc8wjG/MbDpBEXTf2iLOYsz3bf PEox5yrHgidcyDWp/k8bVf9mTYNGU5In/lkMTWjImzGzNy2UHbP7A4DDTEdRHfq0PrYQ Hl3HghRkxXWpLSibWJeNYKq/AAdB9ZTbnuaShoMrC0LEjqjQP6UulWvfec6ydg6WIovC D2bT61GCCbErGJqDMpZPXdF3Uji1dvsmwphzfHjG61dookktpwMwczIei74D1ywC8YwN DQOA== X-Gm-Message-State: AOAM533BLTTX7MlEZx5njtUSh/xUkgVXuSMmuEmfaMnQQ42oAfQGPJe2 TY7/Y8fCaHIddsGLFSjxgJO0tnd+H1OohQ== X-Google-Smtp-Source: ABdhPJy1fYqWWmVVL498VuL/kDUZZB+sa2gbQPMKEnvYQ+/rT3/2SxhQ8V2rZdZ8Xh5YX95G/nkKOA== X-Received: by 2002:a05:6000:1687:: with SMTP id y7mr4986177wrd.234.1641926636072; Tue, 11 Jan 2022 10:43:56 -0800 (PST) Received: from nuc.. (83.red-83-50-87.dynamicip.rima-tde.net. [83.50.87.83]) by smtp.gmail.com with ESMTPSA id o13sm10619113wrc.111.2022.01.11.10.43.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 10:43:55 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 09/10] hw/dma: Move ScatterGatherEntry / QEMUSGList declarations around Date: Tue, 11 Jan 2022 19:43:08 +0100 Message-Id: <20220111184309.28637-10-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220111184309.28637-1-f4bug@amsat.org> References: <20220111184309.28637-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::433 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x433.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-block@nongnu.org, "Michael S. Tsirkin" , David Hildenbrand , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Xu , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" In the next commit we will use the dma_addr_t type in the QEMUSGList structure. Since currently dma_addr_t is defined after QEMUSGList, move the declarations to have dma_addr_t defined first. This is a pure code-movement patch. Suggested-by: David Hildenbrand Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: David Hildenbrand Reviewed-by: Richard Henderson --- include/sysemu/dma.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h index 0db2478a506..c992d9d5d6b 100644 --- a/include/sysemu/dma.h +++ b/include/sysemu/dma.h @@ -15,22 +15,11 @@ #include "block/block.h" #include "block/accounting.h" -typedef struct ScatterGatherEntry ScatterGatherEntry; - typedef enum { DMA_DIRECTION_TO_DEVICE = 0, DMA_DIRECTION_FROM_DEVICE = 1, } DMADirection; -struct QEMUSGList { - ScatterGatherEntry *sg; - int nsg; - int nalloc; - size_t size; - DeviceState *dev; - AddressSpace *as; -}; - /* * When an IOMMU is present, bus addresses become distinct from * CPU/memory physical addresses and may be a different size. Because @@ -43,6 +32,17 @@ typedef uint64_t dma_addr_t; #define DMA_ADDR_BITS 64 #define DMA_ADDR_FMT "%" PRIx64 +typedef struct ScatterGatherEntry ScatterGatherEntry; + +struct QEMUSGList { + ScatterGatherEntry *sg; + int nsg; + int nalloc; + size_t size; + DeviceState *dev; + AddressSpace *as; +}; + static inline void dma_barrier(AddressSpace *as, DMADirection dir) { /* From patchwork Tue Jan 11 18:43:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12710367 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 43BECC433F5 for ; Tue, 11 Jan 2022 19:01:37 +0000 (UTC) Received: from localhost ([::1]:52100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7MOm-0002OV-B1 for qemu-devel@archiver.kernel.org; Tue, 11 Jan 2022 14:01:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58274) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7M7p-0004Ho-9N; Tue, 11 Jan 2022 13:44:05 -0500 Received: from [2a00:1450:4864:20::434] (port=37718 helo=mail-wr1-x434.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7M7n-000614-0f; Tue, 11 Jan 2022 13:44:04 -0500 Received: by mail-wr1-x434.google.com with SMTP id t28so27953220wrb.4; Tue, 11 Jan 2022 10:44:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WT+/6OA6M2ZuFabg8578mYnCq2PeYWmuEbYcmoWBF90=; b=KgtkDgmZAcy5/XrAkbTrdnIQgoWbsBT42BCOQBzHSYLXlQgldKwhkwEMmOWDPQKUSt e4bRmyqQGyGd7MOHci1JbhQmwPtjg7IPIZrWanhG3kAHZm7gqSXpXhohjbPv+Al7RN7i 0DmXcsAkzacMc91fzgT2P2ATj7AuSHw79FymWI9WC9FSAu7WKo1zDGj5iO0JFdQOh+dq BMLvBhVETmEFCdhdMS644/YDEjhuerdOBnVy4vJLlI9Jaz/fAksiAAj6Mcr+9tuxor0h u/USwC1Mgsino+YjvRT8mWAhgJhxKYlUgVEpARtBaWmB9O3DubILS/VA8o/TbupwO7yX P+nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=WT+/6OA6M2ZuFabg8578mYnCq2PeYWmuEbYcmoWBF90=; b=e8Fron+9knMSQT/RzdHaJc+JMFKfOjKG79+WFWt000XX53rvlGSxk5LdAA+VsCwgcS jfuWBt9RWcE8EXsVCDaY7k5fVs9q6MyPvfroDIdPzuGbn2l9MI17GhSkRmC0ok8PhOcc kOuJEWynFGEtsTGxrIO4IiynGpIHCdlLAut0k40+g38oC7oRkPDDYc0/vVqGm6mchtHq Ske2YaSFqOxw5sf25p4VwaSebdRZIS72TpU8d9+JFUH9BMt8CUZkRq62gghH/SOaDDZJ /N3ocCdkBpOVZfgLOAggm02IK5vwLwzPlQ6N6+KMpae7du0VifGqc33x7SB72jKCppXg Sniw== X-Gm-Message-State: AOAM533XMziemkDk14i/w+wmci24RiOUsFYV8ubMmGQDshC/rWs6zADx T5jIQxwqs0onWZFIZHGVqt0Nc7itGvB7pQ== X-Google-Smtp-Source: ABdhPJxREx0cdCxXce/FUp421O8sXgsSKMz88whpEUswUtaUIMARvCAOH6AM7zhY2Zqeo47XSWEa0A== X-Received: by 2002:a5d:438a:: with SMTP id i10mr5083331wrq.270.1641926640928; Tue, 11 Jan 2022 10:44:00 -0800 (PST) Received: from nuc.. (83.red-83-50-87.dynamicip.rima-tde.net. [83.50.87.83]) by smtp.gmail.com with ESMTPSA id bg12sm3571951wmb.5.2022.01.11.10.44.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 10:44:00 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 10/10] hw/dma: Use dma_addr_t type definition when relevant Date: Tue, 11 Jan 2022 19:43:09 +0100 Message-Id: <20220111184309.28637-11-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220111184309.28637-1-f4bug@amsat.org> References: <20220111184309.28637-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::434 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x434.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-block@nongnu.org, "Michael S. Tsirkin" , David Hildenbrand , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Xu , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Update the obvious places where dma_addr_t should be used (instead of uint64_t, hwaddr, size_t, int32_t types). This allows to have &dma_addr_t type portable on 32/64-bit hosts. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: David Hildenbrand Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- include/sysemu/dma.h | 8 +++++--- hw/nvme/ctrl.c | 2 +- hw/rdma/rdma_utils.c | 2 +- hw/scsi/megasas.c | 10 +++++----- softmmu/dma-helpers.c | 16 +++++++++------- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h index c992d9d5d6b..36039c5e687 100644 --- a/include/sysemu/dma.h +++ b/include/sysemu/dma.h @@ -38,7 +38,7 @@ struct QEMUSGList { ScatterGatherEntry *sg; int nsg; int nalloc; - size_t size; + dma_addr_t size; DeviceState *dev; AddressSpace *as; }; @@ -301,8 +301,10 @@ BlockAIOCB *dma_blk_read(BlockBackend *blk, BlockAIOCB *dma_blk_write(BlockBackend *blk, QEMUSGList *sg, uint64_t offset, uint32_t align, BlockCompletionFunc *cb, void *opaque); -uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs attrs); -uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs attrs); +dma_addr_t dma_buf_read(void *ptr, dma_addr_t len, + QEMUSGList *sg, MemTxAttrs attrs); +dma_addr_t dma_buf_write(void *ptr, dma_addr_t len, + QEMUSGList *sg, MemTxAttrs attrs); void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie, QEMUSGList *sg, enum BlockAcctType type); diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index 462f79a1f60..c3c49176110 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -1147,7 +1147,7 @@ static uint16_t nvme_tx(NvmeCtrl *n, NvmeSg *sg, uint8_t *ptr, uint32_t len, if (sg->flags & NVME_SG_DMA) { const MemTxAttrs attrs = MEMTXATTRS_UNSPECIFIED; - uint64_t residual; + dma_addr_t residual; if (dir == NVME_TX_DIRECTION_TO_DEVICE) { residual = dma_buf_write(ptr, len, &sg->qsg, attrs); diff --git a/hw/rdma/rdma_utils.c b/hw/rdma/rdma_utils.c index 61cb8ede0fd..5a7ef63ad28 100644 --- a/hw/rdma/rdma_utils.c +++ b/hw/rdma/rdma_utils.c @@ -20,7 +20,7 @@ void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t len) { void *p; - hwaddr pci_len = len; + dma_addr_t pci_len = len; if (!addr) { rdma_error_report("addr is NULL"); diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index cb019549371..6c1ae6b980f 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -1046,7 +1046,7 @@ static int megasas_pd_get_info_submit(SCSIDevice *sdev, int lun, uint16_t pd_id = ((sdev->id & 0xFF) << 8) | (lun & 0xFF); uint8_t cmdbuf[6]; size_t len; - size_t residual; + dma_addr_t residual; if (!cmd->iov_buf) { cmd->iov_buf = g_malloc0(dcmd_size); @@ -1152,7 +1152,7 @@ static int megasas_dcmd_ld_get_list(MegasasState *s, MegasasCmd *cmd) { struct mfi_ld_list info; size_t dcmd_size = sizeof(info); - size_t residual; + dma_addr_t residual; uint32_t num_ld_disks = 0, max_ld_disks; uint64_t ld_size; BusChild *kid; @@ -1198,7 +1198,7 @@ static int megasas_dcmd_ld_list_query(MegasasState *s, MegasasCmd *cmd) uint16_t flags; struct mfi_ld_targetid_list info; size_t dcmd_size = sizeof(info); - size_t residual; + dma_addr_t residual; uint32_t num_ld_disks = 0, max_ld_disks = s->fw_luns; BusChild *kid; @@ -1251,7 +1251,7 @@ static int megasas_ld_get_info_submit(SCSIDevice *sdev, int lun, size_t dcmd_size = sizeof(struct mfi_ld_info); uint8_t cdb[6]; ssize_t len; - size_t residual; + dma_addr_t residual; uint16_t sdev_id = ((sdev->id & 0xFF) << 8) | (lun & 0xFF); uint64_t ld_size; @@ -1625,7 +1625,7 @@ static int megasas_handle_dcmd(MegasasState *s, MegasasCmd *cmd) } static int megasas_finish_internal_dcmd(MegasasCmd *cmd, - SCSIRequest *req, size_t residual) + SCSIRequest *req, dma_addr_t residual) { int retval = MFI_STAT_OK; int lun = req->lun; diff --git a/softmmu/dma-helpers.c b/softmmu/dma-helpers.c index 4563a775aa7..916cf12ed42 100644 --- a/softmmu/dma-helpers.c +++ b/softmmu/dma-helpers.c @@ -294,12 +294,12 @@ BlockAIOCB *dma_blk_write(BlockBackend *blk, } -static MemTxResult dma_buf_rw(void *buf, int32_t len, uint64_t *residual, +static MemTxResult dma_buf_rw(void *buf, dma_addr_t len, dma_addr_t *residual, QEMUSGList *sg, DMADirection dir, MemTxAttrs attrs) { uint8_t *ptr = buf; - uint64_t xresidual; + dma_addr_t xresidual; int sg_cur_index; MemTxResult res = MEMTX_OK; @@ -308,7 +308,7 @@ static MemTxResult dma_buf_rw(void *buf, int32_t len, uint64_t *residual, len = MIN(len, xresidual); while (len > 0) { ScatterGatherEntry entry = sg->sg[sg_cur_index++]; - int32_t xfer = MIN(len, entry.len); + dma_addr_t xfer = MIN(len, entry.len); res |= dma_memory_rw(sg->as, entry.base, ptr, xfer, dir, attrs); ptr += xfer; len -= xfer; @@ -321,18 +321,20 @@ static MemTxResult dma_buf_rw(void *buf, int32_t len, uint64_t *residual, return res; } -uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs attrs) +dma_addr_t dma_buf_read(void *ptr, dma_addr_t len, + QEMUSGList *sg, MemTxAttrs attrs) { - uint64_t residual; + dma_addr_t residual; dma_buf_rw(ptr, len, &residual, sg, DMA_DIRECTION_FROM_DEVICE, attrs); return residual; } -uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs attrs) +dma_addr_t dma_buf_write(void *ptr, dma_addr_t len, + QEMUSGList *sg, MemTxAttrs attrs) { - uint64_t residual; + dma_addr_t residual; dma_buf_rw(ptr, len, &residual, sg, DMA_DIRECTION_TO_DEVICE, attrs);