From nobody Mon Apr 29 06:37:47 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=1641286480; cv=none; d=zohomail.com; s=zohoarc; b=OfrxpOsF47ZKCMMgrSiJxJ7c4DHTCSUQoOv3ALulzOHU3kwmYxJ2nBRgyzuyGboYsj1Fc/WDv8mc6OTGo0Q4A+TalFFk2tQV9fR7rI9/oT91O+yk1wCkOfIcVdf2fH1WRqHDCxknPHMNBg3/xubaWMxNAsd/uQ/KWLIfy/RXWZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641286480; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TVx+fgekrB7KNu8OcNMrn1VBpuxsrGQHX6JNVgK7TBo=; b=MUSjiAd+WyiTTG98FECMq8yD/SoDqsxSAGXsvo9GRbqTyRBITFZqxiUqL/XOOtB1SS0KDVfiDObkwUBnupqNdnxI7/Josgw4M1wFzlUnFdOWZetWaRvbMeeJBR+IEWc09Zq3BLloTGjvEjiBdeE418VrHG36e9OiGcc5cXjYblU= 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 1641286480041344.35343282542874; Tue, 4 Jan 2022 00:54:40 -0800 (PST) Received: by mail-wr1-f47.google.com with SMTP id v6so12967877wra.8 for ; Tue, 04 Jan 2022 00:54:39 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id w25sm38652614wmk.20.2022.01.04.00.54.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 00:54:38 -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=TVx+fgekrB7KNu8OcNMrn1VBpuxsrGQHX6JNVgK7TBo=; b=eRxS1U3XBNsoIN9qRZGcptUOPEQ4vqADvezCtG2/pwxRt1gfigWYW6NYR7Fu3qIaPO hNGAgreYRIhYCkIC0GRDOyaqnw4XH6iydSVMe07jpZSHChN7U5p0RZkXolTlHbBTkFSf 3UhOV4z+7UDYpMZDgb+neu9GNRrtWwtrG/6Foqj7v77Pb+9Ug3UjkK16SWUyiLC5eW9l J7GovTuU8KrTwnUKWKoMnykcU9HZB6XOE6HQKi/OkAbEm/leU8e3q4bLRMR5y2+851ta EjYHqebAYeT2+gJ5sSTIRB0Q34/2Ub4oicFFUuoq39vBF17M3lAa8QiRa7YfcUZS94sr PtsA== 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=TVx+fgekrB7KNu8OcNMrn1VBpuxsrGQHX6JNVgK7TBo=; b=OHYKusl2XdykVquvQeik4ud9IB1e3y2ienKptan8tSv3SeAmo2ByIsXYpk2DeyorKc ZGckkEa7eg5+wVqhTdHx3fEygDVd/8Xn3JKzKjJ8M7bHFRt+E8AKCMSghB7YTjkQwhlz gd7AzasYpTzVs20BSpJeQ540clKPguYE7O6DRA/NfR1miCkNwX7peZFCINRO4mJhwsR1 PI2e8DWFmXKGMGOerbexImo9pIY3W7MandwHUfQFbRITdbc26cQhw321boOhRzDKDHxs 9e7eEnWCRiB3fXOgYXqUl0M9DqnWSyVHXs7mWtbERV3oCR4AsJdTTmHL3pI93/tJyqia AX2w== X-Gm-Message-State: AOAM532P3DczBb/80Gtii6e/F75ue966N3JuCrD2677PU/5pQeqKNyo0 rVAF1JjtnQOPW9Ur8yGpeSk= X-Google-Smtp-Source: ABdhPJzXqs9RbpdjtbPmBl/iPhxLtwjSqWUU4iHF+OOTXRuEuNs94Si1K8l8hdn5hsZHhFC6RqWIVA== X-Received: by 2002:a05:6000:11c3:: with SMTP id i3mr41409063wrx.426.1641286478376; Tue, 04 Jan 2022 00:54:38 -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?= , Fam Zheng , Yuval Shaia , "Michael S. Tsirkin" , Hannes Reinecke , qemu-block@nongnu.org, Peter Xu , David Hildenbrand , Marcel Apfelbaum , Keith Busch , Klaus Jensen , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/9] hw/nvram: Restrict stub to sysemu and tools Date: Tue, 4 Jan 2022 09:54:23 +0100 Message-Id: <20220104085431.2122999-2-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104085431.2122999-1-f4bug@amsat.org> References: <20220104085431.2122999-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: 1641286480937100001 From: Philippe Mathieu-Daud=C3=A9 User-mode emulation doesn't need the fw_cfg stub. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Michael S. Tsirkin --- hw/nvram/meson.build | 6 ++++-- stubs/meson.build | 2 +- 2 files changed, 5 insertions(+), 3 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')) 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.33.1 From nobody Mon Apr 29 06:37:47 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=1641286484; cv=none; d=zohomail.com; s=zohoarc; b=PPG7Yrp6oyR6BXyZE/dNChQVsy361/yqeimEDjOcEz68oUrue19AB4KcPnw861QdtkedjNZoP4Vwfi9mvPcsOzgoGYBa9HqJBEgPM0jhc4qXdAE7vwoImOovUtEu9uo0DDyDlnX9EgCfQxSELqXsktkgJN5wAaswPTB3ZAPRegU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641286484; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7poeiDAlvUUvxRbvytrefmDPizDrA/o3E05wUsT87M4=; b=XENFwQbO1qChf6/NjuXbo+1EC6qv6l392qJ/qzy7/lDV242XDDATdfezSCRVhWADpsCP6KfyMquEtLuKKLYSdxd/z3M8ds/v4mFGY5nmQyV4vrouPcQy3AWUSaJvmhf8YETfi18unGJsQbSOYdCs7oPkAjKJC1ssbqa2+2VH+lo= 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 1641286484951670.1184074850408; Tue, 4 Jan 2022 00:54:44 -0800 (PST) Received: by mail-wr1-f43.google.com with SMTP id w20so65678622wra.9 for ; Tue, 04 Jan 2022 00:54:44 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id r7sm36312281wrt.77.2022.01.04.00.54.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 00:54: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=7poeiDAlvUUvxRbvytrefmDPizDrA/o3E05wUsT87M4=; b=UUGEaBcPNOZd+Dbmoy6MFSgbtwK6P7e/c9wozixeIFNndcIjstYEMhf3/8UfcCC7/+ 79J5rLVk8gE2CZGFXzisQ5l76K7eL5t6pF5Y6lD9gTq1CwrHLp5V4JVD0euJKTDVNuox RZmt0D9m/ofWCScjAIqO/+6F7QpTaUMQcmT+Q5cZpVSXYT7FwWApN07KxU3ZqQwDtA1r IyLY1JtWnj3ihha3TENpDfl121v0RaMAQ6mltEDYf8zgDraSAyN+LgJgtx9EqTa2lh1J 3JHPswE3n6LQ+f9T0vpb52IbjW9jtdKNaDZAnMOIklMLZVIHrE6IYVq81hJuzEr4K/6O 2ggw== 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=7poeiDAlvUUvxRbvytrefmDPizDrA/o3E05wUsT87M4=; b=kst9z/X+J9TAwEL8i3g2N1LrzfnBrZjCs9jCAEFnCjw/GrHZz4Qn4BoDO6+h3uEvqk 8SFVic9VMmQ12MCMALRXVrDp9lwLDBD2sqBW2oAmGvOh4VefBaPlRtz9MH4nMwa8yA8+ d4+SW8/ttBwsZhPy1JHUL8CHGdyYa6fOhRWokA3UQE/roGQVD6fBT9CYU1lwTHp/mEX4 2BgZg1nMBQhWAKX/lNvhVcCfdJ47PMezBZqvyn92VOndnTlaEhMY2GMTxlavtIAJsWPV Fte5hQDFrQLXWLSiuhhJ1ICKTgA2C8oUMMBKm5T+l2cPuccYGafj2Xr5pOc4pXnUOtx/ PhVg== X-Gm-Message-State: AOAM530S8+ID+br1Qr3bkLzkcpH+alY/A1Ye09LCHRj/+keS1l6aEL0T 8dGZpV+TaS19WX6FP/lxgfw= X-Google-Smtp-Source: ABdhPJwuO/20isVdDxP2PyzAjyNLAfzVJWXJ3er99Hc6IeVZWz8r4k17PqTyYAqYA+l15lpIkAgS6w== X-Received: by 2002:a5d:5749:: with SMTP id q9mr39548940wrw.17.1641286483229; Tue, 04 Jan 2022 00:54:43 -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?= , Fam Zheng , Yuval Shaia , "Michael S. Tsirkin" , Hannes Reinecke , qemu-block@nongnu.org, Peter Xu , David Hildenbrand , Marcel Apfelbaum , Keith Busch , Klaus Jensen , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/9] hw/pci: Restrict pci-bus stub to sysemu Date: Tue, 4 Jan 2022 09:54:24 +0100 Message-Id: <20220104085431.2122999-3-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104085431.2122999-1-f4bug@amsat.org> References: <20220104085431.2122999-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: 1641286485530100001 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand Reviewed-by: Michael S. Tsirkin 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 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.33.1 From nobody Mon Apr 29 06:37:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) client-ip=209.85.128.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.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=1641286490; cv=none; d=zohomail.com; s=zohoarc; b=WZGQJeSaBzPX0L6POu1exPLvvNKlInvq7O3Ccg7IL1NxJJMERucyBbaeCSsu/lLOqUXrTOn7RS3K4cit04lAlrm/hds+GTiUrnTQd0lCfDjEnJSEiwXvG3Q01ZqgZvUypYH54CHtmOrolXjwZr+pFKwmAbzAXM35MmsMn4dVX3s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641286490; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=U5ZN7of/l34l2Sf8f/6H3euMQxJOF1roUgmAROhi/go=; b=BR6QwFF8x3qziaKVzSVObGWPGck7DvAH1NRvs0/kpC1PYnCIit2uY/drNp9vlUVUuyZjXAkOKKZ/AsCmoyTRI98U5EebZkwWWP2OTOLyUrJBLN7RrPah3IaKo8eJv9Xq419rm/gTc3pYJHCSJUfb356WrbTbCRXZy5ltZxEK7wQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.zohomail.com with SMTPS id 1641286490083387.33740208082463; Tue, 4 Jan 2022 00:54:50 -0800 (PST) Received: by mail-wm1-f50.google.com with SMTP id a83-20020a1c9856000000b00344731e044bso1048421wme.1 for ; Tue, 04 Jan 2022 00:54:49 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id j13sm42333500wmq.11.2022.01.04.00.54.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 00:54: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=U5ZN7of/l34l2Sf8f/6H3euMQxJOF1roUgmAROhi/go=; b=W3Em5YHrKGlMUyrF8bJUJXMMHZG+Tu0W61tJVatf4ebQBFr2Op2V26goFiHz3/CYvX EV51Q+wp4HA6QnBxOqzB5jz0ACXKiKSckcTwGtewBUtKC2ap9RZN2N64hOVlTPsGB12O A8mEa3fTW/CMxbghJw/zrjSp8tH6cRtbqrT3ApypkAHii767CbCacJlv3R4qZpJzkxum Qtb4JpTXoBbhUCuQBEXKVqQFlbpSyG+fxNfjjVD06onjuTIQx8Rl564g+l2II0KtiOqR zdVtmn0Sfk/6aYmlsoENx6qX/C62ajmVpIlO7oF5UKRcvanL9k0tYGK0bSAjRuVayMuh wZIA== 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=U5ZN7of/l34l2Sf8f/6H3euMQxJOF1roUgmAROhi/go=; b=Ac3zmb6dTrdHuQXz40sNXOwJa8vP3eKK/qd0kGoe9BJdGU3wBHIf1UO3uPk6S0BT9J wYTGe2yFO2Vy/8lyTExtrQvbwgV6Kbfs9J3O2rrylTWLBLWogbiU2Wuu9/63DpLPSYe/ iTujJBlD12pu7oaGK6/axQP/fCKZwaB+dFtQaeQW8PpdjXj5FKkuxvBkK964LRzD9Foo 2PdehAZpqGcWyh1KinYihEhAgnc7uw43ALPQM1I1Qn/TDWkVx5RnkjPiwzTTHYND80mT 2rJksJmohSOg5LqnVOzmYilXBn7BorWH9zEIRq5Jr9JI41r6vlpxYJYE4XDdXIjPrb47 NYJQ== X-Gm-Message-State: AOAM531rfvd0VZvzAGPuDSCpOggejYMbvhb6x0naEc97vvP2NcfMhaME jengwsQ3bKXVBo/uARLXQYIw2JQngYgMnQ== X-Google-Smtp-Source: ABdhPJxCXzCsr84h4XdRU/YKoJVUjZfQPsKZmczKt2pSGHILzDqI6ElLFpHM3VDVupA131nO9G5EEw== X-Received: by 2002:a1c:4d0d:: with SMTP id o13mr41448660wmh.70.1641286488230; Tue, 04 Jan 2022 00:54:48 -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?= , Fam Zheng , Yuval Shaia , "Michael S. Tsirkin" , Hannes Reinecke , qemu-block@nongnu.org, Peter Xu , David Hildenbrand , Marcel Apfelbaum , Keith Busch , Klaus Jensen , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 3/9] hw/pci: Document pci_dma_map() Date: Tue, 4 Jan 2022 09:54:25 +0100 Message-Id: <20220104085431.2122999-4-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104085431.2122999-1-f4bug@amsat.org> References: <20220104085431.2122999-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: 1641286492310100001 From: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Michael S. Tsirkin Reviewed-by: Richard Henderson --- 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 5b36334a28a..07f08aa0626 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -876,6 +876,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 + * + * May map a subset of the requested range, given by and returned in @plen. + * May return %NULL and set *@plen to zero(0), if resources needed to perf= orm + * the mapping are exhausted. + * + * @dev: #PCIDevice to be accessed + * @addr: address within that device's address space + * @plen: pointer to length of buffer; updated on return + * @dir: indicates the transfer direction + */ static inline void *pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t *plen, DMADirection dir) { --=20 2.33.1 From nobody Mon Apr 29 06:37:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) client-ip=209.85.128.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 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=1641286494; cv=none; d=zohomail.com; s=zohoarc; b=hX0TelKWe555YG8cQ5zC6wX0cCOabD/hhoxnsrgMj1EI5cvDj6SWmgF36wkaoSA/mn6yD+9YoCzDe3KFq0f9yDYiF6OEWnmK/HWapNm6v81bb1768q22FzzxvBFgmXTqcotSzwo1TyTQtXedTiq7OhRoXKf0HRQX4nbLcN+DVpc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641286494; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yvZa8b0WHcG2jEyELY6TUmGBIF4NV8nnHE4fxcg5oio=; b=L8GxsG38B4fN5YlJx/fsPA2eExq2MWxiNWkY5S3GQx2qoA9VcpmHpwxMpnHocAK57Gdy01NXWZOwuzPdZGaG/4PlDOFFt+Aj0cd+jNJZ24r5T1GvM1zUWLfAwTwpxWqEAWvIGvbkbGT4GbNUlcvkYp7oD/8vKOILYSB5TDUxifA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.zohomail.com with SMTPS id 1641286494802228.91162420950877; Tue, 4 Jan 2022 00:54:54 -0800 (PST) Received: by mail-wm1-f51.google.com with SMTP id o30so20231879wms.4 for ; Tue, 04 Jan 2022 00:54:54 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id s207sm36214809wme.2.2022.01.04.00.54.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 00:54: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=yvZa8b0WHcG2jEyELY6TUmGBIF4NV8nnHE4fxcg5oio=; b=g6nj9j8JrL95fVT5zjGsSHYoNN7XUU6cCK6X/6IbBZ5x+EvuMvGuI5OKmpYIBVlHNm Z5/58QuQh/vMM+08mfzF2jxxYfueGNRXXUM7WkDolWETpc6s129GIR2JOEZt0Uk5Kwfl dyvMDk2FtP8It9pUXICcPQuCO8vVl/VjWr+lMa84T96u+VVjzwtDaWWy5mFZuUku/ARX vD9onWbDEBu567kwjPYZm4WqHrXjf71Hu1A3/87E9/2JX/3CXoiQzEeQDrPpLFNT7M/+ kDJYNrLM4UT2IhHP43khmqWmbnQBBx7Z/jnzqJb9YSI2ErH38vXiqNElLn/+u5WTJY3L NJKw== 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=yvZa8b0WHcG2jEyELY6TUmGBIF4NV8nnHE4fxcg5oio=; b=VRWyoU4Ooh1ayIoDVB5LO2VKGw7jv3Xtqn1nZ0YjsAkDKMmao7newV/S12fChlS7SJ UfH7tG1RLqUpr5QWq1W2DB550vjMvUA4+KpC1jopMN/YnPjS93y+pacfDYe+Z77UXIuu qBCMC7fMaJdTCBvDCemx5aKrXAd2EY0RlqU14tARbyUOM1WiZ+ITT4Oy3jeou36EMqDb DXV6qkqOaNR97p5eInv5wQHcYBvnwMjs00NKvQRPyNLHHpYLOyMpjq/VlbyfVdEIWlPE Wqq/5crhRgOVwXJLKDMoab7VHow+XYsBDq3OO9lTBIXbvlLLPHQnTLBVoS053Y24fm2+ f48Q== X-Gm-Message-State: AOAM533AsnKzBr1lx/bm8gnCRsv01OTLC7ZzvTO7FDX1/CU7Ukbrwb0Y N4j8vZ4m9N60S1smcI//cbk= X-Google-Smtp-Source: ABdhPJwgiFY2RpJKFcyhpprvhgR/vzhQBUWzykDcC8yWRIdLtUldVwkgYFfoFXFcsFS4KCsWIPqp3g== X-Received: by 2002:a05:600c:3514:: with SMTP id h20mr41249559wmq.62.1641286493150; Tue, 04 Jan 2022 00:54:53 -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?= , Fam Zheng , Yuval Shaia , "Michael S. Tsirkin" , Hannes Reinecke , qemu-block@nongnu.org, Peter Xu , David Hildenbrand , Marcel Apfelbaum , Keith Busch , Klaus Jensen , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 4/9] hw/dma: Remove CONFIG_USER_ONLY check Date: Tue, 4 Jan 2022 09:54:26 +0100 Message-Id: <20220104085431.2122999-5-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104085431.2122999-1-f4bug@amsat.org> References: <20220104085431.2122999-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: 1641286496595100001 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand Reviewed-by: Michael S. Tsirkin Reviewed-by: Richard Henderson --- 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.33.1 From nobody Mon Apr 29 06:37:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) client-ip=209.85.128.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 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=1641286499; cv=none; d=zohomail.com; s=zohoarc; b=W6PaKbL/k8V5YQHORt5HBlLecPOtzcNBQ5xPCUZ0HQwGlAx3rN0saQBDhE0fjZ6mJRsiluxexVyCB1yhpxxuZRgWKbqRlxqNYLbkA3DiTZpVzv/P9V72eExcrBPj2iP1Hg4lYtkKqpQHa5dwexhyJbhWHuWc6CZyxRq4LTCWegA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641286499; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2os9m/hAMb49KMmbUKW6kq47tz90uuYsWaU1wqS4b0M=; b=K3XOBr4ulc2dOvfQeoprv0rU3FvAOp6/I65Bhx/cZdwoZy7v/bv99WzQ79rpvwjLXiBv8rNQlTvKY5plK6pD1QSc9LEiwIIVxx/w2e0q8Y84PZ+9tREQfjWW7wqbOQnixk5QBuElme54oif+3LoefE+cJwFmgt+iw8g5gaSYA3I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.zohomail.com with SMTPS id 1641286499600735.7136647003512; Tue, 4 Jan 2022 00:54:59 -0800 (PST) Received: by mail-wm1-f44.google.com with SMTP id f134-20020a1c1f8c000000b00345c05bc12dso1049543wmf.3 for ; Tue, 04 Jan 2022 00:54:59 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id 1sm30724345wrb.13.2022.01.04.00.54.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 00:54: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=2os9m/hAMb49KMmbUKW6kq47tz90uuYsWaU1wqS4b0M=; b=eon27ZHzE6kVFkSCXuB/vHROaK+pZR1+V5NgCie8h8mqyCmVDASbv396vFz5ZYuzUA SSe1m2CTefwVKcHBuKGdYUt7D7Exo6Tr/iSD6SCvhSxx0ocCli+u/mPpxlHKDnlWE0B4 Fxk91EG9WjP2bbNua77T9SxaCXuB8lPdLK/HqbNpQu/6pmrc1olRYquxhs6dkH4N5jp1 H0dLyZnqeNXhumRlQPKqovZJGudH1GecDZLUthdr4ocVQ8Scsz6N0GxQdD9sC86rpPJE rgD64yyPRWQ0aWnvlIa71H9eHmJCD2wgjdioWkYz0LcaxtBdZ1KKHGyZ7Js81TiVj4yh c7Ig== 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=2os9m/hAMb49KMmbUKW6kq47tz90uuYsWaU1wqS4b0M=; b=1rZ7lgTuGeuNc72RDcx6usO/ZxZ0lImkElLCLr2QhRHQwOfNwtC1cpIB7YgV0qmgql IvkEk93rKKEzje8IqzsiuZFtPPO+UbRc5aE3OlVosDpL9qrfJ/5rBfuL6mMEV8hnLCAB zVGBjZvKSGSgyDuqV0vXPMsL2L6j0wbFmJhAl1U6C1RXWnOFoT5q0PhJFzEd9gUDAc8H KiBp8cPVYZDzy9Cb5oIbui89dlYeNhdCCXOgqagmgssn9CAWjU7tZKW1S2eh4kXTSOMt uLtzoEWo+VHDKwX+m9xDPXRlJQnYUoXtgQXjXASolVXuj/I5klJPegn86SAr9E1PtyDJ fH5g== X-Gm-Message-State: AOAM533HZBJ+1qqQTZI8Dcfad/y2hWAmrTjsNguUs2It0Pa1Q0FEuTs7 If53VdIBpj7dRUUZCDrWKyPIDBUL4CqP/A== X-Google-Smtp-Source: ABdhPJwMSfoSzPN+Qcf+zke1q+FXyOMvCyCA4iHoLM90L1ANOxvEcfWAY73Zvd9FPY7OYTOGn3359A== X-Received: by 2002:a05:600c:1c18:: with SMTP id j24mr41927620wms.189.1641286497911; Tue, 04 Jan 2022 00:54:57 -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?= , Fam Zheng , Yuval Shaia , "Michael S. Tsirkin" , Hannes Reinecke , qemu-block@nongnu.org, Peter Xu , David Hildenbrand , Marcel Apfelbaum , Keith Busch , Klaus Jensen , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 5/9] hw/rdma/rdma_utils: Rename rdma_pci_dma_map 'len' argument Date: Tue, 4 Jan 2022 09:54:27 +0100 Message-Id: <20220104085431.2122999-6-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104085431.2122999-1-f4bug@amsat.org> References: <20220104085431.2122999-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: 1641286501089100001 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand Reviewed-by: Michael S. Tsirkin Reviewed-by: Richard Henderson --- 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.33.1 From nobody Mon Apr 29 06:37:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) client-ip=209.85.128.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 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=1641286504; cv=none; d=zohomail.com; s=zohoarc; b=gaZtWZUPNFJamGLJ1QKrKkXgiBWE8b6dPDD1kmwrPdjmFqstZ/i1q3WxtELmOPueZ2vGwZXujbrMQpaVTuyZnc7CvcLW+nEIvlvy5dQ66IstAcP/fMkpu5liWZOI9u57C8J8an3Sb3CcD2vtOqoQwE14E9lrdsAiCTtqvzVaeP0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641286504; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=v7HaJxxqntVZ1TLETexC8+Q7pbMmwPlIcFfQ+vDRPaA=; b=G9Ciw/HgrNMHFQqwet516ewuu4/305ct1gG7mM6Z5rmy7aiidJAWTjrnIp7jyHHYgoVi3qmA1WQLbRAL5H1uldcgHViuuKhg1SYSiVa9bUfusoUCx874pd2SWcy4Wi/pVTEWN34My+1WD8TCog7RaU5lj+yho2ADLArCaGVknrk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.zohomail.com with SMTPS id 1641286504692959.7575826380228; Tue, 4 Jan 2022 00:55:04 -0800 (PST) Received: by mail-wm1-f54.google.com with SMTP id a83-20020a1c9856000000b00344731e044bso1048765wme.1 for ; Tue, 04 Jan 2022 00:55:04 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id z17sm38958719wmi.22.2022.01.04.00.55.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 00:55:02 -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=v7HaJxxqntVZ1TLETexC8+Q7pbMmwPlIcFfQ+vDRPaA=; b=aY/GoZT9JHhOR7HhIr6FX/V8LRGaMdHpxdiQ3Lj2m7VhJXO7gMyYVFJDHwSNvm6iBJ vAftDq0WLOoxdvlDxfv1QiCllc2NO4v5LIakANvKHj4k/0Z2sdbtdLJKuHuccCBHdHRF TEKOQGdD2mFx4NT3SW6HuFfJ5K2FE4qc8xCItGVs+BjkxngQ3iH2STUBXrIWbDmXvTlm f5JLlFAX+3JxElVKUMo4oDJyLUakL/z3A3PjSpWw76xlX3HMqj20COOc15XJOWh9LOzf 2Ykz9tyOaVLz3VOYZ6yV/tsGjWxsmEVEYZY1RsGqD2G6JJWpk7i2fPpJZhv7jDWPsQPw zZUw== 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=v7HaJxxqntVZ1TLETexC8+Q7pbMmwPlIcFfQ+vDRPaA=; b=c8XBog3UW4PadvCtGLYfXxO68cBgMSLoJqVrrTge3nE448dIon43JiLHXII0IHZlbY x/97f97w4i5ukvnEC7z+krj5zEA4XUBnwbmQ9EhsbESzVo7Ew5FyII/UOK58bCRtZdQQ 8RO7C4VCURmBtNOEhjjioi9Ry2AWRkFPSvKFwcXil0uz4JXpbNiVy08/7j6XlPwsp5CM 91n2TzbuV6dtf/BLz6VWqgmlG8p7mB+LO64Im5rxspdUw1IDe6M+3KwRfAuhme03XMHM NRfaLup7Xdhf6dSz2EFbfShFN/gOSJt8/6RSe1eo4fnEwV2BgNm9ACxyewoELTFNKkhJ zaNg== X-Gm-Message-State: AOAM533PeNH5r8iMp/mbB99ijrGlNpF4gdvY0tgubZwVO49myki6it1Z 34iMehK2cS57XObtv92v6Cw= X-Google-Smtp-Source: ABdhPJwJX0b4U9aLCfGsxAWW5Rhg49aqVAeRyIogoQS2imWQMnQ243c52V8Jkp3jNSjABwXvvdtg+g== X-Received: by 2002:a05:600c:3217:: with SMTP id r23mr40256534wmp.77.1641286502873; Tue, 04 Jan 2022 00:55:02 -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?= , Fam Zheng , Yuval Shaia , "Michael S. Tsirkin" , Hannes Reinecke , qemu-block@nongnu.org, Peter Xu , David Hildenbrand , Marcel Apfelbaum , Keith Busch , Klaus Jensen , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 6/9] hw/scsi: Rename SCSIRequest::resid as 'residual' Date: Tue, 4 Jan 2022 09:54:28 +0100 Message-Id: <20220104085431.2122999-7-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104085431.2122999-1-f4bug@amsat.org> References: <20220104085431.2122999-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: 1641286505798100001 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand Reviewed-by: Michael S. Tsirkin Reviewed-by: Richard Henderson --- 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.33.1 From nobody Mon Apr 29 06:37:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) client-ip=209.85.221.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.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=1641286509; cv=none; d=zohomail.com; s=zohoarc; b=fgrZsEMfRMR+snuoTqypkKV/xlrlW+od+h2D2ugwzMAED2JxZvtOFd0wZrVRUwoim8QuVLNlIDslO2xirt5bI1Ot/hI8Up828VV2oZsjT1gNY9E3xwNW5ptnnqFuBuMTpKt8t5gtXHT1oE3CzLB8Uwmhc5/FuSxeocGCwGv/vDs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641286509; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=60PmjFSOz4LxR71qC2E79A5XbDuODi29+fZxuczWIE8=; b=dslufo2TAxU4RnMtNLPlaUuUcL5ds8ppKK1FGbPpiVxDeqXuP7epzsSj6j/4gOJTpYBhhuyAJXgPUPddEldryF0sVx8FLdEvramI2T8G3RZxIY+2mJXvNn1u9VgOSD8XslASUUKuePhxmVwXwP8mHrNbjffgYbkM1myjo8L207M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.zohomail.com with SMTPS id 16412865094172.0753227637756027; Tue, 4 Jan 2022 00:55:09 -0800 (PST) Received: by mail-wr1-f41.google.com with SMTP id t26so74658070wrb.4 for ; Tue, 04 Jan 2022 00:55:08 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id o12sm41016147wrc.69.2022.01.04.00.55.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 00:55:07 -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=60PmjFSOz4LxR71qC2E79A5XbDuODi29+fZxuczWIE8=; b=j7A2NkZebqOoWz09xC1EoxqzCYLROCu6eLnXunDkLMCGvCjAfxYB5BloqpknMU2OHp fLFr9l+cE/k19iD4xh08Wl32wT4TcL5W/buR+xr5OJ1M04bD5o/3+ZRbWXqZ+09YNVma Aum2JNTvfxUERosCUUrtGwCdsMB6DMWaGKQeWsNhL4sKoSYUXET5nVuCkr9sj89jB4sX 6iQ2wpxhHO0X6aHbQorDedoYo2SXR0nyscjWa6R4HhVPyUNX1EAWNZwLc1EfSm2WjluE EWfbQdAO2+U1Qgdzzi6Wj9AXH7POeko0AqoIH8bLgdroyPR+85lATBKy6aigEU13HstT qVcQ== 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=60PmjFSOz4LxR71qC2E79A5XbDuODi29+fZxuczWIE8=; b=CEGSQSu7x44sABQ1Y3QfpqFP+PTMFkB1laX7uUC0d3ssz6LN/tCvdo+J7esI7/7U8W xPXAw+PO4X6K3sxxhvJPHRDmZPonw5joeMJpUVD0lk6wHUJPlUJ/BrSU89NPamA0MqOO BtqtpnoWRiti0NZL/gG7WoSFvV3GiXOs+64Hg/5/ASpuES/VBxse7GpLV8NrVL9Z1u9N 9Vg/bWM6djE1jFArwXPE32+OL4/4Hh0XP5BmpBAFsyYR4N5eKYNlUXMGYueXYFir6HBZ qQBklXgL9qdsfDlXVwMPmDr2Khran/DzYWF8c4iW03i03AKEzDgavoyt9VEgrI0yN3Xy EXCw== X-Gm-Message-State: AOAM5326GT5WMJQ4vBfxc70Ny4TNIzNTmqxfuk1PO9g6kDG5TkcL8s2P uTBQfRgsA+UeNT7jqslZo54= X-Google-Smtp-Source: ABdhPJzFavXeV9MJU5Gpvuv+L1ysPbD5FcDJkIJ0JaEuttyUiJolJg++YERDStfI1KvZIEqyHc0Jtw== X-Received: by 2002:a05:6000:1861:: with SMTP id d1mr41723680wri.338.1641286507769; Tue, 04 Jan 2022 00:55:07 -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?= , Fam Zheng , Yuval Shaia , "Michael S. Tsirkin" , Hannes Reinecke , qemu-block@nongnu.org, Peter Xu , David Hildenbrand , Marcel Apfelbaum , Keith Busch , Klaus Jensen , John Snow Subject: [PATCH v2 7/9] hw/dma: Fix format string issues using dma_addr_t Date: Tue, 4 Jan 2022 09:54:29 +0100 Message-Id: <20220104085431.2122999-8-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104085431.2122999-1-f4bug@amsat.org> References: <20220104085431.2122999-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: 1641286510906100001 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand Reviewed-by: Michael S. Tsirkin Reviewed-by: Richard Henderson --- 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.33.1 From nobody Mon Apr 29 06:37:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 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=1641286514; cv=none; d=zohomail.com; s=zohoarc; b=D24JijYzClWjgE0vm9lBks37xH2Zbm0TRry2/yTVcd2Dk5bEOAnhN9OjpBmoKmX/hZaXXUk9expoFekqmMHAwekIHuMYdScMpoJaRzpR2p0eG10HRk+i0MRqG7XutNK32NtbKM0GUuMgFwRcEOcLawJFRwj+j5kzlEQHoNJP7yQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641286514; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cmRogI84P91nfa98uvr8BVtfhjiiaopdbhNVSNNRvB0=; b=e8AyRkGGa+/9RB3lRuXRnsmHobsAgcO+dqBNB754+HF1HsBw3nk3swZMb6Pxp7i7PojnVlW80Ae2lb4N6ctpE4N9r1So9Y8LDgMttIj8Fq2Wzfnm7PSiZ0GJhHB5VZR/WQkFmUAGxQ6RfDUfgQE37xzduUoMVjhQQSte56tevL0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 164128651440428.085981103114932; Tue, 4 Jan 2022 00:55:14 -0800 (PST) Received: by mail-wr1-f49.google.com with SMTP id s1so74692595wra.6 for ; Tue, 04 Jan 2022 00:55:13 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id j13sm42334745wmq.11.2022.01.04.00.55.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 00:55:12 -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=cmRogI84P91nfa98uvr8BVtfhjiiaopdbhNVSNNRvB0=; b=fdt7f+u7weJnQkVIu0YXI61TyINqw72SzElzqUN2S5S0x5J2VYiZzuAp5/qpOZSAeo HOUk3vBIIPBZFwmZpL5lYOcvbPmnaOmIwamO4li+k4D1DvVw1FwDalcvUEwozi/VMYZm DSHnPZ7/zRNH+egQc5OfoIf0iZJsgDz/VyIFVseUQjytU+cP3peGOzZf8DnP0by1F7as 6Jk6Zd927wrUIu99qaFZxJ2Oy2c/SQecgwGIKi2aVha71Ycblkk/SjcPUZiiQ57qB5oV FYz1TmGtQUkI8zhvnyfuu3C5GoWHZcPTE6CLuK85pOsNcOyiMEP7pn3r0DDd9uNw6Rxy satQ== 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=cmRogI84P91nfa98uvr8BVtfhjiiaopdbhNVSNNRvB0=; b=eki+BCk3t4EK574+4Jdl2HCAjhgBWFtCYmZBbtDuyVZFuOSkgI+z8WLcm3GKzIK4pF WjWqYDQ1yHuS+HrlXonIAw0tkLljmedD0o3w4hcG2ND+JAEWdMuCpmFLqh2jRpckrd9V 0glqIzaaACy2hmYYXhRBhixaxM0TI76xWunH1v4iD5I5/xpQxryZhxEzXlaws8LA0J0u uc1iWhLEjZEQetNWZy6D57HpzX7pvPvGOyPBf7OtnvL0OltyXDz/Z1quu7e5UwlR0nTu rs6OOOpeSbiL+2T/TSa4uxsWpNjeB4zvhgDJ7wxOmsb4vDDOSVHcZOmf3C2PzgfnZJf0 p5oQ== X-Gm-Message-State: AOAM532WdKYgeUrtnWEFwABpJ9UCdQDnMVuxJIUaGQRAkCm3L0iWxnxv /eKLouDdxxRJ20aopUGjcyA= X-Google-Smtp-Source: ABdhPJw4VD+Lh1xY1ONSK7Viorw3are6FsQWtoyCIBq7qbNnmbkeBKtTJMbAJqrdrfOSqM43RXwWFw== X-Received: by 2002:a05:6000:1188:: with SMTP id g8mr33361315wrx.134.1641286512710; Tue, 04 Jan 2022 00:55:12 -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?= , Fam Zheng , Yuval Shaia , "Michael S. Tsirkin" , Hannes Reinecke , qemu-block@nongnu.org, Peter Xu , David Hildenbrand , Marcel Apfelbaum , Keith Busch , Klaus Jensen , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 8/9] hw/dma: Use dma_addr_t type definition when relevant Date: Tue, 4 Jan 2022 09:54:30 +0100 Message-Id: <20220104085431.2122999-9-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104085431.2122999-1-f4bug@amsat.org> References: <20220104085431.2122999-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: 1641286515529100001 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. Move QEMUSGList declaration after dma_addr_t declaration so this structure can use the new type. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand Reviewed-by: Michael S. Tsirkin --- include/sysemu/dma.h | 22 +++++++++++----------- hw/nvme/ctrl.c | 2 +- hw/rdma/rdma_utils.c | 2 +- hw/scsi/megasas.c | 10 +++++----- softmmu/dma-helpers.c | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h index 0db2478a506..7a8ae4fcd0b 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; + dma_addr_t size; + DeviceState *dev; + AddressSpace *as; +}; + static inline void dma_barrier(AddressSpace *as, DMADirection dir) { /* 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..54340929334 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; --=20 2.33.1 From nobody Mon Apr 29 06:37:47 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=1641286520; cv=none; d=zohomail.com; s=zohoarc; b=cNoLbI2VYu+/3Big6ifFebI8TMEGwarXyCZzZNOzAk/5f3+XHfB37Nrk5Al+VdvX1vPzvAR75D84S37TF0w6rkNPYgMJwHRF+tu6OYaBeOBIEKV+8IHo8aZSrCgqKVElU+C4+vUgSMUsNmcsFvoDhSFShwbG1LwNZDT1h9Ew1ls= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641286520; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8N7FtTlMliBuDLbCkXxIHdoBmGQFWFeFdYuVc9U6SuA=; b=Tplb3RQ9ilzM8sGxy9Er0pNu4PbwNrhIvY86OTmHME1l1GmYoEGpSbSD84pModdfK9qcvQRY/Z7lR8MbfRwenum6gnAZ9PP9xZXI+4hxWBZrdRYp4etZGAgz7Q4HNyKxXKbq2+kBnR9yDCymU/aWF44KzVvnmJQ2J3nf5ZoXSzg= 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 1641286520091229.65871993829228; Tue, 4 Jan 2022 00:55:20 -0800 (PST) Received: by mail-wr1-f47.google.com with SMTP id w20so65681281wra.9 for ; Tue, 04 Jan 2022 00:55:19 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id f16sm49194947wmg.27.2022.01.04.00.55.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 00:55: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=8N7FtTlMliBuDLbCkXxIHdoBmGQFWFeFdYuVc9U6SuA=; b=eO/qW9gmxS41uZBW+yACIFqs0pEXvo67JMBTX5V10NSR86N664i8dIXXeECt6WWna0 nxpytdiJjUXnLihiH7RcNKyPlUPtczsOOlsTfcZnheRiLxpVWXnxOjDOGMbzhjo38jNY cC+yDxLfLqhn0Z0h/aJp1nUJZuaGNnmBt8jQ81FRK6fSHq97NiJE0IfOYnka+ZgJDe3O WOa0K3s6eSQGJVW9fuLwQAsSwpmi9G1CVmTgnLSdlBPnjDcREPdfqXeKtFxVHbvHXIG9 CuYSbXiBmtU93vj9qxcGZbyPntn2qszDRFyd2QQPoaTpeQjCGqPaVcsC/0QYOlbP54Lr Wipw== 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=8N7FtTlMliBuDLbCkXxIHdoBmGQFWFeFdYuVc9U6SuA=; b=7DgvbVMw6yyAvrb1dom73C/brXUYBUFjKYlhUemLzalRd1lShnKIM8SxRytn+eJuLS yQzbPrzfpuN/ZeZz3Ax4CootfIO6JrB0NrkmaQKub6HlrLdVQW9yb6eArsIbO2JQPLbt Gki5UWITr25VIEGbaHbLcBUadxfOypwdANSERcihcMEOYSbotxkVEqMA5lgte1+tdHbM kKiW3mym3mLgNTin0Gc0Ti8P6PxK3mP7+mwqjqtGv021qy9BERwDYUcl1QsQ+baFLZoM EPkRXzNlUGqpsx0drOY4feCmpJVpXTYm6hlV4kxEjzLIzvXLjbHAdjvvXRzZ8AESik+v JNFQ== X-Gm-Message-State: AOAM5331dLuQx6f5NwZm46oKmdXUUPsWWwU5Ih9PTHdLx6IjyI/3jsUw 2L9ooetdyfwst8rcvcsfhY0= X-Google-Smtp-Source: ABdhPJws7b5B5cggrySe8rNVumVno6GMuKYCsIV7y7FABkKR2gnbN6xjU608T1C3x+5hAVS8eWiOxQ== X-Received: by 2002:adf:eb87:: with SMTP id t7mr34596294wrn.147.1641286518315; Tue, 04 Jan 2022 00:55:18 -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?= , Fam Zheng , Yuval Shaia , "Michael S. Tsirkin" , Hannes Reinecke , qemu-block@nongnu.org, Peter Xu , David Hildenbrand , Marcel Apfelbaum , Keith Busch , Klaus Jensen , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Klaus Jensen Subject: [PATCH v2 9/9] hw/dma: Let dma_buf_read() / dma_buf_write() propagate MemTxResult Date: Tue, 4 Jan 2022 09:54:31 +0100 Message-Id: <20220104085431.2122999-10-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104085431.2122999-1-f4bug@amsat.org> References: <20220104085431.2122999-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: 1641286522140100001 From: Philippe Mathieu-Daud=C3=A9 Since the previous commit, dma_buf_rw() returns a MemTxResult type. Do not discard it, return it to the caller. Since both dma_buf_read/dma_buf_write functions were previously returning the QEMUSGList size not consumed, add an extra argument where the unconsummed size can be stored. Update the few callers. Reviewed-by: Klaus Jensen Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Michael S. Tsirkin --- include/hw/scsi/scsi.h | 2 +- include/sysemu/dma.h | 6 +++-- hw/ide/ahci.c | 8 +++--- hw/nvme/ctrl.c | 4 +-- hw/scsi/megasas.c | 59 ++++++++++++++++++++++++++++++------------ hw/scsi/scsi-bus.c | 6 +++-- softmmu/dma-helpers.c | 18 +++++-------- 7 files changed, 63 insertions(+), 40 deletions(-) diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index b27d133b113..1ffb367f94f 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 residual; + uint64_t residual; SCSICommand cmd; NotifierList cancel_notifiers; =20 diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h index 7a8ae4fcd0b..a1ac5bc1b54 100644 --- a/include/sysemu/dma.h +++ b/include/sysemu/dma.h @@ -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); +MemTxResult dma_buf_read(void *ptr, dma_addr_t len, dma_addr_t *residual, + QEMUSGList *sg, MemTxAttrs attrs); +MemTxResult dma_buf_write(void *ptr, dma_addr_t len, dma_addr_t *residual, + QEMUSGList *sg, MemTxAttrs attrs); =20 void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie, QEMUSGList *sg, enum BlockAcctType type); diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 6c727dd0c08..7ce001cacdb 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1384,9 +1384,9 @@ static void ahci_pio_transfer(const IDEDMA *dma) const MemTxAttrs attrs =3D MEMTXATTRS_UNSPECIFIED; =20 if (is_write) { - dma_buf_write(s->data_ptr, size, &s->sg, attrs); + dma_buf_write(s->data_ptr, size, NULL, &s->sg, attrs); } else { - dma_buf_read(s->data_ptr, size, &s->sg, attrs); + dma_buf_read(s->data_ptr, size, NULL, &s->sg, attrs); } } =20 @@ -1479,9 +1479,9 @@ static int ahci_dma_rw_buf(const IDEDMA *dma, bool is= _write) } =20 if (is_write) { - dma_buf_read(p, l, &s->sg, MEMTXATTRS_UNSPECIFIED); + dma_buf_read(p, l, NULL, &s->sg, MEMTXATTRS_UNSPECIFIED); } else { - dma_buf_write(p, l, &s->sg, MEMTXATTRS_UNSPECIFIED); + dma_buf_write(p, l, NULL, &s->sg, MEMTXATTRS_UNSPECIFIED); } =20 /* free sglist, update byte count */ diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index c3c49176110..1f62116af98 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -1150,9 +1150,9 @@ static uint16_t nvme_tx(NvmeCtrl *n, NvmeSg *sg, uint= 8_t *ptr, uint32_t len, dma_addr_t residual; =20 if (dir =3D=3D NVME_TX_DIRECTION_TO_DEVICE) { - residual =3D dma_buf_write(ptr, len, &sg->qsg, attrs); + dma_buf_write(ptr, len, &residual, &sg->qsg, attrs); } else { - residual =3D dma_buf_read(ptr, len, &sg->qsg, attrs); + dma_buf_read(ptr, len, &residual, &sg->qsg, attrs); } =20 if (unlikely(residual)) { diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 6c1ae6b980f..de613c8b355 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -750,6 +750,7 @@ static int megasas_ctrl_get_info(MegasasState *s, Megas= asCmd *cmd) size_t dcmd_size =3D sizeof(info); BusChild *kid; int num_pd_disks =3D 0; + dma_addr_t residual; =20 memset(&info, 0x0, dcmd_size); if (cmd->iov_size < dcmd_size) { @@ -860,7 +861,9 @@ static int megasas_ctrl_get_info(MegasasState *s, Megas= asCmd *cmd) MFI_INFO_PDMIX_SATA | MFI_INFO_PDMIX_LD); =20 - cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); + dma_buf_read(&info, dcmd_size, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size -=3D residual; return MFI_STAT_OK; } =20 @@ -868,6 +871,7 @@ static int megasas_mfc_get_defaults(MegasasState *s, Me= gasasCmd *cmd) { struct mfi_defaults info; size_t dcmd_size =3D sizeof(struct mfi_defaults); + dma_addr_t residual; =20 memset(&info, 0x0, dcmd_size); if (cmd->iov_size < dcmd_size) { @@ -890,7 +894,9 @@ static int megasas_mfc_get_defaults(MegasasState *s, Me= gasasCmd *cmd) info.disable_preboot_cli =3D 1; info.cluster_disable =3D 1; =20 - cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); + dma_buf_read(&info, dcmd_size, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size -=3D residual; return MFI_STAT_OK; } =20 @@ -898,6 +904,7 @@ static int megasas_dcmd_get_bios_info(MegasasState *s, = MegasasCmd *cmd) { struct mfi_bios_data info; size_t dcmd_size =3D sizeof(info); + dma_addr_t residual; =20 memset(&info, 0x0, dcmd_size); if (cmd->iov_size < dcmd_size) { @@ -911,7 +918,9 @@ static int megasas_dcmd_get_bios_info(MegasasState *s, = MegasasCmd *cmd) info.expose_all_drives =3D 1; } =20 - cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); + dma_buf_read(&info, dcmd_size, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size -=3D residual; return MFI_STAT_OK; } =20 @@ -919,10 +928,13 @@ static int megasas_dcmd_get_fw_time(MegasasState *s, = MegasasCmd *cmd) { uint64_t fw_time; size_t dcmd_size =3D sizeof(fw_time); + dma_addr_t residual; =20 fw_time =3D cpu_to_le64(megasas_fw_time()); =20 - cmd->iov_size -=3D dma_buf_read(&fw_time, dcmd_size, &cmd->qsg, MEMTXA= TTRS_UNSPECIFIED); + dma_buf_read(&fw_time, dcmd_size, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size -=3D residual; return MFI_STAT_OK; } =20 @@ -942,6 +954,7 @@ static int megasas_event_info(MegasasState *s, MegasasC= md *cmd) { struct mfi_evt_log_state info; size_t dcmd_size =3D sizeof(info); + dma_addr_t residual; =20 memset(&info, 0, dcmd_size); =20 @@ -949,7 +962,9 @@ static int megasas_event_info(MegasasState *s, MegasasC= md *cmd) info.shutdown_seq_num =3D cpu_to_le32(s->shutdown_event); info.boot_seq_num =3D cpu_to_le32(s->boot_event); =20 - cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); + dma_buf_read(&info, dcmd_size, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size -=3D residual; return MFI_STAT_OK; } =20 @@ -979,6 +994,7 @@ static int megasas_dcmd_pd_get_list(MegasasState *s, Me= gasasCmd *cmd) size_t dcmd_size =3D sizeof(info); BusChild *kid; uint32_t offset, dcmd_limit, num_pd_disks =3D 0, max_pd_disks; + dma_addr_t residual; =20 memset(&info, 0, dcmd_size); offset =3D 8; @@ -1018,7 +1034,9 @@ static int megasas_dcmd_pd_get_list(MegasasState *s, = MegasasCmd *cmd) info.size =3D cpu_to_le32(offset); info.count =3D cpu_to_le32(num_pd_disks); =20 - cmd->iov_size -=3D dma_buf_read(&info, offset, &cmd->qsg, MEMTXATTRS_U= NSPECIFIED); + dma_buf_read(&info, offset, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size -=3D residual; return MFI_STAT_OK; } =20 @@ -1113,8 +1131,9 @@ static int megasas_pd_get_info_submit(SCSIDevice *sde= v, int lun, info->connected_port_bitmap =3D 0x1; info->device_speed =3D 1; info->link_speed =3D 1; - residual =3D dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, - MEMTXATTRS_UNSPECIFIED); + dma_buf_read(cmd->iov_buf, dcmd_size, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size -=3D residual; g_free(cmd->iov_buf); cmd->iov_size =3D dcmd_size - residual; cmd->iov_buf =3D NULL; @@ -1187,8 +1206,8 @@ 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 - residual =3D dma_buf_read(&info, dcmd_size, &cmd->qsg, - MEMTXATTRS_UNSPECIFIED); + dma_buf_read(&info, dcmd_size, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); cmd->iov_size =3D dcmd_size - residual; return MFI_STAT_OK; } @@ -1238,8 +1257,8 @@ 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 - residual =3D dma_buf_read(&info, dcmd_size, &cmd->qsg, - MEMTXATTRS_UNSPECIFIED); + dma_buf_read(&info, dcmd_size, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); cmd->iov_size =3D dcmd_size - residual; return MFI_STAT_OK; } @@ -1290,8 +1309,8 @@ static int megasas_ld_get_info_submit(SCSIDevice *sde= v, 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 - residual =3D dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, - MEMTXATTRS_UNSPECIFIED); + dma_buf_read(cmd->iov_buf, dcmd_size, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); g_free(cmd->iov_buf); cmd->iov_size =3D dcmd_size - residual; cmd->iov_buf =3D NULL; @@ -1336,6 +1355,7 @@ static int megasas_dcmd_cfg_read(MegasasState *s, Meg= asasCmd *cmd) struct mfi_config_data *info; int num_pd_disks =3D 0, array_offset, ld_offset; BusChild *kid; + dma_addr_t residual; =20 if (cmd->iov_size > 4096) { return MFI_STAT_INVALID_PARAMETER; @@ -1410,7 +1430,9 @@ static int megasas_dcmd_cfg_read(MegasasState *s, Meg= asasCmd *cmd) ld_offset +=3D sizeof(struct mfi_ld_config); } =20 - cmd->iov_size -=3D dma_buf_read(data, info->size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); + dma_buf_read(data, info->size, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size -=3D residual; return MFI_STAT_OK; } =20 @@ -1418,6 +1440,7 @@ static int megasas_dcmd_get_properties(MegasasState *= s, MegasasCmd *cmd) { struct mfi_ctrl_props info; size_t dcmd_size =3D sizeof(info); + dma_addr_t residual; =20 memset(&info, 0x0, dcmd_size); if (cmd->iov_size < dcmd_size) { @@ -1440,7 +1463,9 @@ static int megasas_dcmd_get_properties(MegasasState *= s, MegasasCmd *cmd) info.ecc_bucket_leak_rate =3D cpu_to_le16(1440); info.expose_encl_devices =3D 1; =20 - cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); + dma_buf_read(&info, dcmd_size, &residual, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size -=3D residual; return MFI_STAT_OK; } =20 @@ -1485,7 +1510,7 @@ static int megasas_dcmd_set_properties(MegasasState *= s, MegasasCmd *cmd) dcmd_size); return MFI_STAT_INVALID_PARAMETER; } - dma_buf_write(&info, dcmd_size, &cmd->qsg, MEMTXATTRS_UNSPECIFIED); + dma_buf_write(&info, dcmd_size, NULL, &cmd->qsg, MEMTXATTRS_UNSPECIFIE= D); trace_megasas_dcmd_unsupported(cmd->index, cmd->iov_size); return MFI_STAT_OK; } diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 3466e680ac7..4057e04ce89 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -1421,9 +1421,11 @@ 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->residual =3D dma_buf_read(buf, len, req->sg, MEMTXATTRS_UNSPE= CIFIED); + dma_buf_read(buf, len, &req->residual, req->sg, + MEMTXATTRS_UNSPECIFIED); } else { - req->residual =3D dma_buf_write(buf, len, req->sg, MEMTXATTRS_UNSP= ECIFIED); + dma_buf_write(buf, len, &req->residual, req->sg, + MEMTXATTRS_UNSPECIFIED); } scsi_req_continue(req); } diff --git a/softmmu/dma-helpers.c b/softmmu/dma-helpers.c index 54340929334..1c6fba6a112 100644 --- a/softmmu/dma-helpers.c +++ b/softmmu/dma-helpers.c @@ -321,22 +321,16 @@ static MemTxResult dma_buf_rw(void *buf, dma_addr_t l= en, dma_addr_t *residual, return res; } =20 -uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs a= ttrs) +MemTxResult dma_buf_read(void *ptr, dma_addr_t len, dma_addr_t *residual, + QEMUSGList *sg, MemTxAttrs attrs) { - uint64_t residual; - - dma_buf_rw(ptr, len, &residual, sg, DMA_DIRECTION_FROM_DEVICE, attrs); - - return residual; + return dma_buf_rw(ptr, len, residual, sg, DMA_DIRECTION_FROM_DEVICE, a= ttrs); } =20 -uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs = attrs) +MemTxResult dma_buf_write(void *ptr, dma_addr_t len, dma_addr_t *residual, + QEMUSGList *sg, MemTxAttrs attrs) { - uint64_t residual; - - dma_buf_rw(ptr, len, &residual, sg, DMA_DIRECTION_TO_DEVICE, attrs); - - return residual; + return dma_buf_rw(ptr, len, residual, sg, DMA_DIRECTION_TO_DEVICE, att= rs); } =20 void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie, --=20 2.33.1