From nobody Mon Apr 29 00:59:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) client-ip=209.85.221.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1641926597; cv=none; d=zohomail.com; s=zohoarc; b=Y5L9xtmiWUv8QsBVRDi+mHyfQKj7aA61EpNw76lvs8Y08DyJiLpVUZom+ize/D4J/PgScqCfo0SMGr/2oWNKmBdyBQn16BI/tOpWwdYqIjxdBqAxsJ3quYeb1uQbU0eV3FZr1Uk9QKSiRczC93GXmGuWRJZgOy0qgzsV81EBinI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641926597; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=16X6YPXfQYq3LeBUyprEXLgjHcskW+mAxX1ULb+aP4w=; b=eZCE8fEX5KPK4T/V79CWjkCTJzhgHIhUogoJWAbAbgo0sNDadqwH1AITqM4pQot7Jc6sGsPqdysfaBnzcwFACpkbfWeYvdbOrB0B63OD8SCklhGjPzDMfVWKv27BW6yPKfgSot7gGXzaE/gsBd8V2F3r7rhkTtMmtBpoBXot1k8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.zohomail.com with SMTPS id 1641926597986391.5349483562957; Tue, 11 Jan 2022 10:43:17 -0800 (PST) Received: by mail-wr1-f48.google.com with SMTP id d19so14432wrb.0 for ; Tue, 11 Jan 2022 10:43:17 -0800 (PST) Return-Path: Return-Path: 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) 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=Ef5oG1LT7cbxSbq4C4oA3hdtUIK28zHSKPbGTScXm5/OQoSnTY3f9F+aFV7956wCOV PzETEPNKX3ZCGJW6WS1ddBVwErhe/Tnb8D4g2+0h3KOrXN5IB8n2Cf1lC7hkZwhYEW86 wMu+OASoAeAH1Lb9rP4G2WPQzwJaOvuuHXfjDa7qVGpbxYI9VRSakFX+QhZKMc+5VtGb 8jtqmtAIwCPVKEt1x8Aspgzz+jBy+0ksngu7dUOeEoi/jayMXdtRYOYuBA+8/FAK7Fa6 r0GFGifpJEsUB5kwVMQA50g/lWb3Tv+yffso+gHjOZXRDVPUotckNzKLNFRzZsmC5wwc Ou/A== X-Gm-Message-State: AOAM5315Wp4/brxg27eoEP80PFxGK0gTGhsggU4CMp/NXy4DYF9J6gF2 +kVUm681ECiwT7Va3vpBJmA= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Hildenbrand , "Michael S. Tsirkin" , Peter Xu , qemu-block@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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1641926598626100001 fw_cfg_arch_key_name() stub is only required for sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand Reviewed-by: Peter Xu 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')) --=20 2.34.1 From nobody Mon Apr 29 00:59:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) client-ip=209.85.221.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1641926608; cv=none; d=zohomail.com; s=zohoarc; b=jXM0Tv2nwFtgs9dCF6wdFwA6NfD+logEiERSONtKWJwON6gXlIuWWPovQjBlxk1h1PMdJpWOqc92GN6rq/+J9UHqqdV+/EMfxHLYUjpVCcxfCLi0sznB0s7zdZQXvbqZTy6YRTI1jtZi13+zAOnd4FdmVZ6smY8XUal41F9XGL8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641926608; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BFQEkNDw+pjRjww0vCiwQyACSZhEnWGP9jxosSkqEcY=; b=gq/TUl+GcLrXnGLsKnZrTZMLm1vO3kypNw1TDyjPrLDyU3Y+Bj0Gw8A87dM6F/me6gtW/xDHpNwl8U8KFeSU8fhdsupjswBgEjZS54aCuiy+UIG45ZEuFm76tdSqHrWGsjyJFCVBpdEzw34dbiymUGFCax+cmpwWLiJawjisvkI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.zohomail.com with SMTPS id 164192660852324.308682434689445; Tue, 11 Jan 2022 10:43:28 -0800 (PST) Received: by mail-wr1-f48.google.com with SMTP id v6so34623004wra.8 for ; Tue, 11 Jan 2022 10:43:27 -0800 (PST) Return-Path: Return-Path: 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) 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=uAi+pEMb85ZpA5PShoVuzfSKFDMh9uuSAH1DAYjEYB3Slg6nQv6VkRivVCPqtnmE29 Xg0j2EysF7PfqR1huXt1tQYuBcE68fArCpvr3o2kstTOAmmel+LmooJAT1/QmbK4wzYJ 4RBHrFw3+rAqMKUTXkk0sa/XW1EsXxUaJrmhHiYU6YJYgn1jquXz0Do44T9n7X7YlyxQ SwE63WPn1rm2cfzFvfhGVrXCgBTwQcTWdVIo7ITNMjQC81/hPMX2CMUhMGaBU3878+wi mVJy4Ls4sL4SxYlczGYccu3GXEymf9zVEPNcswxjJh0+Ylr9c1qtvSJxIvh2ofNcNDYr DdoA== X-Gm-Message-State: AOAM533YfNiAqN+2++H/iHUJAe3U5TSLCBstKq1vT/CEcHJ/tLxbuzix 59uOB6mUctPlwbZHr5om57GVFQz6lANoqg== 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Hildenbrand , "Michael S. Tsirkin" , Peter Xu , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1641926610230100003 From: Philippe Mathieu-Daud=C3=A9 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=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand Reviewed-by: Peter Xu --- 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 =20 softmmu_ss.add(files('fw_cfg.c')) softmmu_ss.add(when: 'CONFIG_CHRP_NVRAM', if_true: files('chrp_nvram.c')) --=20 2.34.1 From nobody Mon Apr 29 00:59:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1641926607; cv=none; d=zohomail.com; s=zohoarc; b=kMVNZR5bv1W4WF6G53lxoyvA9kWvxXpffSpsQZUibP/8WP4F+K9AWjBCD7pVLvIUUjSObYzVaOoIFzWz0BYc5M3tLhg8mZ3Ijf1wFKQvjuemyPHIv3kBmxwgc/bnj3QE5HdexdB2Ipp/GA/K2j/h7GVGw59e0uoTXAkwWZwUnoQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641926607; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pVCkQBogdod12tDiJmcawodJWct1WKObHrq2vHnhIuA=; b=d+eZVK/H5XAwsSDNyjwVmu5p5y9O6Y3GCCu+HXJw0kMy6P5yVKBWSej/ZGR2KKyYRjqHVPXtqiV/opr6llH/zb8tH5hqm9+WxkzV41UggbQGw6DxarEIICV/pa7sNBFfUOkOzTdqligNsjxgdOsXjBUBllRT8GfSFEEJAGV9DXM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1641926607980786.6475308155141; Tue, 11 Jan 2022 10:43:27 -0800 (PST) Received: by mail-wr1-f50.google.com with SMTP id o3so34684524wrh.10 for ; Tue, 11 Jan 2022 10:43:27 -0800 (PST) Return-Path: Return-Path: 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) 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=0kDFS+Dhe0lFUnXuA8uolkymzOSZ1+lzAiibUEwPlgezHacdPW3zeqfudst3dvh7CU /mqAZ7m4FB8z/veC3LzXusttKhpUq20SfNmdLFOS0kWtE/gKknB/rD02CX9AloO5EnAN mcyulGixrbNiPwjzS5JewA4J5rtCnKFvcxos91lnHq526zOB1NFSz8WNXH6tICmNQFVL 8wCZXSv+tz+w8gr/49qMucEBfRpkspOTylM8e5j0c72xmeXiaP5PqRZP6frbG6uEk82v reyLZpYAbSXuuxGbHig8sqo+NvxbATwjbRrN8S064T3X6xObB3XiWc3yDjxXhrmTWuk/ hI9Q== X-Gm-Message-State: AOAM530GtCvqBOn5dbv+B4OaJdKpix9oHlW+QeTFEYCdYKegpZXlHgxm 32QZLxQcxF4l4+kb/iXItC4= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Hildenbrand , "Michael S. Tsirkin" , Peter Xu , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1641926609749100001 From: Philippe Mathieu-Daud=C3=A9 Neither tools nor user-mode emulation require the PCI bus stub. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Michael S. Tsirkin Reviewed-by: Richard Henderson Reviewed-by: David Hildenbrand Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Xu --- 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')) --=20 2.34.1 From nobody Mon Apr 29 00:59:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) client-ip=209.85.221.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1641926612; cv=none; d=zohomail.com; s=zohoarc; b=OJxab+cccaMgdQ6clOFc8j/wZYNklKu7yR+aIIwrsPaojo7VYSzMINalK+WGHSa3iSA040fiN3dan865BWhV51AXMdEj/uazzLOX9gugeKxujIjHnAhk/1iH5t1X47LY0JhCs0fnbY0mEh4rEL2UEfpLH4PFqc/5fS5pG+wA9UU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641926612; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vXKALJ9Nu0jmF9J3PAVqCeW9IO5VC/1PKk5EvcGi5w4=; b=d7c6+mUrpP+Dt/VZVKy2uJ6TsC1uWdy3nvte2kZ72z4p8pLFU4iHi+UU2hu5lpGdWs6k7q5o+aQZ5pjUnsjaYbjldrYMovouGFmgpmnblEulWhxTbM24y2TSjHaw3XpgfEtOlBQLhwHBk6cKRfpSR63X1+ps9q4U/1jW7c1V7bE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.zohomail.com with SMTPS id 1641926612919114.96068092615712; Tue, 11 Jan 2022 10:43:32 -0800 (PST) Received: by mail-wr1-f53.google.com with SMTP id d19so15812wrb.0 for ; Tue, 11 Jan 2022 10:43:32 -0800 (PST) Return-Path: Return-Path: 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) 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=RyX8a4rCroB/GpJ40QLzkFpS381hPa02RZjXiWwq+O0FV2euZgXMisEwZJaomAx3tX vTJBEO7jXnyatiE5Pod9fOkGYNDcu2HC7Ogm44jDUakwXsDMi5jVrxjrd7tvcZ2dqySF fzrAiIra4s1RRNubPjkWilekz+fGoegnD4VNDtymxvzppdW9mmkSkdReve5aldv8QbzW veiESbxXFl1OyjRGQDS4hgC4vXHrPP/c7/CN75A4UX1drI5PBgjk68vTbzLaTaJdTaXC cIVLNtS7sXzhcsXg2K8/0xR11cxlry8+lD56nDXMcHNgQz8IZjgtFLdmXrIsXR8CNsQA sC3g== X-Gm-Message-State: AOAM531FYRoaexEeVoSVSA2VZ8lHfQSmWYMqfT3Qd4MXWjZtGelAIq3m VqEk73G+F1Bg+KNWHwn2pJ4= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Hildenbrand , "Michael S. Tsirkin" , Peter Xu , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1641926614119100001 From: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Michael S. Tsirkin Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Xu --- 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); =20 #undef PCI_DMA_DEFINE_LDST =20 +/** + * pci_dma_map: Map device PCI address space range into host virtual addre= ss + * @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) { --=20 2.34.1 From nobody Mon Apr 29 00:59:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) client-ip=209.85.221.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1641926618; cv=none; d=zohomail.com; s=zohoarc; b=Dv02MYPth8vpJlIc3XAwWEiLDCIOOrBDvq5FcenPreMzbp66/lcBI6IWRKKrwbqLgu9GGrzRDJIoBnnStlgTzpYuaBq5YBHYqKNG0YrIOZ+J7UA1Y4686VODOQv7zldwERlAQqOUwQhbMr6jILZNK/St48XCip18lLFS95XiWnM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641926618; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=I1fo9pTJV9kwudtw7Cm4x1xO6KpX2sCb2pysmnsHMNg=; b=gIKhUB/ZY+Xqr9AvQ1j9aYqWRxgt5UOXuI9eVvkBAEHotWuup2PJQ6vb3u+mhFeUVrH5IDbZQ+18H0yxfUjct19bpgrwS8K5fGt0S5TFk3Von7FJ62CDaY+FulR2+2GvKou6JT0e6cJL8v6iCchFRtSyteX/FYE2TM7afJQZZ1s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.zohomail.com with SMTPS id 1641926618055153.198151805149; Tue, 11 Jan 2022 10:43:38 -0800 (PST) Received: by mail-wr1-f48.google.com with SMTP id x4so9534548wru.7 for ; Tue, 11 Jan 2022 10:43:37 -0800 (PST) Return-Path: Return-Path: 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) 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=XxK3VNrFMTy2n4VLdBCkKhR5uPzJY7RgzyJkwyjkkhLS0mBvtVD7T3h21VBTRUKQMV +r4fyoUYaVsJ45Zs5cwQ99vJFNnsMMFNmjEa/rLxHJiuee2kyZYVBOhL4lWSQz7xvp97 2T9It696DFPjZs3fXfBJz2ZNOKFEmGzn/YzLeV8Bb8XfdjtnBzZyvp1o6fOm4HIT6AN/ tP+x6N1aYM944CSZ5s6ZVzEnY56WmtP1iyTrIa7xLwkqxnP55AL2vprAuCcb0+5FHgPr goLm1zPHdWVWek+IOzHxBYI8jXHrw81zuDLWZjhA31q6/exoDCkI2dgexxUE14e6VO5M f6+Q== X-Gm-Message-State: AOAM532sTHWknHw4QVzRL9QFmIQUOr0PGJPe1Fs/qdPkBA3s82I9TWCK 4Pxmq8mjg0iPdi+g+oyQe0c= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Hildenbrand , "Michael S. Tsirkin" , Peter Xu , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1641926618901100001 From: Philippe Mathieu-Daud=C3=A9 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=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: David Hildenbrand Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Xu --- 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; }; =20 -#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 =20 typedef BlockAIOCB *DMAIOFunc(int64_t offset, QEMUIOVector *iov, BlockCompletionFunc *cb, void *cb_opaque, --=20 2.34.1 From nobody Mon Apr 29 00:59:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) client-ip=209.85.128.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1641926623; cv=none; d=zohomail.com; s=zohoarc; b=n33UkY44ayeSU8K6OqKkSD6ekiojqsARUG+SLTeT1sdqXX1MksJEB2u0LaFd45ERtq4i7zSH5xDNGLOZbFde+eGskelS2Sb717znVFL4dbFLztFmHtyHZMlF6ORRiNjWxwPQQ90WR/Yj5j7N1dpyj/IuWtf4veq63tIDq+yH048= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641926623; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=h+lDAXEOTcm4u7MlOE1caLxtILFoWnaSvPcbQGLiji8=; b=Gb2K31u3ubl5Wru0akTI7dvLLntbfe7omDxnhLF3ZddAjyWIetA1UTJ1ZjXlgB3jHFunMLEZhMUIqiuELS5PZD+7uOFHJz8/OGcZRQ6o+c2eYJWYtUDT4kJxbpisosgiwg8sBwDgoHOK4cxt4vI9yCuK/18bCG8QxZjO4FkKV48= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.zohomail.com with SMTPS id 1641926623121475.4920007408517; Tue, 11 Jan 2022 10:43:43 -0800 (PST) Received: by mail-wm1-f42.google.com with SMTP id 25-20020a05600c231900b003497473a9c4so2016297wmo.5 for ; Tue, 11 Jan 2022 10:43:42 -0800 (PST) Return-Path: Return-Path: 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) 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=O2w7LQR4ugoOTdYyLLe253u72+e1PPORP0QLDjFMW0e5zqn8R1NH6OlTl+RveGqrtB pyZ26TSbCxUuIoYqXlTnw7FnkQAqOQIqxf4ZBcBSdeXe4tUXPglaIjMH0uyliIoebBjx wyl/0wFm62xOVzjy/lb9R8v60sHCMeCqBbFR56TSc6w6DE9+scMZ5jLTGsCyWNb5M6D1 si6s3abttgvPiDJsL3XSQ7FAo1I53rGxtAIt33hAb1FhfBoXQMLN0kisKW6Yv3/Eh3cJ vEdxIaB3DaghsQS1/XuhB5A/OCR1S5K0NxW/YUn5Fez9Qd6AbG+suvgGAPjDOdeld1ad /hKg== X-Gm-Message-State: AOAM5306chwsTRm4s7bvTpab6qUav1wxV5zfVu2t8PYJ4eWke3ZYZxiA 639sAWGTWhKSxxOndnFTQfo= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Hildenbrand , "Michael S. Tsirkin" , Peter Xu , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1641926623790100001 From: Philippe Mathieu-Daud=C3=A9 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=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: David Hildenbrand Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Xu --- 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; =20 -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" =20 -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 =3D plen; + hwaddr pci_len =3D len; =20 if (!addr) { rdma_error_report("addr is NULL"); return NULL; } =20 - p =3D pci_dma_map(dev, addr, &len, DMA_DIRECTION_TO_DEVICE); + p =3D pci_dma_map(dev, addr, &pci_len, DMA_DIRECTION_TO_DEVICE); if (!p) { rdma_error_report("pci_dma_map fail, addr=3D0x%"PRIx64", len=3D%"P= RId64, - addr, len); + addr, pci_len); return NULL; } =20 - if (len !=3D plen) { - rdma_pci_dma_unmap(dev, p, len); + if (pci_len !=3D len) { + rdma_pci_dma_unmap(dev, p, pci_len); return NULL; } =20 - trace_rdma_pci_dma_map(addr, p, len); + trace_rdma_pci_dma_map(addr, p, pci_len); =20 return p; } --=20 2.34.1 From nobody Mon Apr 29 00:59:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) client-ip=209.85.128.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1641926628; cv=none; d=zohomail.com; s=zohoarc; b=diJCMN5+TxOw6fuYcOra4XVGZ2JP8EY8ohs3DuF7qhjSIqA1JikFuHNVFyNdoQ50Kya72+sHYicrnw8FTdH0O6xjir7YVzbT7lv61b0p7TjqLIil+w62ARPlD3SJTSPE5Zj/yPe4LveoEzTpfqZphAJA39kgdb7SWzwY+45+6cQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641926628; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TmJh9nilMOL5P88jRqBbHzw20UHflj4hYEZLlrrj/J0=; b=SZk34k1JsvXYXajifR+tSxmamuRWZdH4NBEaAqsu25MiODVMohifw8/f7MH3R1A+iBgVoV/7to9d7GeOYUI0Skio8tvV9MWEGUiWC/8nWxX1QbMmDSePR1EZZfiHIAoSUY2p2Rg1Gb8G9d8oRAXQ0oG+XAVFnpCFMWy/EOUa1Pg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.zohomail.com with SMTPS id 1641926628051884.3369278316611; Tue, 11 Jan 2022 10:43:48 -0800 (PST) Received: by mail-wm1-f41.google.com with SMTP id p1-20020a1c7401000000b00345c2d068bdso2020040wmc.3 for ; Tue, 11 Jan 2022 10:43:47 -0800 (PST) Return-Path: Return-Path: 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) 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=1FyIBAZCrjNB/3IcDGU9mcJiOz6h5VMVxXE3Nr2CesBFEKb/RUZ3L0DPuPB5TTxrT0 42Nv6lSrz7vzsE7iqPZnuD+5jOpL17Dw3qvpyIfv9xjkT6dzX3KpqiGB3w+Z+6n3+V0u nzNKXHYo46Wxw3FkrogfmA8TPWF+UEvulUMa8LqEyKp0SWBCm92/t4h7rcIYf9X7jBXR rKb1KDcn9GThtIEiCvXsqWKUeVseSLv/RVHnqZUi1bGGptgxyyE+HhcHMyLet6VKHLPv EYZgzGoSw6HNvTW+A2Uw18Tguz9stlPk7x7wypVTmE8wSBnglWtIDajCP1g1+FsG2oDO 87VA== X-Gm-Message-State: AOAM530ni8gkrL+//kMXzWLmwH/fCIu2WbAiHmWmgfoS8kBFyp22fJjG pkLMa6ms5RP0uHcIgz9VLHrtl7RgheQh7A== 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Hildenbrand , "Michael S. Tsirkin" , Peter Xu , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1641926628882100001 From: Philippe Mathieu-Daud=C3=A9 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=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: David Hildenbrand Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Xu --- 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; =20 @@ -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 *sde= v, int lun, uint64_t pd_size; uint16_t pd_id =3D ((sdev->id & 0xFF) << 8) | (lun & 0xFF); uint8_t cmdbuf[6]; - size_t len, resid; + size_t len; + size_t residual; =20 if (!cmd->iov_buf) { cmd->iov_buf =3D g_malloc0(dcmd_size); @@ -1112,9 +1113,10 @@ static int megasas_pd_get_info_submit(SCSIDevice *sd= ev, int lun, info->connected_port_bitmap =3D 0x1; info->device_speed =3D 1; info->link_speed =3D 1; - resid =3D dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, MEMTXATTRS_= UNSPECIFIED); + residual =3D dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); g_free(cmd->iov_buf); - cmd->iov_size =3D dcmd_size - resid; + cmd->iov_size =3D dcmd_size - residual; cmd->iov_buf =3D 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 =3D sizeof(info), resid; + size_t dcmd_size =3D sizeof(info); + size_t residual; uint32_t num_ld_disks =3D 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 =3D cpu_to_le32(num_ld_disks); trace_megasas_dcmd_ld_get_list(cmd->index, num_ld_disks, max_ld_disks); =20 - resid =3D dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTRS_UNSPECI= FIED); - cmd->iov_size =3D dcmd_size - resid; + residual =3D dma_buf_read(&info, dcmd_size, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size =3D dcmd_size - residual; return MFI_STAT_OK; } =20 @@ -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 =3D sizeof(info), resid; + size_t dcmd_size =3D sizeof(info); + size_t residual; uint32_t num_ld_disks =3D 0, max_ld_disks =3D s->fw_luns; BusChild *kid; =20 @@ -1233,8 +1238,9 @@ static int megasas_dcmd_ld_list_query(MegasasState *s= , MegasasCmd *cmd) info.size =3D dcmd_size; trace_megasas_dcmd_ld_get_list(cmd->index, num_ld_disks, max_ld_disks); =20 - resid =3D dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTRS_UNSPECI= FIED); - cmd->iov_size =3D dcmd_size - resid; + residual =3D dma_buf_read(&info, dcmd_size, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size =3D dcmd_size - residual; return MFI_STAT_OK; } =20 @@ -1244,7 +1250,8 @@ static int megasas_ld_get_info_submit(SCSIDevice *sde= v, int lun, struct mfi_ld_info *info =3D cmd->iov_buf; size_t dcmd_size =3D sizeof(struct mfi_ld_info); uint8_t cdb[6]; - ssize_t len, resid; + ssize_t len; + size_t residual; uint16_t sdev_id =3D ((sdev->id & 0xFF) << 8) | (lun & 0xFF); uint64_t ld_size; =20 @@ -1283,9 +1290,10 @@ static int megasas_ld_get_info_submit(SCSIDevice *sd= ev, int lun, info->ld_config.span[0].num_blocks =3D info->size; info->ld_config.span[0].array_ref =3D cpu_to_le16(sdev_id); =20 - resid =3D dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, MEMTXATTRS_= UNSPECIFIED); + residual =3D dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); g_free(cmd->iov_buf); - cmd->iov_size =3D dcmd_size - resid; + cmd->iov_size =3D dcmd_size - residual; cmd->iov_buf =3D NULL; return MFI_STAT_OK; } @@ -1617,13 +1625,13 @@ static int megasas_handle_dcmd(MegasasState *s, Meg= asasCmd *cmd) } =20 static int megasas_finish_internal_dcmd(MegasasCmd *cmd, - SCSIRequest *req, size_t resid) + SCSIRequest *req, size_t residual) { int retval =3D MFI_STAT_OK; int lun =3D req->lun; =20 trace_megasas_dcmd_internal_finish(cmd->index, cmd->dcmd_opcode, lun); - cmd->iov_size -=3D resid; + cmd->iov_size -=3D residual; switch (cmd->dcmd_opcode) { case MFI_DCMD_PD_GET_INFO: retval =3D megasas_pd_get_info_submit(req->dev, lun, cmd); @@ -1865,12 +1873,12 @@ static void megasas_xfer_complete(SCSIRequest *req,= uint32_t len) } } =20 -static void megasas_command_complete(SCSIRequest *req, size_t resid) +static void megasas_command_complete(SCSIRequest *req, size_t residual) { MegasasCmd *cmd =3D req->hba_private; uint8_t cmd_status =3D MFI_STAT_OK; =20 - trace_megasas_command_complete(cmd->index, req->status, resid); + trace_megasas_command_complete(cmd->index, req->status, residual); =20 if (req->io_canceled) { return; @@ -1880,7 +1888,7 @@ static void megasas_command_complete(SCSIRequest *req= , size_t resid) /* * Internal command complete */ - cmd_status =3D megasas_finish_internal_dcmd(cmd, req, resid); + cmd_status =3D megasas_finish_internal_dcmd(cmd, req, residual); if (cmd_status =3D=3D 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, } =20 req->cmd =3D cmd; - req->resid =3D req->cmd.xfer; + req->residual =3D req->cmd.xfer; =20 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 !=3D SCSI_XFER_NONE); if (!req->sg) { - req->resid -=3D len; + req->residual -=3D len; req->bus->info->transfer_data(req, len); return; } @@ -1421,9 +1421,9 @@ void scsi_req_data(SCSIRequest *req, int len) =20 buf =3D scsi_req_get_buf(req); if (req->cmd.mode =3D=3D SCSI_XFER_FROM_DEV) { - req->resid =3D dma_buf_read(buf, len, req->sg, MEMTXATTRS_UNSPECIF= IED); + req->residual =3D dma_buf_read(buf, len, req->sg, MEMTXATTRS_UNSPE= CIFIED); } else { - req->resid =3D dma_buf_write(buf, len, req->sg, MEMTXATTRS_UNSPECI= FIED); + req->residual =3D dma_buf_write(buf, len, req->sg, MEMTXATTRS_UNSP= ECIFIED); } scsi_req_continue(req); } @@ -1512,7 +1512,7 @@ void scsi_req_complete(SCSIRequest *req, int status) =20 scsi_req_ref(req); scsi_req_dequeue(req); - req->bus->info->complete(req, req->resid); + req->bus->info->complete(req, req->residual); =20 /* Cancelled requests might end up being completed instead of cancelle= d */ 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) =20 if (r->req.sg) { dma_acct_start(s->qdev.conf.blk, &r->acct, r->req.sg, BLOCK_ACCT_R= EAD); - r->req.resid -=3D r->req.sg->size; + r->req.residual -=3D r->req.sg->size; r->req.aiocb =3D 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) =20 if (r->req.sg) { dma_acct_start(s->qdev.conf.blk, &r->acct, r->req.sg, BLOCK_ACCT_W= RITE); - r->req.resid -=3D r->req.sg->size; + r->req.residual -=3D r->req.sg->size; r->req.aiocb =3D 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, } =20 =20 -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 =3D buf; - uint64_t resid; + uint64_t xresidual; int sg_cur_index; MemTxResult res =3D MEMTX_OK; =20 - resid =3D sg->size; + xresidual =3D sg->size; sg_cur_index =3D 0; - len =3D MIN(len, resid); + len =3D MIN(len, xresidual); while (len > 0) { ScatterGatherEntry entry =3D sg->sg[sg_cur_index++]; int32_t xfer =3D MIN(len, entry.len); res |=3D dma_memory_rw(sg->as, entry.base, ptr, xfer, dir, attrs); ptr +=3D xfer; len -=3D xfer; - resid -=3D xfer; + xresidual -=3D xfer; } =20 - if (residp) { - *residp =3D resid; + if (residual) { + *residual =3D xresidual; } return res; } =20 uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs a= ttrs) { - uint64_t resid; + uint64_t residual; =20 - dma_buf_rw(ptr, len, &resid, sg, DMA_DIRECTION_FROM_DEVICE, attrs); + dma_buf_rw(ptr, len, &residual, sg, DMA_DIRECTION_FROM_DEVICE, attrs); =20 - return resid; + return residual; } =20 uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs = attrs) { - uint64_t resid; + uint64_t residual; =20 - dma_buf_rw(ptr, len, &resid, sg, DMA_DIRECTION_TO_DEVICE, attrs); + dma_buf_rw(ptr, len, &residual, sg, DMA_DIRECTION_TO_DEVICE, attrs); =20 - return resid; + return residual; } =20 void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie, --=20 2.34.1 From nobody Mon Apr 29 00:59:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1641926633; cv=none; d=zohomail.com; s=zohoarc; b=BvQETnuGRGwNNiiAETDtv+zVuQSVjTmceF5KzRALAPYa0+6rEJYqPQPx2vhzMVJrZiyxxtPMy9E/mA1EbyucSrMaAKsKWIkimJkfiSJrE4Z5VxiwlliJI8VzgaCXH2H5Mwqkegp/6zs9NAW4XqYnM2iA2JRM7Acg6My5Op9Iay8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641926633; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Dm0cTZ0uVSvTrDWViyeYPNq8wk38OYgLeR7LOGaCswA=; b=cFZgqMd41J5QadWiQFRtyuq61lihEgRdOlxznfxH1eXBPQs61U/ZHveIrfj0Ppbo3MVDoYXvAmOT77XGMFeZODOeSakG2NJSmB1JVmnById0t0/WPjewPmtzA/JeTI8KhNCZfMKRwVBVA6fB+rj93CifWdhNekMHAbohAlLPirI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1641926633001359.56480807890364; Tue, 11 Jan 2022 10:43:53 -0800 (PST) Received: by mail-wr1-f43.google.com with SMTP id q8so34603346wra.12 for ; Tue, 11 Jan 2022 10:43:52 -0800 (PST) Return-Path: Return-Path: 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) 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=JNBiD9j222hCET2RaIc3uoHNmdkgsuYWVHwwiugxBpLCHcLJk2fHkjT6FR+lszHwZ8 ABpRccDqAowMeZF8AXv+nSbcssFXWC+ITT/V65ERtPcP3SaJr/xQCtRhlQ/dPGgrxZyq mKjD/FENZP95SeEZ214XkIByiGsfNElNq2X9kMEVIBQ/4CyajFz3Wrr/G3A8SplaVwvd u/gkAJ00SY+nvXDzoR7+eYX/xAjzlILpRB1wn/P9dYQTAkI0OVoEEqChUsLhWx5LB50G VaMZts9kpKFUVaK04RIbc0sTawMq/GOm/ZK9ZxX+khM+YZmFsuqmXEypUMhW4yOZo98j xbVg== X-Gm-Message-State: AOAM531ZL90+ENpdnBBbnDb25Py8WnB981eKbzQDKtzGTkUuksitbqB8 or+SiyGBe1Mw0zSQpmeRCe0= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Hildenbrand , "Michael S. Tsirkin" , Peter Xu , qemu-block@nongnu.org, Richard Henderson 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1641926633594100001 Reviewed-by: Richard Henderson Reviewed-by: David Hildenbrand Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Xu --- 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 por= t, const uint8_t *cmd_fis, ahci_populate_sglist(ad, &ncq_tfs->sglist, ncq_tfs->cmdh, size, 0); =20 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, u= int8_t qp_type) "rm_qpn rdma_rm_modify_qp(uint32_t qpn, uint32_t attr_mask, int qp_state, uint8_t = sgid_idx) "qpn=3D0x%x, attr_mask=3D0x%x, qp_state=3D%d, sgid_idx=3D%d" =20 # rdma_utils.c -rdma_pci_dma_map(uint64_t addr, void *vaddr, uint64_t len) "0x%"PRIx64" ->= %p (len=3D%" PRId64")" +rdma_pci_dma_map(uint64_t addr, void *vaddr, uint64_t len) "0x%"PRIx64" ->= %p (len=3D%" PRIu64")" rdma_pci_dma_unmap(void *vaddr) "%p" --=20 2.34.1 From nobody Mon Apr 29 00:59:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) client-ip=209.85.221.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1641926637; cv=none; d=zohomail.com; s=zohoarc; b=TLAinpcWNRvM+zHVMlPZNYAByI3s0OU4gVDfUjUMQV7Giw07z4R+wU2Adgm6E8aPWE4PODqInlJQMygwgHaxkepZ4uSUgrjb4+6WNFuTwcQghIe5TprZmqC+dHgjXa44q9QK3kl5KT7M96IGvaZS3AjxBpDcuYQrOzvPONXsAy0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641926637; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VcdXVqz6chAbbBWxyWqxGtBbnwx8MK1lJ9E6AYBD0J0=; b=M+3AneB3Vz06DrkYaFAJQR6R789SWiNNQeD6yAS9cY0aAchS2Np2+mHsu5ZLZidi7YVeWGNzwy9nFMuKK7RCz98DsazEXyPSU7xo3ljZVWp4JZDjWK9KHSCvbFvtUkoktBqm+6aY6hZFPJO/zcX24U0lUT5BHKlWRrzHJbgdA34= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.zohomail.com with SMTPS id 1641926637891304.3408237065139; Tue, 11 Jan 2022 10:43:57 -0800 (PST) Received: by mail-wr1-f42.google.com with SMTP id a5so30748713wrh.5 for ; Tue, 11 Jan 2022 10:43:57 -0800 (PST) Return-Path: Return-Path: 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) 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=pMdzL4ektWRFqDuLwOauW7ASNd8XBnTHKyuKDCLEVS4QWOdf8/SlQa+ppOTiVYRwhJ 9Io3puxTJLvjPQoqGxEYl97bYRGZbHuy/lHkrh2874hllyiDV+I4umBZ39BVCdeNYywy mpdHqP+KZlFQBITaWfFJpZfPKhK89zOMvmaKUg4UQX8GQ7CurqtknzJT4L6PjlRdUenU 7Rrm78G37zpw8GD89Qn4nHC30BcX2M/b+10NIOpIsILONgq70h7wbqBpG/ERimWhaZmR zuAxHPVRzHgi3+CdfReqVAzqQxbXQiFNgkhqvnNKm3/ygxBQgfb007P5In3D4uPaQz99 EC8Q== X-Gm-Message-State: AOAM532NkRX6bopzXJFvbIAL9PVoOaPoiqFjnlges84NORlgmVy/5Nud MGb7Ik7JoDqigD0WLt2glzE= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Hildenbrand , "Michael S. Tsirkin" , Peter Xu , qemu-block@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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1641926640381100007 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=C3=A9 Reviewed-by: David Hildenbrand Reviewed-by: Peter Xu 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" =20 -typedef struct ScatterGatherEntry ScatterGatherEntry; - typedef enum { DMA_DIRECTION_TO_DEVICE =3D 0, DMA_DIRECTION_FROM_DEVICE =3D 1, } DMADirection; =20 -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 =20 +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) { /* --=20 2.34.1 From nobody Mon Apr 29 00:59:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1641926642; cv=none; d=zohomail.com; s=zohoarc; b=Ka038EFcoxZsEIQwxtoO54juq0f2KBQEcFqrJCYzxVHDD/RIWZ7XEykJNxSwq3fdUrIQG5XT4PumHDX2vQwldoLZbi1kEDorrGdXDUcW15SoC1xhyjhsUmpGPQpcc45wLiVmj/awm1g6fdK5VLGAcAW8135SBpfZzoCWz0UL7EA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641926642; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WT+/6OA6M2ZuFabg8578mYnCq2PeYWmuEbYcmoWBF90=; b=HK1de7zI15BZl83sZz/zZgjt487uVCJCrhvAQSc7Xs0Sm8zdFSAvZkpPcagE/x8gEGr5H3+rgzWFfUVe95+TYJb+Q23Jb7rlTkDvSD6l5tWVIZDyGNTY3mmSIed16GchqJ0fHl9izF3Vm/Fx4MA4mqOLKozzK/JGsJA9yMpFAJM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1641926642771706.9902012296095; Tue, 11 Jan 2022 10:44:02 -0800 (PST) Received: by mail-wr1-f47.google.com with SMTP id d19so18381wrb.0 for ; Tue, 11 Jan 2022 10:44:02 -0800 (PST) Return-Path: Return-Path: 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) 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=STp6EHk7mmplDj/JePwQ8rf2ok6wRUcys716KwZTS8R8wRes1txHsdgb36TrfqVVXw AKOg+b4QjkPJF3/MWV7wxgGwrWI2+4zN3ciGZj0pwc/dN9+1fMkbt0xJLkw/pzeDzUQ2 Jgpu3Jl8qclftUiBRqH//LemHi0/4pIruwgB/LNNcHjoroDwB72s5vfpMVsPenZvQArl z4fvQlkXClsGLADzcEDDZiI3Cy4HBna17IsEv6PD9AxxKiN+LXf+hX50hbNxwJAJisCZ vlBaLCl8XHYjfCcbEFMyclwYz+sNVdjdYJykRO30ISaib2DKtUz3i2/hm10Tr6KqcVMx MY7g== X-Gm-Message-State: AOAM532u0ryhLDcmTE73P3HqZx2YU0zZi+nxAAI60uMr8kR95QNOluMW Q8vouXUnaVXoYyh2WaCHveg= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Hildenbrand , "Michael S. Tsirkin" , Peter Xu , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1641926643360100011 From: Philippe Mathieu-Daud=C3=A9 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=C3=A9 Reviewed-by: David Hildenbrand Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Xu 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 a= ttrs); -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); =20 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, uint= 8_t *ptr, uint32_t len, =20 if (sg->flags & NVME_SG_DMA) { const MemTxAttrs attrs =3D MEMTXATTRS_UNSPECIFIED; - uint64_t residual; + dma_addr_t residual; =20 if (dir =3D=3D NVME_TX_DIRECTION_TO_DEVICE) { residual =3D 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 =3D len; + dma_addr_t pci_len =3D len; =20 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 *sde= v, int lun, uint16_t pd_id =3D ((sdev->id & 0xFF) << 8) | (lun & 0xFF); uint8_t cmdbuf[6]; size_t len; - size_t residual; + dma_addr_t residual; =20 if (!cmd->iov_buf) { cmd->iov_buf =3D 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 =3D sizeof(info); - size_t residual; + dma_addr_t residual; uint32_t num_ld_disks =3D 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 =3D sizeof(info); - size_t residual; + dma_addr_t residual; uint32_t num_ld_disks =3D 0, max_ld_disks =3D s->fw_luns; BusChild *kid; =20 @@ -1251,7 +1251,7 @@ static int megasas_ld_get_info_submit(SCSIDevice *sde= v, int lun, size_t dcmd_size =3D sizeof(struct mfi_ld_info); uint8_t cdb[6]; ssize_t len; - size_t residual; + dma_addr_t residual; uint16_t sdev_id =3D ((sdev->id & 0xFF) << 8) | (lun & 0xFF); uint64_t ld_size; =20 @@ -1625,7 +1625,7 @@ static int megasas_handle_dcmd(MegasasState *s, Megas= asCmd *cmd) } =20 static int megasas_finish_internal_dcmd(MegasasCmd *cmd, - SCSIRequest *req, size_t residual) + SCSIRequest *req, dma_addr_t resid= ual) { int retval =3D MFI_STAT_OK; int lun =3D 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, } =20 =20 -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 *resid= ual, QEMUSGList *sg, DMADirection dir, MemTxAttrs attrs) { uint8_t *ptr =3D buf; - uint64_t xresidual; + dma_addr_t xresidual; int sg_cur_index; MemTxResult res =3D MEMTX_OK; =20 @@ -308,7 +308,7 @@ static MemTxResult dma_buf_rw(void *buf, int32_t len, u= int64_t *residual, len =3D MIN(len, xresidual); while (len > 0) { ScatterGatherEntry entry =3D sg->sg[sg_cur_index++]; - int32_t xfer =3D MIN(len, entry.len); + dma_addr_t xfer =3D MIN(len, entry.len); res |=3D dma_memory_rw(sg->as, entry.base, ptr, xfer, dir, attrs); ptr +=3D xfer; len -=3D xfer; @@ -321,18 +321,20 @@ static MemTxResult dma_buf_rw(void *buf, int32_t len,= uint64_t *residual, return res; } =20 -uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs a= ttrs) +dma_addr_t dma_buf_read(void *ptr, dma_addr_t len, + QEMUSGList *sg, MemTxAttrs attrs) { - uint64_t residual; + dma_addr_t residual; =20 dma_buf_rw(ptr, len, &residual, sg, DMA_DIRECTION_FROM_DEVICE, attrs); =20 return residual; } =20 -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; =20 dma_buf_rw(ptr, len, &residual, sg, DMA_DIRECTION_TO_DEVICE, attrs); =20 --=20 2.34.1