From nobody Sat Jun 15 03:18:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686655924; cv=none; d=zohomail.com; s=zohoarc; b=MqxzfPt1QqSgCH/wlgXSWSGDsztMMF9/vUD0XwK4SgbnqJ7YF+B+UzjFzMu9MVNjbu+wBul+f489m964/8XjTZYRI90R2dIlwP7oXLOyOe9WdBIHsZrd1nn8VVitojqXLyh4uPyaPQKMTVPK8i6jBl4gDysmi+0ju/GSQtAOOjU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686655924; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sITmXYQVztiFV0Fz7LLqlyOlCvRo8CYW3jqFEkjFY7A=; b=gSoMnPRayglO1WbGLxZRFfvg6MKd+0Dm5qCgigygC4j1z4G3HB0JU/Q6tXXyY5QoMiuaqow0KKfiAnwohWpx2lGUnB8xFWwrssL6sDdo3ZOP8m+upYGkjRVZ14zyIPftk1k25HHJoNZVBc+GJfQgXeNJxP+onMZFMwcP4EcRRXM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686655924236429.07613635778773; Tue, 13 Jun 2023 04:32:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q90U8-00055Z-Mu; Tue, 13 Jun 2023 05:38:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q90U5-00054a-PF for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:38:43 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q90Tw-0005Uy-EB for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:38:41 -0400 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-977d4a1cf0eso757518966b.1 for ; Tue, 13 Jun 2023 02:38:31 -0700 (PDT) Received: from localhost.localdomain ([185.140.244.249]) by smtp.gmail.com with ESMTPSA id s24-20020a1709060c1800b00969f25b96basm6363606ejf.204.2023.06.13.02.38.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Jun 2023 02:38:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686649108; x=1689241108; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sITmXYQVztiFV0Fz7LLqlyOlCvRo8CYW3jqFEkjFY7A=; b=T1InBtrB0winLJ23Quu7ivDlnmZDNGABI/CrerU2/H5RfXdeuvS6Nx0+hQTxqNfjQz cQ2G0PXKXegcXDvF0YlROhBqQ9Q4xwQ1JZhA5vKeqVXhE2kONcgc4ETXU8tE+zBr2JN2 op5muaNnR+FhjhrqIaPSpA+QFkDHp5TC3amNwfBijCB2d4vxENCLB0SGM3TA2y6+BhOC t6Ce8ZiZbgnPAYcnVWMaPDuIj5ly7HfWQT0zBn8sMYue6grEbSVVWK9PQJVmxXgL0Zrw UiAwJsIQa8oarjA/ypaEQmUljTQXYJA08HdDHc8Ck40oxV9gkTXG3j0z4iKixnSQXLKT hLJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686649108; x=1689241108; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sITmXYQVztiFV0Fz7LLqlyOlCvRo8CYW3jqFEkjFY7A=; b=TSHid7VS2UIwaSh21OWVIrjwv8kh19ffXTHto4dpGqZNx8GIVxrzgcABDM78oyhnw6 agQ9cyjzrPRKhe8ib2ngudUGRMXqCErJaloly/ZhhPdlpKUerMI3OYWXy0X4GZMwixVZ lQLrZ5h590LIg4ohAFwO9tEordWssh73tWD25Vgj5IjbEdRR+7D2d9axImohaZ5xutz2 5w5p1tTXjc4PbTLupRu8BFHr975rF6HUrkAh62RmnYxsghZn/T13hX5KPpgBdFr9Fih0 9kITcOvG9sBrU4UrWHyyWJCBnXqlCKFNfON8ftdTUDfoe9dwNfBe7v1Cp+F0Wl73Hyfi pEaQ== X-Gm-Message-State: AC+VfDxorRxbLFyo0BQELaQpAtWQPAmYMeC++Q+7NYux/i+uDUAdQMB7 gDhuXvbxvO3Y/abn7YCd2A6Xx6hnwxUKbUmjLGjjQw== X-Google-Smtp-Source: ACHHUZ5xxyqb0lQOG8wwaE5B4zqaD/CusWuONyls3BpkaLYvPGThkZTyQa/5y+e/tl/L6GPvXKKfiQ== X-Received: by 2002:a17:907:9617:b0:974:1f03:fcd1 with SMTP id gb23-20020a170907961700b009741f03fcd1mr11708489ejc.3.1686649108675; Tue, 13 Jun 2023 02:38:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Andreas Schwab , Warner Losh , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 01/17] linux-user, bsd-user: Preserve incoming order of environment variables in the target Date: Tue, 13 Jun 2023 11:38:06 +0200 Message-Id: <20230613093822.63750-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230613093822.63750-1-philmd@linaro.org> References: <20230613093822.63750-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=philmd@linaro.org; helo=mail-ej1-x635.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686655925308100001 From: Andreas Schwab Do not reverse the order of environment variables in the target environ array relative to the incoming environ order. Some testsuites depend on a specific order, even though it is not defined by any standard. Signed-off-by: Andreas Schwab Reviewed-by: Warner Losh Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- bsd-user/main.c | 10 +++++++++- linux-user/main.c | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index cd8b2a670f..b597328118 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -295,8 +295,16 @@ int main(int argc, char **argv) =20 envlist =3D envlist_create(); =20 - /* add current environment into the list */ + /* + * add current environment into the list + * envlist_setenv adds to the front of the list; to preserve environ + * order add from back to front + */ for (wrk =3D environ; *wrk !=3D NULL; wrk++) { + continue; + } + while (wrk !=3D environ) { + wrk--; (void) envlist_setenv(envlist, *wrk); } =20 diff --git a/linux-user/main.c b/linux-user/main.c index 5e6b2e1714..dba67ffa36 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -692,8 +692,16 @@ int main(int argc, char **argv, char **envp) =20 envlist =3D envlist_create(); =20 - /* add current environment into the list */ + /* + * add current environment into the list + * envlist_setenv adds to the front of the list; to preserve environ + * order add from back to front + */ for (wrk =3D environ; *wrk !=3D NULL; wrk++) { + continue; + } + while (wrk !=3D environ) { + wrk--; (void) envlist_setenv(envlist, *wrk); } =20 --=20 2.38.1 From nobody Sat Jun 15 03:18:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686656589; cv=none; d=zohomail.com; s=zohoarc; b=VyqxQ9869ompWcBKvydKTk6pwDRvhGW2cYVRU49r6umiaoQyf6Br7QJPiODwaAZSP6ZLrpGglyJgTvNT4PTCP63quscohnEYnSvgwhlUOYXN8xRnCBvHdLKaQtyEe4JzwA3OzM7JLcIVAMgJBxaKLkxiOfx5x+ITlPUaDN714EM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686656589; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=coCYRAX/D0a1lARgSgpQz1zwILEZC/GYBuzI7kzZU2k=; b=NU1fPyTbvOYTJtinudDXcrCMhSP08XJvQuAJ1mK3KA630Erv/Gkn7jQxolZozqHYy9K4dqarWRC2otk8B1mWaZeCnN9AIL70i3/Y73gsEAD0SRyXgvJslBFmwPUaqylpas0XP5385s5+cn7bQmoPl9+dgIf49ayfiPwzoSkjiJQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686656589201571.0838043661597; Tue, 13 Jun 2023 04:43:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q90UC-00059V-0b; Tue, 13 Jun 2023 05:38:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q90UA-00057F-MM for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:38:46 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q90U0-0005VC-Nj for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:38:46 -0400 Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-97454836448so755280966b.2 for ; Tue, 13 Jun 2023 02:38:36 -0700 (PDT) Received: from localhost.localdomain ([185.140.244.249]) by smtp.gmail.com with ESMTPSA id g12-20020a1709064e4c00b00965e1be3002sm4801468ejw.166.2023.06.13.02.38.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Jun 2023 02:38:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686649113; x=1689241113; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=coCYRAX/D0a1lARgSgpQz1zwILEZC/GYBuzI7kzZU2k=; b=fvYNJGElWOZz1CVYoJHpvlpNEdZJHYJgVoa3xXhSVBqQoAE6+fe57f1ahMXjFN/Cjl zSmTpPCklpHaSZtxD3geMnY7qUOgZzixJWsp98MDJYA2sErZg78PuwjPxTdyYX+EiiwD t5yokU+RWa0v7UVqzdCsgUDV8VwuNRQsEqHbv1JlUF+CblMnSAdFunig8UYkxSsRG0hN ShdE+2+jHegDisA8I8hPgcoK9ucbVoBShcnoIiWKDpJMMtGE358fnv/RmCP3K6hQGzH7 eFT/JpvF8lY9ZXMQMKXsYYJj9RnhU578SD8ujcYd/+DD4zDay6oBgqPp4Jw9DABlOkoJ 7EMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686649113; x=1689241113; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=coCYRAX/D0a1lARgSgpQz1zwILEZC/GYBuzI7kzZU2k=; b=AdbYeR5ZKl1e6joq2+jE/T236X2hOAI8y/eIE1aRinYW6Hz6eFeYJbYNurmG/l34O2 cj0buW7mf6iTmLhjoZERrj61mS0nGUxNR1mQt8uRturf4gJFSTAD9jN28HQKrLDBLNwm 0Xdmf7ObFZHv1/R8d9zPZvyGukl9sLm0/L4yQ0Z/J2wkgoLQ4zDI3IbISGG9OxgwnM6k JqEuzb5rx6oWB+DNPuxeOHKUIELoGz/07niDThWHJHgutpggS7pN6bfkdIjPSKxwb8kJ f+TTCPRV59i0zMlh7Mo96fzS8WN9h82F+lOjYjlFMkhknahvPvhDgZE5okTaV/MzO+6u lnvg== X-Gm-Message-State: AC+VfDwITanNPc2z9GWe1q6Y52Yt/ng2oL25uvDPktBtIO18wsmcBphg WZ8RwfHen0i+4yjKpFIRBjjxC8nDeXSp/ABZpAebUg== X-Google-Smtp-Source: ACHHUZ59jlwoYPU3KBNv+8oIOiZK4KA4cFoXT5yC1limHVxBEmjQlUFDEX3tcNUOakTQUqgGqklAPA== X-Received: by 2002:a17:907:6daa:b0:973:cc48:f19c with SMTP id sb42-20020a1709076daa00b00973cc48f19cmr11331108ejc.56.1686649113701; Tue, 13 Jun 2023 02:38:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Akihiko Odaki Subject: [PULL 02/17] cocoa: Fix warnings about invalid prototype declarations Date: Tue, 13 Jun 2023 11:38:07 +0200 Message-Id: <20230613093822.63750-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230613093822.63750-1-philmd@linaro.org> References: <20230613093822.63750-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=philmd@linaro.org; helo=mail-ej1-x62e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686656590977100001 Fix the following Cocoa trivial warnings: C compiler for the host machine: cc (clang 14.0.0 "Apple clang version 14= .0.0 (clang-1400.0.29.202)") Objective-C compiler for the host machine: clang (clang 14.0.0) [100/334] Compiling Objective-C object libcommon.fa.p/net_vmnet-bridged.m= .o net/vmnet-bridged.m:40:31: warning: a function declaration without a prot= otype is deprecated in all versions of C [-Wstrict-prototypes] static char* get_valid_ifnames() ^ void [742/1436] Compiling Objective-C object libcommon.fa.p/ui_cocoa.m.o ui/cocoa.m:1937:22: warning: a function declaration without a prototype i= s deprecated in all versions of C [-Wstrict-prototypes] static int cocoa_main() ^ void Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Akihiko Odaki Message-Id: <20230425192820.34063-1-philmd@linaro.org> --- net/vmnet-bridged.m | 2 +- ui/cocoa.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/vmnet-bridged.m b/net/vmnet-bridged.m index 46d2282863..76a28abe79 100644 --- a/net/vmnet-bridged.m +++ b/net/vmnet-bridged.m @@ -37,7 +37,7 @@ static bool validate_ifname(const char *ifname) } =20 =20 -static char* get_valid_ifnames() +static char* get_valid_ifnames(void) { xpc_object_t shared_if_list =3D vmnet_copy_shared_interface_list(); __block char *if_list =3D NULL; diff --git a/ui/cocoa.m b/ui/cocoa.m index 168170a8a6..0c2153d17c 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -1934,7 +1934,7 @@ static void cocoa_clipboard_request(QemuClipboardInfo= *info, exit(status); } =20 -static int cocoa_main() +static int cocoa_main(void) { QemuThread thread; =20 --=20 2.38.1 From nobody Sat Jun 15 03:18:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686655634; cv=none; d=zohomail.com; s=zohoarc; b=ZrQ9qkQvEykXFgxatZoQcBlf9quvopT4/pWvTmZU28uKft9lG6ZNzJbVFv6TBesq5gPfuvnak6w3KiDAsxEsHT6ejRZJ8eEN/YsDg6lCtR82f7SiJE4ApQPOdDhJmdKaRT7PFJj6vOnLKuE2/zpZwOVTAvj9+rGPpar9fDWcelY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686655634; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6qJ7BQ2qR0lwowzhuJJ58u1mhSulIi2t/OhI5+4Ytsc=; b=QxVSXv7p1TBcBR+utgjCJpDUBpCnoMS6y71n60VCmn2NyqTWaaM6TLjUO54LkfrxGBR4J4nEO5/iyPacZeH08ujK56UC2hG3R10FWOjt66mI5/SkyUMxqHl91aRbUgnSseNfVnm8khG01BJFVZy5qoU+HUcZR1fPD5fGI/AWpu8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 168665563452169.88323460468655; Tue, 13 Jun 2023 04:27:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q90UE-0005DH-MM; Tue, 13 Jun 2023 05:38:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q90UC-0005BE-I0 for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:38:48 -0400 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q90U9-0005Vn-BK for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:38:48 -0400 Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-977cf86aae5so804699066b.0 for ; Tue, 13 Jun 2023 02:38:43 -0700 (PDT) Received: from localhost.localdomain ([185.140.244.249]) by smtp.gmail.com with ESMTPSA id n11-20020a1709062bcb00b00977eec7b7e8sm6395760ejg.68.2023.06.13.02.38.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Jun 2023 02:38:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686649118; x=1689241118; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6qJ7BQ2qR0lwowzhuJJ58u1mhSulIi2t/OhI5+4Ytsc=; b=c9Izl1KHKJhcbr5C3nlKdHCh+00vRVp0dpdltvxdil5wL1EC+bTdpLZXT34iiG7VTO Uvlzoi0uqngg0nem7b3mMOWqpASbTsbm6wUeq3WLHRvn2G8FXpDmaGc6ZgQ3yH3mVxjK Ar72bu+DdY1Ijks+zrx2TfmhZBKBgjCsLAiJ6GSlzGRRNRSwPlnFwpctWOZ+Qh1Xir9F AwkL1b8mQXtHyiLBQ8aDHv2LP+g4LfxfvSXDfIbHDwjOfCtW+apq6D3HwTTvv9385+Qd ebdw0JyV21T7pSJFvlk15/7ZfJrxT7ILNkZrp3a2ABTrmXGLrvsy+Z8bzuPoYXRvGfv1 HHQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686649118; x=1689241118; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6qJ7BQ2qR0lwowzhuJJ58u1mhSulIi2t/OhI5+4Ytsc=; b=ffpZ5bYLuT5pEE33c0GpBlvDwVegmAs2N+u5N9YRWEgRf8At+obwsdPd7mZsIf+2af nu8piND6sOP5+bWaUGEzDM60g3JTGrTk2n321/thfktDL9vEqCVC5BcpyOX3yw5mV3e5 JeBnc/NeZWQbh19/FyC/fqcWod48U3WIjo9LhvAfe7E1juIQz8eD5EhymH/RljjJH0RL v+dSrI5fmhEgnlHWiNneVK3wXXXO0N1cu163dyDOcO3Qc0nBOjQ2RGBYtCIZwgTOk2sF aGlQAs0sFwgEWZpDq/+g4Z9ACyKZ4eALIkHgk01/uIcxr5q4spH7hYpz1GnHsxuYvw70 EOHA== X-Gm-Message-State: AC+VfDx27P9i7BJRiJlyD0DZywRaCd/LFIf8o7Lttv3NhH48wh0zIhLo U/DQHpoZ/qvHQoAgqy6QrghairUSYZVThy4xZWkJQA== X-Google-Smtp-Source: ACHHUZ7ACg252+NEXKV9vPDD6vTgIovV8Ek6/8nKU1vwwuV2jYxaaDIn49nPmUtteayEGNgZBlYneQ== X-Received: by 2002:a17:907:9342:b0:973:91f7:508a with SMTP id bv2-20020a170907934200b0097391f7508amr10909380ejc.4.1686649117880; Tue, 13 Jun 2023 02:38:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 03/17] util/cacheflush: Use declarations from on Darwin Date: Tue, 13 Jun 2023 11:38:08 +0200 Message-Id: <20230613093822.63750-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230613093822.63750-1-philmd@linaro.org> References: <20230613093822.63750-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=philmd@linaro.org; helo=mail-ej1-x62b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686655635235100001 Per the cache(3) man page, sys_icache_invalidate() and sys_dcache_flush() are declared in . Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20230605175647.88395-2-philmd@linaro.org> --- util/cacheflush.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/cacheflush.c b/util/cacheflush.c index 06c2333a60..de35616718 100644 --- a/util/cacheflush.c +++ b/util/cacheflush.c @@ -237,8 +237,8 @@ static void __attribute__((constructor)) init_cache_inf= o(void) =20 #ifdef CONFIG_DARWIN /* Apple does not expose CTR_EL0, so we must use system interfaces. */ -extern void sys_icache_invalidate(void *start, size_t len); -extern void sys_dcache_flush(void *start, size_t len); +#include + void flush_idcache_range(uintptr_t rx, uintptr_t rw, size_t len) { sys_dcache_flush((void *)rw, len); --=20 2.38.1 From nobody Sat Jun 15 03:18:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686655709; cv=none; d=zohomail.com; s=zohoarc; b=W9MOU2RSZ5IIQphfKkZLTcwk8PmJHSpxE1DusRhvPSoHh9v7Zh5c5QNmUK4ZK5bbnO4X9NYnOffUP0DcuoA4p87XD53SICTWiiD9+ovddG5tUYqyGE7uNSXASSe/6q0a/e6pASSG722yc1xiOU5lP0LL2isslmFZ5ISFfLAaORk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686655709; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/rEEeIVSi5VMBmvRHFJo6Mhl1pwYu3f8je5JbYKc4lc=; b=km7KlTtB73bNgrsCu+xnrRrUFPgvmlAl6nPo2TKUivrzVkwvZr6Av0al3bSfcWQi6YPyG8mpHWLh97AUDzxD1iECjFiyCgNZOGa5FTx5UyKcSQGiJznvYKorIDStNrSb3XzWZr+rwFAroyUSLgFEiygYNsX+F9h9gLZVwLAkUIE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686655709405114.6848429815849; Tue, 13 Jun 2023 04:28:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q90UL-0005Qf-D6; Tue, 13 Jun 2023 05:38:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q90UJ-0005Og-Hb for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:38:55 -0400 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q90U9-0005Vp-2h for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:38:55 -0400 Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-514953b3aa6so7407178a12.1 for ; Tue, 13 Jun 2023 02:38:44 -0700 (PDT) Received: from localhost.localdomain ([185.140.244.249]) by smtp.gmail.com with ESMTPSA id u11-20020aa7d0cb000000b00514a97b6b80sm6185031edo.78.2023.06.13.02.38.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Jun 2023 02:38:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686649122; x=1689241122; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/rEEeIVSi5VMBmvRHFJo6Mhl1pwYu3f8je5JbYKc4lc=; b=vN8cYI9jW0YpIeMjga+hw/yspaOnkJJfHu2IbDcuLLQtMDFx3jl6Syn8fBWGVuKxVM G0Hsqd4Tc/DXPG8zhL9zc6BNwSbcJWTYXtJBToG2wMhvhUeyFKZoVle8Vm0hXPgwSB/8 AGQ8KUJRYIYwavVUl8WwunJiFg1nQAo3/J2M3Vs29ZjTefE1aRgY6AweC6vvgIGCWXBj LJZF8KERLQVUKw7yubREO3UuSkZwZ+tzB7nZ+idEmlt6NfUgiypkGvOeZ3YNParqBBT5 lShk8QUE6R6ebYIn04xHEkHqeem5iQ+TVfQ/hDrPlH4XDyCfTn6ETnM7pQdje/VdmB1p k1Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686649122; x=1689241122; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/rEEeIVSi5VMBmvRHFJo6Mhl1pwYu3f8je5JbYKc4lc=; b=RwHDrWLT4zQLX5Weq6ijMcVmp1SMdX4XZAJrVCPkbo+bF2SVPL2GVAPhLEClEq3vz4 5a/MKurlZT+NUU56SR4EHgM5C3j+aB70fUdyBM1CgkRR89Uo9Ac0sT9EBgXfx+R5KQ2h HEcsM5EbpoRrlDfqqq6qT/0vlN2NtB6gUBqKmTEzsLhgYb+kBp9GEem11kqHBa7ogMj4 EAH7r/DPXEjJBouZ9aAPEO0a/Nn8UZWBLPh31QIqwz7JOiihFB3r3CnX/QHaSwi0SDPm /Rpa1FSi5duZTFTtdeNUXLvSiNFo/cL1tuyn0aLLjxOCeJBGqI6gCumEn8FQA1NFqpQi stJA== X-Gm-Message-State: AC+VfDzR+vVnWRCI50I+Y5uVN/NrlDq9xn3/hypk9EF/Fpnx6G9UX2iv qPUdMrmRWcijcVdeNvapo+5R+PuZKINeRyseXTp4fA== X-Google-Smtp-Source: ACHHUZ6FkGRCnzDRIUsvgZjL7NfqolRlYfGKjrAYx+1qQxWGnu3tRT17ObwrDOODHJ824HEXI3ZwtQ== X-Received: by 2002:a05:6402:70b:b0:504:b177:3ef3 with SMTP id w11-20020a056402070b00b00504b1773ef3mr6738675edx.3.1686649122229; Tue, 13 Jun 2023 02:38:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Akihiko Odaki Subject: [PULL 04/17] util/cacheflush: Avoid possible redundant dcache flush on Darwin Date: Tue, 13 Jun 2023 11:38:09 +0200 Message-Id: <20230613093822.63750-5-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230613093822.63750-1-philmd@linaro.org> References: <20230613093822.63750-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=philmd@linaro.org; helo=mail-ed1-x536.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686655709723100001 describes sys_icache_invalidate() as "equivalent to sys_cache_control(kCacheFunctionPrepareForExecution)", having kCacheFunctionPrepareForExecution defined as: /* Prepare memory for execution. This should be called * after writing machine instructions to memory, before * executing them. It syncs the dcache and icache. [...] */ Since the dcache is also sync'd, we can avoid the sys_dcache_flush() call when both rx/rw pointers are equal. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Akihiko Odaki Message-Id: <20230605195911.96033-1-philmd@linaro.org> --- util/cacheflush.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/util/cacheflush.c b/util/cacheflush.c index de35616718..a08906155a 100644 --- a/util/cacheflush.c +++ b/util/cacheflush.c @@ -241,7 +241,14 @@ static void __attribute__((constructor)) init_cache_in= fo(void) =20 void flush_idcache_range(uintptr_t rx, uintptr_t rw, size_t len) { - sys_dcache_flush((void *)rw, len); + if (rx =3D=3D rw) { + /* + * sys_icache_invalidate() syncs the dcache and icache, + * so no need to call sys_dcache_flush(). + */ + } else { + sys_dcache_flush((void *)rw, len); + } sys_icache_invalidate((void *)rx, len); } #else --=20 2.38.1 From nobody Sat Jun 15 03:18:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686656698; cv=none; d=zohomail.com; s=zohoarc; b=ESNZwrWWKYE2Zb8sqXhTljcv//ulyf7sd9mg+X0KG2GHLUaU5ILcCOVgGvjirNtimvxms2PLGbciCEuAvW9oqYkaMVZAljBVwGuIqjg0oPMAAMtxwHIJWNjo+GuMiYnv1ePU19AP2LXmK2k3K94N+/pns40yhHScHqX6RR4o+jA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686656698; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YSCMOMiEbLUM1Wk1LAbR+FG1B8HkFWQqVaD6LVaKVVI=; b=fQGrNd8knV6rmxxCV5dsxbyDnZ967nMDnMJJDLVB5mSx2E/zxBrg3LbPEa53ymD0s1r8HvH/6x0CiCeVi+LT+YxRUMUJPPlPnwYVcl/WvCnBxI3drhvIyAcobAtzPI+0Fjq0H1B0IDbygwXA9ZG6rlAy9hXwBJv9+GJMr8mpV2A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686656698046907.5552758273549; Tue, 13 Jun 2023 04:44:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q90UK-0005Pt-Kf; Tue, 13 Jun 2023 05:38:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q90UI-0005M1-B5 for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:38:54 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q90UE-0005Yg-Kz for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:38:54 -0400 Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-9745baf7c13so781169266b.1 for ; Tue, 13 Jun 2023 02:38:50 -0700 (PDT) Received: from localhost.localdomain ([185.140.244.249]) by smtp.gmail.com with ESMTPSA id qc11-20020a170906d8ab00b00977d7ccd9fdsm6532138ejb.95.2023.06.13.02.38.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Jun 2023 02:38:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686649127; x=1689241127; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YSCMOMiEbLUM1Wk1LAbR+FG1B8HkFWQqVaD6LVaKVVI=; b=Fbx+Y2sTOWlOzGtF+XOqdQ4xEH5zruDmrJtMnBiflePZ5DCREag2JlKofH+6PdUQwi 5sJLb50AhBsk/zSAl9yN+kpF5I28dIpL2fM1v7B+i0jEl0rMeOux6y2xlxpKf1qacl6r GI5iDqFJz/bYQ/HKzgp7ay2YRpGdwFGZCnHCZIHR7cpjU5kEKi3BO2SLzmcr9P4OHeWW N9YTE1SXJGN3OrLQUD5de+PJyQUJj8agOabGVTkfkLMrk9+pNlJUd2KHiVGPH6VxK4HL BXHx11A2ALhFDNLLWW90m5acF0TgOl3Hh2X7I7Qj1HxCwJeWgtZ5lCyfnYeeaJMynFkJ YvuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686649127; x=1689241127; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YSCMOMiEbLUM1Wk1LAbR+FG1B8HkFWQqVaD6LVaKVVI=; b=L3AH7HgD9kb7ufqFCKJJPmu8WrD0g7cXwkF3Ilfg6I1lIiUCF2ofk7LRdPPOJLiwd9 hCaCv7FpYMDm3IqGsaQxHFtxHbXMFVOXbxBsi9KQG2qOHunaGDgEWWmSXU1sKtoqrVw5 kE5UppMawH1AG+gtRrFTgNgoEUJCPBkOrjJg23Mru3Nt3zEkatJ9j19W5Ie70qD1Jzfz 8X+VcbyAlegXderMg0Zv/GE8U35kUkUgnP5w/3kUvlPWI9f9SvI2P7UTTS2OfGUChzCp VyRwFnlF+TtCnnMD3UxZVq2kxVbaV2xisPfLsijhdpBRMKYOlmLTZSyLEW3meSqveR/u hUcQ== X-Gm-Message-State: AC+VfDwkBXS/kozi89f393spH4x28M2tgB9pvs1lWdFy/dst1gHsrkDq E3v5YOi83jpuoYC20mhycqruCl3BI/Tsf6SuLxiMAA== X-Google-Smtp-Source: ACHHUZ5ve+O8D8woiB0/eljv2RXuGAKJXZOeX2O7av+uzh85x4tqsIOoSgBkhLyvG7m0r1INRLcBJg== X-Received: by 2002:a17:907:97c5:b0:982:45ca:ac06 with SMTP id js5-20020a17090797c500b0098245caac06mr335280ejc.60.1686649127569; Tue, 13 Jun 2023 02:38:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Antonio Caggiano , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 05/17] accel/hvf: Report HV_DENIED error Date: Tue, 13 Jun 2023 11:38:10 +0200 Message-Id: <20230613093822.63750-6-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230613093822.63750-1-philmd@linaro.org> References: <20230613093822.63750-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=philmd@linaro.org; helo=mail-ej1-x62e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686656699582100001 From: Antonio Caggiano On MacOS 11 and subsequent versions, in case the resulting binary is not signed with the proper entitlement, handle and report the HV_DENIED error. Signed-off-by: Antonio Caggiano Message-Id: <20230608123014.28715-1-quic_acaggian@quicinc.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- accel/hvf/hvf-all.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c index 754707dbfb..4920787af6 100644 --- a/accel/hvf/hvf-all.c +++ b/accel/hvf/hvf-all.c @@ -38,6 +38,12 @@ void assert_hvf_ok(hv_return_t ret) case HV_UNSUPPORTED: error_report("Error: HV_UNSUPPORTED"); break; +#if defined(MAC_OS_VERSION_11_0) && \ + MAC_OS_X_VERSION_MIN_REQUIRED >=3D MAC_OS_VERSION_11_0 + case HV_DENIED: + error_report("Error: HV_DENIED"); + break; +#endif default: error_report("Unknown Error"); } --=20 2.38.1 From nobody Sat Jun 15 03:18:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686656632; cv=none; d=zohomail.com; s=zohoarc; b=mIAKkYYa5Y7TFn7wdjzZZ5kmCZR7rMhlhUtBhhZbwV/FEojtsJcC3Jt+4TK8T1I+fEstXC7ZQtlf9L3OuyyUBYgha7m7o9DdXWo8mofhr8IK24Dhl97x7+7krZ3eEgQp8b35ovS8UCydx1gk38Vi4wFrrpr/t8DwPQiImllxgm0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686656632; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7g0Yqy2wB54am4pKsVZHqGyVbbprfwoeuCpS8UNAr/Q=; b=G5/zf/YKWZ5u3Wyppx/lsgD3LxDpzYTjwX6LG2eKZL3pAhHyd8VI2TuSc5R/sERgl8gjEZXVtHasYU/Rd9ni2QUTl+yaXslxq6bb06iG3++1c0IRrir1arqC4Etdj26UYgMhQk4aqRXgN9Wrc/+jrcPeapcb4AG6UruFeYTaulM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686656632641515.6237594634923; Tue, 13 Jun 2023 04:43:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q90UQ-0005V9-JU; Tue, 13 Jun 2023 05:39:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q90UO-0005Tm-RV for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:39:00 -0400 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q90UH-0005Z8-LA for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:39:00 -0400 Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-977d02931d1so782493066b.0 for ; Tue, 13 Jun 2023 02:38:53 -0700 (PDT) Received: from localhost.localdomain ([185.140.244.249]) by smtp.gmail.com with ESMTPSA id k7-20020a17090627c700b00977da9d4ef9sm6527305ejc.18.2023.06.13.02.38.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Jun 2023 02:38:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686649131; x=1689241131; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7g0Yqy2wB54am4pKsVZHqGyVbbprfwoeuCpS8UNAr/Q=; b=VhQ6tJsMl7jtmM9J/i0BhJWFESqjyFFPRIDg00QiFGA/kB7sR0c8ml+n31REt1EuB5 taYdKTcZmPEc1q9/OC4fvocy1dvnJNBDmCSMfgYHMRfqxixfe9BGIS+AXnPZtQbZsmmH ADFzxJ6NM/jcqeF17RTpZBxFn2zQD/VjfxmxctYAw9edtGNGDky+Rqa/KyK3NOMh5xsk LMnB+8jUmC62uhf75GS2/61UD5C7Osn6kkBOHgS1HQRGR7DMVZhTxGga3vMK6ovc+w0H YkEodPlXW5nOillgGgNPZ7qPZRZMm6lp5LevBW9e8Vxcs0SbdyEeUWCXGKSbu/P3q8sQ fE3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686649131; x=1689241131; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7g0Yqy2wB54am4pKsVZHqGyVbbprfwoeuCpS8UNAr/Q=; b=UDNyC+Qmoz0XdXc2W0ELjjbwq7IcNNMxpd5a+vPMCzorWHOe3XKnTjhtGGXM9zA4n4 E2HxTaW/n5HjB3nLqiTFTrkp4omq+laLYIoGvLFdwsvLmfU/LkdUzF8apwOrSUWHrvUi ut42e5D131JQPYXHu76HshGIbqXnl/ODE+GnhXRGAgMkNYeBWzEKEdRwAdHMiMOt9w00 ydo+esB/6romQYkdnh8oO2SYS+Yr2rPgo2WIxCHzHZ6ziERmAdqUEcN9tW5DkL9ENOHo 8idKNKtuvK9NEcSa2O8zrWEBVPm9zT1dDlpET8ClRYNEqtm+y1uL8xmlEqIqZcA0fYM8 QbKw== X-Gm-Message-State: AC+VfDzCWehowscLe9yZrAdgZ0BI7S4mXm1w8hRawu246RF0IEVEZd4W 2fUalYqtxBLrAnx4WpuLizR7UKrdU4+/LPU5yQCRuw== X-Google-Smtp-Source: ACHHUZ7JhRAiDkneppoHfApMqYVKtBWCST7DJhhsO9DGABO0Lt08jFzLRSEWHTYnIORWmTUkd4RiWg== X-Received: by 2002:a17:906:ee82:b0:96a:ca96:3e49 with SMTP id wt2-20020a170906ee8200b0096aca963e49mr13379120ejb.13.1686649131840; Tue, 13 Jun 2023 02:38:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 06/17] target/hppa/meson: Only build int_helper.o with system emulation Date: Tue, 13 Jun 2023 11:38:11 +0200 Message-Id: <20230613093822.63750-7-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230613093822.63750-1-philmd@linaro.org> References: <20230613093822.63750-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=philmd@linaro.org; helo=mail-ej1-x62b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686656633426100001 int_helper.c only contains system emulation code: remove the #ifdef'ry and move the file to the meson softmmu source set. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20230602223016.58647-1-philmd@linaro.org> --- target/hppa/int_helper.c | 3 --- target/hppa/meson.build | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/target/hppa/int_helper.c b/target/hppa/int_helper.c index f599dccfff..d2480b163b 100644 --- a/target/hppa/int_helper.c +++ b/target/hppa/int_helper.c @@ -25,7 +25,6 @@ #include "hw/core/cpu.h" #include "hw/hppa/hppa_hardware.h" =20 -#ifndef CONFIG_USER_ONLY static void eval_interrupt(HPPACPU *cpu) { CPUState *cs =3D CPU(cpu); @@ -273,5 +272,3 @@ bool hppa_cpu_exec_interrupt(CPUState *cs, int interrup= t_request) } return false; } - -#endif /* !CONFIG_USER_ONLY */ diff --git a/target/hppa/meson.build b/target/hppa/meson.build index 81b4b4e617..83b1e0ee7d 100644 --- a/target/hppa/meson.build +++ b/target/hppa/meson.build @@ -7,13 +7,13 @@ hppa_ss.add(files( 'fpu_helper.c', 'gdbstub.c', 'helper.c', - 'int_helper.c', 'op_helper.c', 'translate.c', )) =20 hppa_softmmu_ss =3D ss.source_set() hppa_softmmu_ss.add(files( + 'int_helper.c', 'machine.c', 'mem_helper.c', 'sys_helper.c', --=20 2.38.1 From nobody Sat Jun 15 03:18:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686656592; cv=none; d=zohomail.com; s=zohoarc; b=ji4XiZE4WxWpQJKJEITGPfXNYwAAuzGCt5Q8xCkxyM/D51V0nyB9Pqgln4uEwELvHbdFIy1DhpEglyL3f5dLm3XbOoFC0KxyFNi7QnXa9NYzAnPH3snQFEAIrkMkRggS1BDam/LlY6IgCiQCCYo7N4nbcmWMGp9NiNl1HEwt1DE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686656592; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=myeX5Dw6+waNCZWCgIspsiK+vpR5MfiXN6PuO0NeKtA=; b=hUMEjorgy/nR8SeKXvuaqztg3Meor1tpZehDRTzLZo2tutACNjofv2Wu+/n4aRGu5FPe9YsOTF/JyOVzNbOSDFsC4AO7aHgauCKNJl6WXfsGxs5XS964QlZUR5m+DrKf9nInjZbtcGFWhfCWrs7M4IPrWSsamhm2HdKNo6OqUyQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686656592707117.47262403482864; Tue, 13 Jun 2023 04:43:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q90UQ-0005Ud-0A; Tue, 13 Jun 2023 05:39:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q90UO-0005Tq-Um for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:39:00 -0400 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q90UN-0005Zh-3e for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:39:00 -0400 Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-51879362bbfso503033a12.0 for ; Tue, 13 Jun 2023 02:38:58 -0700 (PDT) Received: from localhost.localdomain ([185.140.244.249]) by smtp.gmail.com with ESMTPSA id k22-20020a1709067ad600b00973ca837a68sm6381930ejo.217.2023.06.13.02.38.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Jun 2023 02:38:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686649136; x=1689241136; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=myeX5Dw6+waNCZWCgIspsiK+vpR5MfiXN6PuO0NeKtA=; b=aayT79RNVZJvyM4TSEwqccDtz37EF6lAxwjzp1q2y3xw1LoNPZcm/ZjxNYiqz83rlR v0sKG07t4QVa1JQEbIdQtNNWUVPloFdxfjjNa9NlrvSqhgh0xWFGOy0ejiQvx0LjkZ9z XagIMvddP1J6VeYnhNq4j0PTyJE7Nn9UFFyy1c2cqpRRrWRotb6FwMg3wN+XSbN/2C0J 0y8R7FyQWACGJPfDDX0UlEYXU70HbWaUYyTtXmeitCHHJkm/1qzn/PUU/QCH70Sv7oZm V0pisw+drAkf5nGnzypyY3fxhkWsMPEZgojIt4AkYvyewVpga1SHwj+e99Rzwuz37l43 +r3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686649136; x=1689241136; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=myeX5Dw6+waNCZWCgIspsiK+vpR5MfiXN6PuO0NeKtA=; b=HPEH7dq4DaHyDVNACJaPBDd7QSXw2MBBK9I1/4Jzcroil4oCLySlU/NJEhetnY4meh AOMb4fKdh2BXIHt2L2TJcfsBne3E3JmUiksgwWKxEE8glIVJ+8oiuA7cOsazCIRpqYTg J6ec6QIAgGhDzL7f9z6yBmRVz1DYn8GUtf5UpssgCW4cHKxYcMYVR0vIoDeOQ2xqaDd/ 1SiFDqepBxY7gBOnOkbyCPQ0UsmZZh0p4WNyUfy2qaCBnYlTi4IOW87T6usp+TTXF0nU oe6xQoB2xhrAxFYm4pOyLHVdnvV+7lbWu0GF4VSSkiJvpTcbwIj/ZXRYEgjbOfXiqA5E IWzw== X-Gm-Message-State: AC+VfDwUkU5WASqse/il/SpBLmYCgmmDZFDu4caRSaZKdOONfBLL4m0w p2iSkYNCDuu9nqazPlH1Dv95WQ3HL458+qdVN4DY+w== X-Google-Smtp-Source: ACHHUZ5wFMPB2YC+sIYRs276IG3XjUKzH9apySZk4abbO2zCKYg+e/1RkF8jO61QIgvgNTL0UjcVVw== X-Received: by 2002:a17:907:5cc:b0:96a:9467:1dc7 with SMTP id wg12-20020a17090705cc00b0096a94671dc7mr10626009ejb.25.1686649135979; Tue, 13 Jun 2023 02:38:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 07/17] target/i386/helper: Remove do_cpu_sipi() stub for user-mode emulation Date: Tue, 13 Jun 2023 11:38:12 +0200 Message-Id: <20230613093822.63750-8-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230613093822.63750-1-philmd@linaro.org> References: <20230613093822.63750-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=philmd@linaro.org; helo=mail-ed1-x534.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686656595019100003 Since commit 604664726f ("target/i386: Restrict cpu_exec_interrupt() handler to sysemu"), do_cpu_sipi() isn't called anymore on user emulation. Remove the now pointless stub. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20230602224628.59546-2-philmd@linaro.org> --- target/i386/cpu.h | 3 ++- target/i386/helper.c | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 7201a71de8..cd047e0410 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2285,7 +2285,6 @@ static inline void cpu_get_tb_cpu_state(CPUX86State *= env, target_ulong *pc, } =20 void do_cpu_init(X86CPU *cpu); -void do_cpu_sipi(X86CPU *cpu); =20 #define MCE_INJECT_BROADCAST 1 #define MCE_INJECT_UNCOND_AO 2 @@ -2419,6 +2418,8 @@ void x86_cpu_set_default_version(X86CPUVersion versio= n); =20 #ifndef CONFIG_USER_ONLY =20 +void do_cpu_sipi(X86CPU *cpu); + #define APIC_DEFAULT_ADDRESS 0xfee00000 #define APIC_SPACE_SIZE 0x100000 =20 diff --git a/target/i386/helper.c b/target/i386/helper.c index 36bf2107e7..792c8eb45e 100644 --- a/target/i386/helper.c +++ b/target/i386/helper.c @@ -611,9 +611,6 @@ void do_cpu_sipi(X86CPU *cpu) void do_cpu_init(X86CPU *cpu) { } -void do_cpu_sipi(X86CPU *cpu) -{ -} #endif =20 #ifndef CONFIG_USER_ONLY --=20 2.38.1 From nobody Sat Jun 15 03:18:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686655900; cv=none; d=zohomail.com; s=zohoarc; b=SNmPCV4CgP7nDip4J5aKU+qfZztOjObpouirjYcUZX/ysWnAKGzRme9mJM7XpUXnIxfPO4TjXg9WiLNxg2gjUjJvhyvOL1p4n0VA9+Ylg9pbbwVUmlPk4UWPKYNVbce9nYep90cNi9lJ2O05vYyicDghUWdXGjRuk7JJmqhqsZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686655900; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/ozRwFUKWRP9SpYUuH4++21vufDHRVG5o5zoM8NlA8A=; b=N4QuTfyEcdFmREKq9eMCukN3pIiMZRYRQzA9V/bwqCb6zmLC40waxCq95l1Ov9/m8cH70iVLUSmUzjV/P/3FA/M8f3qPinY9CzdTX+JXLYJTcJwjrXnf5OIaKsuFSWBMyGFHOR5eA2AShl5putdUDgitepaVtlO8PSM/aSWuZ1M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686655900314740.631288827811; Tue, 13 Jun 2023 04:31:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q90UU-0005Xi-RH; Tue, 13 Jun 2023 05:39:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q90UT-0005X7-Bf for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:39:05 -0400 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q90UR-0005aL-Fq for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:39:05 -0400 Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-977ed383b8aso853475266b.3 for ; Tue, 13 Jun 2023 02:39:02 -0700 (PDT) Received: from localhost.localdomain ([185.140.244.249]) by smtp.gmail.com with ESMTPSA id k13-20020a17090627cd00b0096f6647b5e8sm6386417ejc.64.2023.06.13.02.39.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Jun 2023 02:39:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686649141; x=1689241141; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/ozRwFUKWRP9SpYUuH4++21vufDHRVG5o5zoM8NlA8A=; b=EqmIHAlOkhSVXOi34f3WHCE3KVNRFobnObL15ntex6WmrhLzofdoibUznIGGpU5JCN c4QN6CF8MclNTUYCWHeIPpWEeuGrWUWCRWBqsMCxucOhPLXXU3K7cIWg/O4wOtLRA0H3 yIOFNPMi66wAwt1S0b/QMogRq/ISbTaWWmdESgq3o+JzBKs7REV/gcIAEGuVHeX3ekQo BUcYnaNt09ye6kMZVuYRcmDtFG/aGiYloOricp+hoa7K7j7z619/SFdDT6Up0TfZOrFD vMj2TuW1cJFUpa65KKSwR0/6t4EvRryajf5saQNG2RXbIQuifA6rwxqN8uI2X1OaLxTd mWvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686649141; x=1689241141; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/ozRwFUKWRP9SpYUuH4++21vufDHRVG5o5zoM8NlA8A=; b=gT3g+rW7VqTTqy+z9jAnHnTj8L0NvtdtDfjQ5uWyzQmZx0s38hl6x/gnuTRcCkim1B iWgOFUFixfQBbpveU0c348sbz1V0hATL80KDM36tYwO0Hyp6Im95o0PAir3C2FLgelF1 +Rj70Wiyvh6FjpSnXTZjTz5QbDYtMVhrQCKl5gs39MS1MiBrkuDFATXwDAbc9M+kfPl6 ge3NkOWeh97ucYhhaDAkpiiwJnQwtK+yPIcTpOQa+139WYdaeZ64Kzk8OSox+v/KAzhF 5VT24AAZr5BrAbmZnWFYRMUCJn48nEIjbomft/d9BwTFu0M7hybAyaf7CIf0apLGbWVd XTQA== X-Gm-Message-State: AC+VfDyOGbohGDLzJtSSVyZWMx29xwEKusun9tI6lL6XBGeoZIAcGhpA ZlOK3zSeeDO9+omKYV99PiDCzX0NsqTX3adUtLwFAQ== X-Google-Smtp-Source: ACHHUZ4sb8R3Ya4+u09794yTtf9NVfaBWUJg+fupkzPj+Kxu6bvCy7rVEUkdcggSQSKI7wGsR3gfbA== X-Received: by 2002:a17:907:94ca:b0:979:dad9:4e9 with SMTP id dn10-20020a17090794ca00b00979dad904e9mr11591549ejc.50.1686649141524; Tue, 13 Jun 2023 02:39:01 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 08/17] target/i386/helper: Shuffle do_cpu_init() Date: Tue, 13 Jun 2023 11:38:13 +0200 Message-Id: <20230613093822.63750-9-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230613093822.63750-1-philmd@linaro.org> References: <20230613093822.63750-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62f; envelope-from=philmd@linaro.org; helo=mail-ej1-x62f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686655901000100001 Move the #ifdef'ry inside do_cpu_init() instead of declaring an empty stub for user emulation. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20230602224628.59546-3-philmd@linaro.org> --- target/i386/helper.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/target/i386/helper.c b/target/i386/helper.c index 792c8eb45e..89aa696c6d 100644 --- a/target/i386/helper.c +++ b/target/i386/helper.c @@ -580,9 +580,9 @@ int cpu_x86_get_descr_debug(CPUX86State *env, unsigned = int selector, return 1; } =20 -#if !defined(CONFIG_USER_ONLY) void do_cpu_init(X86CPU *cpu) { +#if !defined(CONFIG_USER_ONLY) CPUState *cs =3D CPU(cpu); CPUX86State *env =3D &cpu->env; CPUX86State *save =3D g_new(CPUX86State, 1); @@ -601,19 +601,15 @@ void do_cpu_init(X86CPU *cpu) kvm_arch_do_init_vcpu(cpu); } apic_init_reset(cpu->apic_state); +#endif /* CONFIG_USER_ONLY */ } =20 +#ifndef CONFIG_USER_ONLY + void do_cpu_sipi(X86CPU *cpu) { apic_sipi(cpu->apic_state); } -#else -void do_cpu_init(X86CPU *cpu) -{ -} -#endif - -#ifndef CONFIG_USER_ONLY =20 void cpu_load_efer(CPUX86State *env, uint64_t val) { --=20 2.38.1 From nobody Sat Jun 15 03:18:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686656340; cv=none; d=zohomail.com; s=zohoarc; b=gB3/zP/mPrKKb2bmapErmL5rRhf7a2rbNfrIHoV7q6ZvRV4Qi2jplIzTqTewqlB2Aqr24ekzkd1sMFJ/M7Eh56Ekab+AvPBOHqKSC2j8+miI5dApuf8Nvv4YxJOsht/qQz5/1HVvOuMThHeBYkXdO/1sF4E8bnMXIxAP6SdQsyc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686656340; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rHrcXRiCbN+BH2DRfEnwQXK6yfm4A30MJfpoXN1BebI=; b=HK7EHqU1hDEGzeF1MrGPIee3CXaK3zrDI4TbtKi3sr0aw0OecOvpq9XhYGTqmJFlkAwa5FztABN27wEU5hdHRDPObCquVuteB7cIEDZA7IT0fyvVJR4YHZvDu44M8t0o5X3fq+fcIib0VEMwqTmkQx9UOZGDJPeZidGa6z+igA4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16866563402232.197713805363037; Tue, 13 Jun 2023 04:39:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q90UZ-0005Yn-Dt; Tue, 13 Jun 2023 05:39:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q90UX-0005YP-PD for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:39:09 -0400 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q90UV-0005aw-7s for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:39:09 -0400 Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-5169f920a9dso10849915a12.0 for ; Tue, 13 Jun 2023 02:39:06 -0700 (PDT) Received: from localhost.localdomain ([185.140.244.249]) by smtp.gmail.com with ESMTPSA id v4-20020a056402184400b00515c8024cb9sm6307552edy.55.2023.06.13.02.39.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Jun 2023 02:39:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686649145; x=1689241145; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rHrcXRiCbN+BH2DRfEnwQXK6yfm4A30MJfpoXN1BebI=; b=Uxl4dn5ovOJmJAUv6ODkGAf4umvAEAxumdIhkeAYQVquTw7yrUatHJyPKojN3GsBRi Balc1lXqfTyeKEp9S+D1z2eDKkqRKv7zXpleP6C5ZGyU/aBEdUdW0LabCig+J9fYxugt 58BJMN//atHclN/VpDgDCdZJ/Krjq+FQxzf6mzlPczJdWKHG7HHq6fffXx8XSzZm3R4H vrk2JrJ+wzov4eKVwivn34nE/TpgyyIzB4JUCL3d/af9INfAE++tzFSES8mCbmWDHMb5 yRI++YXpvf27wack8fMH+9pA23nLGHPvasgzVimf1ahAlPIFNp9M2LjmebOLYvVf8jX4 Rngw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686649145; x=1689241145; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rHrcXRiCbN+BH2DRfEnwQXK6yfm4A30MJfpoXN1BebI=; b=jUEUFAFVhFFsOipE4wCId6XZk5MGee9R9h+56piiyAxjdjfZrqE0IBt8D/QjX1BBBG mJupzEc8hik57yWLSX9MhxOYDZpAz3P/RBNYhzZ2R1JAskg0k1emLrhbVvKSytaXSg/k KbsIpajJYyItKF0t1ubDzKP58BfMharZ09nhNSKVi/cHV9dqLpXZVrgZ3JI1/Xs5yEK0 bpWVNGYN/Vbp8AF3Mvm/N8qxGF4ddRY03xyIj/B7jY3RRJL8pIalLJCJIqhhMMbjo8zl UPa2ZTdibSRPucjsaAtcekZiTBgAFyXnToTj7tCDkdX4gjLtAAQpuzSEaGwTZUnDPqti wY9w== X-Gm-Message-State: AC+VfDzOP38Fa/Syy5MnQZGj1WlN1rQvyCTFqRbUkaQ7P0VIeYyrIqVT 6HWI34AA8xQWyAgEymMYkGoQhAJiPR8/olvCGgQVYg== X-Google-Smtp-Source: ACHHUZ5xN/Sz4P86Y4Acc1+K4h3MpySnSoa+xRfMzEisvEQo0Fk3+xo2rU3ntNWrSiP/W3nNfsjwnA== X-Received: by 2002:a05:6402:35d1:b0:514:94be:323c with SMTP id z17-20020a05640235d100b0051494be323cmr8704889edc.10.1686649145606; Tue, 13 Jun 2023 02:39:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 09/17] target/i386: Rename helper template headers as '.h.inc' Date: Tue, 13 Jun 2023 11:38:14 +0200 Message-Id: <20230613093822.63750-10-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230613093822.63750-1-philmd@linaro.org> References: <20230613093822.63750-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=philmd@linaro.org; helo=mail-ed1-x536.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686656341446100001 Since commit 139c1837db ("meson: rename included C source files to .c.inc"), QEMU standard procedure for included C files is to use *.c.inc. Besides, since commit 6a0057aa22 ("docs/devel: make a statement about includes") this is documented as the Coding Style: If you do use template header files they should be named with the ``.c.inc`` or ``.h.inc`` suffix to make it clear they are being included for expansion. Therefore move the included templates in the tcg/ directory and rename as '.h.inc'. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20230608133108.72655-5-philmd@linaro.org> --- target/i386/helper.h | 6 +++--- .../{cc_helper_template.h =3D> cc_helper_template.h.inc} | 0 .../i386/{ops_sse_header.h =3D> tcg/ops_sse_header.h.inc} | 0 .../shift_helper_template.h.inc} | 0 target/i386/tcg/cc_helper.c | 8 ++++---- target/i386/tcg/int_helper.c | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) rename target/i386/tcg/{cc_helper_template.h =3D> cc_helper_template.h.inc= } (100%) rename target/i386/{ops_sse_header.h =3D> tcg/ops_sse_header.h.inc} (100%) rename target/i386/{shift_helper_template.h =3D> tcg/shift_helper_template= .h.inc} (100%) diff --git a/target/i386/helper.h b/target/i386/helper.h index e627a93107..48609c210b 100644 --- a/target/i386/helper.h +++ b/target/i386/helper.h @@ -203,11 +203,11 @@ DEF_HELPER_1(enter_mmx, void, env) DEF_HELPER_1(emms, void, env) =20 #define SHIFT 0 -#include "ops_sse_header.h" +#include "tcg/ops_sse_header.h.inc" #define SHIFT 1 -#include "ops_sse_header.h" +#include "tcg/ops_sse_header.h.inc" #define SHIFT 2 -#include "ops_sse_header.h" +#include "tcg/ops_sse_header.h.inc" =20 DEF_HELPER_3(rclb, tl, env, tl, tl) DEF_HELPER_3(rclw, tl, env, tl, tl) diff --git a/target/i386/tcg/cc_helper_template.h b/target/i386/tcg/cc_help= er_template.h.inc similarity index 100% rename from target/i386/tcg/cc_helper_template.h rename to target/i386/tcg/cc_helper_template.h.inc diff --git a/target/i386/ops_sse_header.h b/target/i386/tcg/ops_sse_header.= h.inc similarity index 100% rename from target/i386/ops_sse_header.h rename to target/i386/tcg/ops_sse_header.h.inc diff --git a/target/i386/shift_helper_template.h b/target/i386/tcg/shift_he= lper_template.h.inc similarity index 100% rename from target/i386/shift_helper_template.h rename to target/i386/tcg/shift_helper_template.h.inc diff --git a/target/i386/tcg/cc_helper.c b/target/i386/tcg/cc_helper.c index 6227dbb30b..c310bd842f 100644 --- a/target/i386/tcg/cc_helper.c +++ b/target/i386/tcg/cc_helper.c @@ -58,21 +58,21 @@ const uint8_t parity_table[256] =3D { }; =20 #define SHIFT 0 -#include "cc_helper_template.h" +#include "cc_helper_template.h.inc" #undef SHIFT =20 #define SHIFT 1 -#include "cc_helper_template.h" +#include "cc_helper_template.h.inc" #undef SHIFT =20 #define SHIFT 2 -#include "cc_helper_template.h" +#include "cc_helper_template.h.inc" #undef SHIFT =20 #ifdef TARGET_X86_64 =20 #define SHIFT 3 -#include "cc_helper_template.h" +#include "cc_helper_template.h.inc" #undef SHIFT =20 #endif diff --git a/target/i386/tcg/int_helper.c b/target/i386/tcg/int_helper.c index 599ac968b0..05418f181f 100644 --- a/target/i386/tcg/int_helper.c +++ b/target/i386/tcg/int_helper.c @@ -448,20 +448,20 @@ target_ulong helper_pext(target_ulong src, target_ulo= ng mask) } =20 #define SHIFT 0 -#include "shift_helper_template.h" +#include "shift_helper_template.h.inc" #undef SHIFT =20 #define SHIFT 1 -#include "shift_helper_template.h" +#include "shift_helper_template.h.inc" #undef SHIFT =20 #define SHIFT 2 -#include "shift_helper_template.h" +#include "shift_helper_template.h.inc" #undef SHIFT =20 #ifdef TARGET_X86_64 #define SHIFT 3 -#include "shift_helper_template.h" +#include "shift_helper_template.h.inc" #undef SHIFT #endif =20 --=20 2.38.1 From nobody Sat Jun 15 03:18:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686655460; cv=none; d=zohomail.com; s=zohoarc; b=bgEaFUghs09IfGRVw0y9bxZ2PI9H665N1ekVbznf+f02J8PC8QDGAKlcKnsf4xWpmLLV00qLzL8IkhhpuKqtgJiDoaM6h24rlgxqXFYP+j5po2HHmrRazg3qA+HGdcmG3pkt7XntmqfPcR9aCykfCsUCNbO5imvg19RXBVDQtC4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686655460; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/D7wkI1JesyjQo8qFwOoKcnfGvIlymgwtmf2GQlKJIc=; b=G2T1JJzpAyD5+uNd46J/kOl5fwvkoqipwVf9iOgfivq3VFEv7t1JdvIY2BJkrWRw9tLjmIsAmdsKtP4v8OIy9Fu0zIYdhfB/jVFc61duSKbnEb7nam6xyn5btMsZjeuRcjpaf29rieqQf0vqLKOoW++qMuHeFAigCw085sAWh/I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686655460297283.04745393385747; Tue, 13 Jun 2023 04:24:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q90Ue-0005Zt-0W; Tue, 13 Jun 2023 05:39:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q90Uc-0005Zc-GR for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:39:14 -0400 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q90UZ-0005be-Ff for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:39:14 -0400 Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-9786fc23505so778218566b.2 for ; Tue, 13 Jun 2023 02:39:11 -0700 (PDT) Received: from localhost.localdomain ([185.140.244.249]) by smtp.gmail.com with ESMTPSA id w23-20020a170906b19700b009746394662asm6403119ejy.53.2023.06.13.02.39.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Jun 2023 02:39:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686649150; x=1689241150; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/D7wkI1JesyjQo8qFwOoKcnfGvIlymgwtmf2GQlKJIc=; b=fq/uTziqCef/oigNwOx9ee1rF0B1HfKKLDByBWHosf8Qghsd7AGtYqSrMdRs2xISSD kIbNbd7kgxBpiLctHOKykmDUkzvWzVNRKoLq+2gM7vDrHdv10XadNjkqAju+jmO6kLI9 R9+Tt0qucT1DkwnL9Vybo1b+j81Fff14Sb1mM5vdBW0GzSF7MaZo0Mp2eqFf4Ox1t8aa E/dC/X//80g3rFgNzqC0A5XebbpQnG27UbH1dyQIFh0HRQtHUwMddQh54MeChPl+vSwq iAGCznSt5aPC7oLkOQoYu1DQ3c/bvWDBg6AHjOHJfQhOpyq5/Fz7aA+y4I5SIexycWSM BLMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686649150; x=1689241150; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/D7wkI1JesyjQo8qFwOoKcnfGvIlymgwtmf2GQlKJIc=; b=FCzzfaDKJtAA6VtzwZT5k7dtAShdUNcWwYDrkcZr9Yru9YQAJKmH/cmEMFDf3cuJg2 iDObeMcXTnhgrrq0UyzdoWNL0cUWH5D+qIyDv/yhIJIvR0kmSxJqR3SpNo66XSNj3LmW l+vv6DzshlAYO+MzOhQSdTh0/8JW1f3zxlxKkhFVCIkuVjka3gMzFapt2SkRdM0kUZYt MEHnGaEnYDQnl86TkR2klQU4ki7IHvKClfZPNFiMF1+P/9sxUU+j/Gg3vxmylTODsHyX one/e60uKBxxiy5QBOx+tcmBhRxefQN8D4nk79vnlsel4stjLGFzkQ6haBSyYIe6tc/6 rPUg== X-Gm-Message-State: AC+VfDxrwWsa+3s/mIgM8j3gdE4UdaUebCIEisnrNKpDpRHTwTzUx2iV +3j4IecitySzJvIhyOt7zeME59o5oSwbyX9GH/nBZA== X-Google-Smtp-Source: ACHHUZ6T6NHUuFXZEdMwWG/kufwmZjuaQ970KtqwsIYl12N5QG017sERYexedTEW0hGBrjgsP3ItLA== X-Received: by 2002:a17:907:7f0f:b0:97e:ab93:b246 with SMTP id qf15-20020a1709077f0f00b0097eab93b246mr8731430ejc.66.1686649149808; Tue, 13 Jun 2023 02:39:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Patrick Venture , Hao Wu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Corey Minyard Subject: [PULL 10/17] hw/i2c: Enable an id for the pca954x devices Date: Tue, 13 Jun 2023 11:38:15 +0200 Message-Id: <20230613093822.63750-11-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230613093822.63750-1-philmd@linaro.org> References: <20230613093822.63750-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=philmd@linaro.org; helo=mail-ej1-x629.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686655461846100001 From: Patrick Venture This allows the devices to be more readily found and specified. Without setting the name field, they can only be found by device type name, which doesn't let you specify the second of the same device type behind a bus. Tested: Verified that by default the device was findable with the name 'pca954x[77]', for an instance attached at that address. Signed-off-by: Patrick Venture Reviewed-by: Hao Wu Reviewed-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Corey Minyard Message-Id: <20230322172136.48010-1-venture@google.com> [PMD: Fix typo in property name] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/i2c/i2c_mux_pca954x.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/hw/i2c/i2c_mux_pca954x.c b/hw/i2c/i2c_mux_pca954x.c index 3945de795c..db5db956a6 100644 --- a/hw/i2c/i2c_mux_pca954x.c +++ b/hw/i2c/i2c_mux_pca954x.c @@ -20,6 +20,7 @@ #include "hw/i2c/i2c_mux_pca954x.h" #include "hw/i2c/smbus_slave.h" #include "hw/qdev-core.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/log.h" #include "qemu/module.h" @@ -43,6 +44,8 @@ typedef struct Pca954xState { =20 bool enabled[PCA9548_CHANNEL_COUNT]; I2CBus *bus[PCA9548_CHANNEL_COUNT]; + + char *name; } Pca954xState; =20 /* @@ -181,6 +184,17 @@ static void pca9548_class_init(ObjectClass *klass, voi= d *data) s->nchans =3D PCA9548_CHANNEL_COUNT; } =20 +static void pca954x_realize(DeviceState *dev, Error **errp) +{ + Pca954xState *s =3D PCA954X(dev); + DeviceState *d =3D DEVICE(s); + if (s->name) { + d->id =3D g_strdup(s->name); + } else { + d->id =3D g_strdup_printf("pca954x[%x]", s->parent.i2c.address); + } +} + static void pca954x_init(Object *obj) { Pca954xState *s =3D PCA954X(obj); @@ -197,6 +211,11 @@ static void pca954x_init(Object *obj) } } =20 +static Property pca954x_props[] =3D { + DEFINE_PROP_STRING("name", Pca954xState, name), + DEFINE_PROP_END_OF_LIST() +}; + static void pca954x_class_init(ObjectClass *klass, void *data) { I2CSlaveClass *sc =3D I2C_SLAVE_CLASS(klass); @@ -209,9 +228,12 @@ static void pca954x_class_init(ObjectClass *klass, voi= d *data) rc->phases.enter =3D pca954x_enter_reset; =20 dc->desc =3D "Pca954x i2c-mux"; + dc->realize =3D pca954x_realize; =20 k->write_data =3D pca954x_write_data; k->receive_byte =3D pca954x_read_byte; + + device_class_set_props(dc, pca954x_props); } =20 static const TypeInfo pca954x_info[] =3D { --=20 2.38.1 From nobody Sat Jun 15 03:18:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686655786; cv=none; d=zohomail.com; s=zohoarc; b=OjG2Hl4kczTdcYCpQJ7mDTAE5OIL0Zad36UNDxkeoJHGA19BnGqjVHgY0II2lD8lj3Z1gG4gVe3d08UG8JjPOcLO+54AJT74dusDRk/OpW9gZb7NlnPipW48Wf1sKq5FGhJ2XfelU7ajwRsL2x9NVeYZFWx9VvBLTxi8F8OYof4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686655786; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=x2jo3NykLrkWBJhw7LXeamiV1DdBMNZRbXtGEhY4Rnw=; b=hEIqujrK8bxi7zS04qf2epqbcxcxJ+Ik0UJGdLxuodb/5Xv9YlB9RB4pAtDyQOrJRW+YJ7hwvw4xyZkFwRAqdwrq0z7kQhu9EniRIdoPSrEQhRxbqV9ppfjG1zDZ0exRLAx33g9MkTxLR2NtlL71Q88xd8KETOsbNX0T17ks7yE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686655786592120.58539566061438; Tue, 13 Jun 2023 04:29:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q90Us-0005fV-Ij; Tue, 13 Jun 2023 05:39:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q90Ur-0005f0-6A for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:39:29 -0400 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q90Uf-0005d8-JG for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:39:28 -0400 Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-977c89c47bdso955833766b.2 for ; Tue, 13 Jun 2023 02:39:17 -0700 (PDT) Received: from localhost.localdomain ([185.140.244.249]) by smtp.gmail.com with ESMTPSA id w15-20020a1709062f8f00b009534211cc97sm6358163eji.159.2023.06.13.02.39.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Jun 2023 02:39:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686649155; x=1689241155; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=x2jo3NykLrkWBJhw7LXeamiV1DdBMNZRbXtGEhY4Rnw=; b=XxVex2w7HrwCcsJHDkTat5UBtXx7F53UseaDsE59/7S3Gv7w0rPJQLX3sESivWEGJz VJiNx/Ke3kOAaolsPwMkw9AzLMhyPYK/eXx5Ao0xtMxqaa/nspQeNadKJqfELtlQZlEe NH+Tv/g6r8UBm0ItJ57QtLBHkb3qJxVmiTh+pFSyG7fPkTYaGXmkXLguv2HDyMLStZ0T L7tB9xiDX2wOxnqpmQXcuGINYwRRjOydCC1YywQ7SBVgViaCny3n1+LlXK0LHSrJaaLy CUOAtjqdVrGT39jmkp3tzgED1mNyHDHf9btgv0ePr1NW2XTFM5X/el0QyqjyG3x5Qncl ddmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686649155; x=1689241155; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x2jo3NykLrkWBJhw7LXeamiV1DdBMNZRbXtGEhY4Rnw=; b=f75kgILF6BO0zlMUOGzTPqiK93jOLkhrSsXLdQDUJHln2EQvMzQhk04OmzDWvQHTLh ODHlbLIO4Id+/ssB2e/Ca+PTdzWYfpW/7KsdEzdyw6zGpk4O1rm+cR5xtaGQqt+auz4a kzimLzWw8asazVecTF2771yriSkjzWzfH1zsiERRJSJ9eB9UQqN3POSLjVoVtwUrbAXq HmyVP52jMtOXp5HqP18IYhGV2NMYL9qzmBZWwWMkhEieJB0sJ7n8jrqd5oRfQP/grCT0 iaLebsDBQ2pz8YGWWyCXZQv6jDpC7aJjtIia3WZLHy3OsNg1quXnUym/P+w8kyW7y0c4 mwGA== X-Gm-Message-State: AC+VfDykKeJWFX2lM4oi3z+Lpf96OEyE90Px+DJ6cY3pzUW5g7MXWdUO +uVINDWp+6MWAsOisPkEFUlURwXBiFGUhhW5H82cRw== X-Google-Smtp-Source: ACHHUZ5yH8KZ2YjSZ0PKCqw1GY+nATgl+pXVSr/oWLYtFfcnThhrN2uq6S9pU8GoKEWWpN0Ao88IIQ== X-Received: by 2002:a17:907:7b91:b0:977:d48f:97ad with SMTP id ne17-20020a1709077b9100b00977d48f97admr14304901ejc.75.1686649154952; Tue, 13 Jun 2023 02:39:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Niklas Cassel , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow Subject: [PULL 11/17] hw/ide/ahci: Remove stray backslash Date: Tue, 13 Jun 2023 11:38:16 +0200 Message-Id: <20230613093822.63750-12-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230613093822.63750-1-philmd@linaro.org> References: <20230613093822.63750-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::636; envelope-from=philmd@linaro.org; helo=mail-ej1-x636.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686655787348100001 From: Niklas Cassel This backslash obviously does not belong here, so remove it. Signed-off-by: Niklas Cassel Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: John Snow Message-Id: <20230601134434.519805-2-nks@flawful.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ide/ahci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 4e76d6b191..48d550f633 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -690,7 +690,7 @@ static void ahci_reset_port(AHCIState *s, int port) =20 s->dev[port].port_state =3D STATE_RUN; if (ide_state->drive_kind =3D=3D IDE_CD) { - ahci_set_signature(d, SATA_SIGNATURE_CDROM);\ + ahci_set_signature(d, SATA_SIGNATURE_CDROM); ide_state->status =3D SEEK_STAT | WRERR_STAT | READY_STAT; } else { ahci_set_signature(d, SATA_SIGNATURE_DISK); --=20 2.38.1 From nobody Sat Jun 15 03:18:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686655625; cv=none; d=zohomail.com; s=zohoarc; b=m8p6Fr2H1BH6jfBlVxYR41I8f1dz4Iglb0zucP1vzdiapwQWnCM953NZuFB5Zb+7zSLJ1LT6jTFOMXcIQiw0UGO9xaBbbIDW39PSRNkguvtdMa+vjL9kvj/P18qNs11SD8NHJPpt4XfPY2OyVFtuYPgrUho2pDXwzC9Fz6jHJ9w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686655625; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eupMI3Meu8cffWS+qjznZxnt/lkJ4Ptq7I5pw8yZlMY=; b=KuhzKgckhs/IQXjyTAlC7HJnMR0bAPQllo+nTNTuZa8AI+WZ2jvhecr10R5qLpEmLR28qWO6gHGqGWHYtmbQudP0nh2XaDpYTcbc5jMWJ0x0Yo8pxqxNahiG8SHUrTCg4u9vtgIQntuq01Y6AjMQkIFaC1T7zAqXsPSXqG36uiY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686655625289394.59262668653173; Tue, 13 Jun 2023 04:27:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q90Uq-0005ew-VW; Tue, 13 Jun 2023 05:39:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q90Up-0005eZ-SB for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:39:27 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q90Uj-0005df-SQ for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:39:27 -0400 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-9745d99cfccso937839466b.1 for ; Tue, 13 Jun 2023 02:39:21 -0700 (PDT) Received: from localhost.localdomain ([185.140.244.249]) by smtp.gmail.com with ESMTPSA id m25-20020a1709062b9900b0096637a19dccsm6318257ejg.210.2023.06.13.02.39.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Jun 2023 02:39:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686649159; x=1689241159; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eupMI3Meu8cffWS+qjznZxnt/lkJ4Ptq7I5pw8yZlMY=; b=K2Vb46ASF7WJ45/pWoE+CvyqBsi3zplG7pR4R2HR8XgsS2gLwQatnABew+2l3dLof6 Qt/X4cnfNlq0xpKVhZaADfy6XfTiEJLjguRDeMSHd4ztui73693xVi21mEiF3Uhqx0pR YRKirmzTgX1GertNwhFYaosB4qTLbxJMFTJPXwIi2uh5WlLKtfSZCVFc76KMjoCpqa2S v+JhWM0wZaHHZgyDBzGpIAtp3DRhGyqLzwxCm+CCsFuNSRyC3mcF1RbSmbExTOYscn9C 2JwNAWJHHLB02mCN05ZqkoybJbblASlRNnOSmlA9etqxksl6DHDQvtNa/2+aO+d9AH67 UGsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686649159; x=1689241159; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eupMI3Meu8cffWS+qjznZxnt/lkJ4Ptq7I5pw8yZlMY=; b=ZIYvoKvIC6/lwYAafAbPzdwwIMbBhoaHsBptW53XNciBjsnxJP+ehI7PgAA1L0Of/9 oS4kZY4/EygVbDoyWySnGGvMVhsw27es09AUXjmDHqOebL82aNXU2jb96FZuy8pUVoAu X682xcKVQLv778Gfsb3bmZaGYKSIiI/S2HYMEZOK8uHcMcLurTBZ72lULG+LDbP3O6Qp oxpw/4lw08Y0iZ5yB9b3fTi4czHeh+j92QKnC+PRJxCqH8R6qnPJVobctQfkR4MsgEG5 /b2K7JGwUiaF8lp3IpJf/Gs2wHfd/SVBDQstLsHQK9AHo742kZ0sonvVWTa2Cf/iiaen BbUw== X-Gm-Message-State: AC+VfDwzXMeYFvh0Vc6rQUulCUhpFC3y3XKmVFKP32BE8waCx0y2tfK7 kSpYIcnQJfHqWTyVwjQnTuMO1tY//bGsDsMK+ejEHA== X-Google-Smtp-Source: ACHHUZ6pm/AFHadErPXK5opeCQmLb9IdiBtBTVr4LWpI0tTohdISQqo3tdvQ2rkU3fpu+Ve672F1qQ== X-Received: by 2002:a17:907:7da9:b0:973:93d6:189f with SMTP id oz41-20020a1709077da900b0097393d6189fmr14472263ejc.61.1686649159550; Tue, 13 Jun 2023 02:39:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Hannes Reinecke Subject: [PULL 12/17] hw/scsi/megasas: Silent GCC duplicated-cond warning Date: Tue, 13 Jun 2023 11:38:17 +0200 Message-Id: <20230613093822.63750-13-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230613093822.63750-1-philmd@linaro.org> References: <20230613093822.63750-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=philmd@linaro.org; helo=mail-ej1-x635.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686655627274100003 From: Philippe Mathieu-Daud=C3=A9 GCC9 is confused when building with CFLAG -O3: hw/scsi/megasas.c: In function =E2=80=98megasas_scsi_realize=E2=80=99: hw/scsi/megasas.c:2387:26: error: duplicated =E2=80=98if=E2=80=99 conditi= on [-Werror=3Dduplicated-cond] 2387 | } else if (s->fw_sge >=3D 128 - MFI_PASS_FRAME_SIZE) { hw/scsi/megasas.c:2385:19: note: previously used here 2385 | if (s->fw_sge >=3D MEGASAS_MAX_SGE - MFI_PASS_FRAME_SIZE) { cc1: all warnings being treated as errors When this device was introduced in commit e8f943c3bcc, the author cared about modularity, using a definition for the firmware limit. However if the firmware limit isn't changed (MEGASAS_MAX_SGE =3D 128), the code ends doing the same check twice. Per the maintainer [*]: > The original code assumed that one could change MFI_PASS_FRAME_SIZE, > but it turned out not to be possible as it's being hardcoded in the > drivers themselves (even though the interface provides mechanisms to > query it). So we can remove the duplicate lines. Add the 'MEGASAS_MIN_SGE' definition for the '64' magic value, slightly rewrite the condition check to simplify a bit the logic and remove the unnecessary / duplicated check. [*] https://lore.kernel.org/qemu-devel/e0029fc5-882f-1d63-15e3-1c3dbe9b6a2c= @suse.de/ Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Hannes Reinecke Message-Id: <20230328210126.16282-1-philmd@linaro.org> --- hw/scsi/megasas.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 9cbbb16121..32c70c9e99 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -42,6 +42,7 @@ #define MEGASAS_MAX_FRAMES 2048 /* Firmware limit at 65535 */ #define MEGASAS_DEFAULT_FRAMES 1000 /* Windows requires this */ #define MEGASAS_GEN2_DEFAULT_FRAMES 1008 /* Windows requires this */ +#define MEGASAS_MIN_SGE 64 #define MEGASAS_MAX_SGE 128 /* Firmware limit */ #define MEGASAS_DEFAULT_SGE 80 #define MEGASAS_MAX_SECTORS 0xFFFF /* No real limit */ @@ -2356,6 +2357,7 @@ static void megasas_scsi_realize(PCIDevice *dev, Erro= r **errp) MegasasState *s =3D MEGASAS(dev); MegasasBaseClass *b =3D MEGASAS_GET_CLASS(s); uint8_t *pci_conf; + uint32_t sge; int i, bar_type; Error *err =3D NULL; int ret; @@ -2424,13 +2426,15 @@ static void megasas_scsi_realize(PCIDevice *dev, Er= ror **errp) if (!s->hba_serial) { s->hba_serial =3D g_strdup(MEGASAS_HBA_SERIAL); } - if (s->fw_sge >=3D MEGASAS_MAX_SGE - MFI_PASS_FRAME_SIZE) { - s->fw_sge =3D MEGASAS_MAX_SGE - MFI_PASS_FRAME_SIZE; - } else if (s->fw_sge >=3D 128 - MFI_PASS_FRAME_SIZE) { - s->fw_sge =3D 128 - MFI_PASS_FRAME_SIZE; - } else { - s->fw_sge =3D 64 - MFI_PASS_FRAME_SIZE; + + sge =3D s->fw_sge + MFI_PASS_FRAME_SIZE; + if (sge < MEGASAS_MIN_SGE) { + sge =3D MEGASAS_MIN_SGE; + } else if (sge >=3D MEGASAS_MAX_SGE) { + sge =3D MEGASAS_MAX_SGE; } + s->fw_sge =3D sge - MFI_PASS_FRAME_SIZE; + if (s->fw_cmds > MEGASAS_MAX_FRAMES) { s->fw_cmds =3D MEGASAS_MAX_FRAMES; } --=20 2.38.1 From nobody Sat Jun 15 03:18:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686656812; cv=none; d=zohomail.com; s=zohoarc; b=V6bdvJOn26ThHM3ZZfecRMOH0ySW3fTqFT6Q9JJMfNEMelbgSSnfFxW1ZPfM+3bf0DzQ4b1TXGBSTaq1V4E/IwOQei6X/VCqaWZkT1EEiyc8/3k++6Or2+VBkCXzk9CIRURHjAqpnl3NeutetZ2R9jkIcAN886ImCR4odVNHwmE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686656812; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KTisvpy141VHl6Jl8IdlijmeVIKSJjM3R7YZNyvUfc8=; b=bz/yLi2vZCNCA0/IgTPzKKwZSPOGem93GbY93crNfddRCA5LxUMw4g63CU+Rpl2aBb6xXNgkvxQiL6isJB7bNiTyTStO1NxxnDukaYZO4bux3tD9bWUsZgD2MtZIP2CEJACy1w3AMBvEL5myjHF6U/7Lrnh9PyPl8U05XsJT2sg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686656812496368.0605491305905; Tue, 13 Jun 2023 04:46:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q90V2-0005jd-2P; Tue, 13 Jun 2023 05:39:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q90V0-0005j5-52 for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:39:38 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q90Uq-0005el-2e for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:39:37 -0400 Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-51492ae66a4so7515895a12.1 for ; Tue, 13 Jun 2023 02:39:27 -0700 (PDT) Received: from localhost.localdomain ([185.140.244.249]) by smtp.gmail.com with ESMTPSA id z20-20020a1709064e1400b009745eddf997sm6334993eju.198.2023.06.13.02.39.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Jun 2023 02:39:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686649164; x=1689241164; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KTisvpy141VHl6Jl8IdlijmeVIKSJjM3R7YZNyvUfc8=; b=psp5IXJgfMdSJYnwqTBwlddCd7bqiI6xXCMYQwJUbZYy5d7h9ZUZBRjlyuNpMl2CyN E7Se8ZKfCthsEnV+OhT56ogVP69iE9HNea2ZfRctV6yRpetCsmV5NaT2j/LlUVBiwGzP vmvJQx9JqalNNAoT/afiF7iGIpOL2j/hewHY6QG+P3Ira/7sze3F+kltL54Q4xdlobII Il8IPfOxXTNgxsabQNrMRAj4EU7twYFqN9tymNsRjLYiikrPgR9butz5nc9eR0BCy7gQ IuSLteAufcBPcJyzYybreR+lOS616uOWm+9GOuCUQVMbXvsOxtXcvXhblRmMyX9jT8jq fUsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686649164; x=1689241164; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KTisvpy141VHl6Jl8IdlijmeVIKSJjM3R7YZNyvUfc8=; b=NklZ8/4ySSpA8H3AKbS3lOzxkP3ea+CULe+rx3TlSAvTqDeW4nj5k20j7T4RG2xNND QWQ3/gudZEQvZ3SZXmEYQ8BMSuhQrMscx+LNnNaT7E0MRFZEAeRMIp6B8HF3FxyWqQ1S eE+oWfTskiWFI2cKcYpuuHKEtqyUZ5Pm1ndv7O+C9O4eJfwksBOYyjFpqIO8gfVdjnIF 8IHJRBos8mRU5QmGCkS5ai/Dk95BHK/b4gpnDW9HYL8gk59mpI571JislY2QKKE0ayHY D7j2mGhXy3ajIJaf17G4K/VeDo0Xsl0gTi2av9x6zw588R9dkdj7Ex75+p5XoZuloAiO e8vA== X-Gm-Message-State: AC+VfDy+rdaTPKwdqd8lbDmpY1MkDo+KoUP6N1EkHuqvYLUo2T1CbirV JI9PXeZ1HNbmNg78IJIdwIwoVHS8tDley2cfQM8GTg== X-Google-Smtp-Source: ACHHUZ6hpEVEogvD+bdBlqsYRMAaz3ayvQKG8O3mL8chYqUb1kFvBjIGduNoArSoyj1DVrMbhEwuqQ== X-Received: by 2002:aa7:ca4b:0:b0:518:797c:6bee with SMTP id j11-20020aa7ca4b000000b00518797c6beemr624427edt.5.1686649163810; Tue, 13 Jun 2023 02:39:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Bernhard Beschow , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 13/17] hw/char/parallel: Export struct ParallelState Date: Tue, 13 Jun 2023 11:38:18 +0200 Message-Id: <20230613093822.63750-14-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230613093822.63750-1-philmd@linaro.org> References: <20230613093822.63750-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=philmd@linaro.org; helo=mail-ed1-x52c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686656814591100003 From: Bernhard Beschow Exporting ParallelState is a precondition for exporing TYPE_ISA_PARALLEL to= be performed in the next patch. Suggested-by: Mark Cave-Ayland Signed-off-by: Bernhard Beschow Reviewed-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20230612081238.1742-2-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/char/parallel.h | 21 +++++++++++++++++++++ hw/char/parallel.c | 20 -------------------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/include/hw/char/parallel.h b/include/hw/char/parallel.h index 29d2876d00..9f76edca81 100644 --- a/include/hw/char/parallel.h +++ b/include/hw/char/parallel.h @@ -1,9 +1,30 @@ #ifndef HW_PARALLEL_H #define HW_PARALLEL_H =20 +#include "exec/ioport.h" +#include "exec/memory.h" #include "hw/isa/isa.h" +#include "hw/irq.h" +#include "chardev/char-fe.h" #include "chardev/char.h" =20 +typedef struct ParallelState { + MemoryRegion iomem; + uint8_t dataw; + uint8_t datar; + uint8_t status; + uint8_t control; + qemu_irq irq; + int irq_pending; + CharBackend chr; + int hw_driver; + int epp_timeout; + uint32_t last_read_offset; /* For debugging */ + /* Memory-mapped interface */ + int it_shift; + PortioList portio_list; +} ParallelState; + #define TYPE_ISA_PARALLEL "isa-parallel" =20 void parallel_hds_isa_init(ISABus *bus, int n); diff --git a/hw/char/parallel.c b/hw/char/parallel.c index 3d32589bb3..e75fc5019d 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.c @@ -27,10 +27,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "chardev/char-parallel.h" -#include "chardev/char-fe.h" #include "hw/acpi/acpi_aml_interface.h" -#include "hw/irq.h" -#include "hw/isa/isa.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" @@ -76,23 +73,6 @@ =20 #define PARA_CTR_SIGNAL (PARA_CTR_SELECT|PARA_CTR_INIT|PARA_CTR_AUTOLF|PAR= A_CTR_STROBE) =20 -typedef struct ParallelState { - MemoryRegion iomem; - uint8_t dataw; - uint8_t datar; - uint8_t status; - uint8_t control; - qemu_irq irq; - int irq_pending; - CharBackend chr; - int hw_driver; - int epp_timeout; - uint32_t last_read_offset; /* For debugging */ - /* Memory-mapped interface */ - int it_shift; - PortioList portio_list; -} ParallelState; - OBJECT_DECLARE_SIMPLE_TYPE(ISAParallelState, ISA_PARALLEL) =20 struct ISAParallelState { --=20 2.38.1 From nobody Sat Jun 15 03:18:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686656411; cv=none; d=zohomail.com; s=zohoarc; b=G45mCahslFIpi2IV0d7/J7aNM/ezYf+FEwqXwy/Xi7kRTknQZaeTpZAeJ75HInlMYyPNvkyUAaO0GtyOccQ6q8EKCtc5zAYdaiVwVIAeo33JfA1Y/QgySTwXfGv3zkoBhujPMfEoE2/5K7vXRqwkr0flzHNFZuMUNTnr0VwfKtc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686656411; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2UvD454+E/4A8Q/LAPF1RA7H96fHdTps7nh2m1LLDUQ=; b=ak8DF/hD6lbkaOnWG70jKItFOpU158y0/2oLK8JPMOLq7aYDX3MbCYMckAFtk51N9CKzDv8RpDXMXJmu1GiJxAZu03d5Dd0vbTuI+W8He3W90/en0Z2Duim+o+Pb4MVXS6Av/fiovIwS4pAzE1WhjqnA671DhWsOmMmmIjwNK0Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686656411111111.24026786380534; Tue, 13 Jun 2023 04:40:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q90Wj-0005vT-8M; Tue, 13 Jun 2023 05:41:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q90Wh-0005vE-G9 for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:41:23 -0400 Received: from mail-ed1-f45.google.com ([209.85.208.45]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q90Vu-00062w-Eb for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:41:23 -0400 Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-5147e40bbbbso8018214a12.3 for ; Tue, 13 Jun 2023 02:40:33 -0700 (PDT) Received: from localhost.localdomain ([185.140.244.249]) by smtp.gmail.com with ESMTPSA id k10-20020a056402048a00b005149e012658sm6181916edv.34.2023.06.13.02.39.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Jun 2023 02:39:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686649169; x=1689241169; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2UvD454+E/4A8Q/LAPF1RA7H96fHdTps7nh2m1LLDUQ=; b=yfB922hVWq/dpgM5cDzY0Y4iKv2hNGBW6agoFw1UHGnEfO57BSaG6BmpNOgG5adKxb TIlV0tTmGvLNdvwFqfKrDIZ/Ha8UXW0rJTglQGJiLy79vlMGPBGS1VwSb6oKNoA6xVnZ dieOUi0osJiHmUp0b9KSunWgET00P+Si4sGzuBELwEJOVd/VBk+Shk6JwcPu2cmvzp1i ovaHCkLWpcGOzmUNEWIA8YOmXbLUylSSNKXzLN3ZBK9gYrCr0Ud91pOKanYjj/d6cZ0r NIjXbUvkQip0wYzn69F/leUbpXb5BUO2UZdSJoDTYsjSrG+Q5YZJGnQjMtCxKzraNL4C 6Uiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686649169; x=1689241169; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2UvD454+E/4A8Q/LAPF1RA7H96fHdTps7nh2m1LLDUQ=; b=Yjop5uvflPTbsWpnrt940ikZgRCYHWp6Gl1dRiZ/7P6ck+N9jCVFOf1zPBqO8XV1LA +LRjg5JCNwSj/PnKQFmDU+N0OFx0menlhH9h4hjEjjuokoyyuzsxseUaZ8HC5QQRPG6Q A9BVyNzlV0opc7pyL9PlO8pRAXXcdtvl+ykNeM6jnZvi+ImxPqzmufv6IdRU86MRrMPJ 4rknQ+8srN7xQ9QbIjbjory+KbD+HerOj3p/vLj121wOqmcaf3URZAuqFwXr3jqT/0bR OV5fPlY4zZmNKLmyh4Gs0n5psFj3W/n1fGaewnCB72MsD+yOz6Xt+UVBrZdOwUF9cQmE 0Vrw== X-Gm-Message-State: AC+VfDxyes5RCYNgLWCtGzMp7kWMSLe2oLCDibnJhjnujj2dY0iGhRrF 2ud+0Egh9CWPIAfzqruKIhETrTw8hsf+HsIqVeecmg== X-Google-Smtp-Source: ACHHUZ6e+yr69Ach54IimmTeICsFAHo5OVWxNVs0MJqltvnK4FVNR5hgMcuBcZ8RJ55d+1SgH9VAkQ== X-Received: by 2002:a05:6402:44d:b0:50b:d553:3822 with SMTP id p13-20020a056402044d00b0050bd5533822mr6106458edw.7.1686649168926; Tue, 13 Jun 2023 02:39:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Bernhard Beschow , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 14/17] hw/char/parallel-isa: Export struct ISAParallelState Date: Tue, 13 Jun 2023 11:38:19 +0200 Message-Id: <20230613093822.63750-15-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230613093822.63750-1-philmd@linaro.org> References: <20230613093822.63750-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=209.85.208.45; envelope-from=philmd@linaro.org; helo=mail-ed1-f45.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686656412848100007 From: Bernhard Beschow Allows the struct to be embedded directly into device models without additi= onal allocation. Suggested-by: Mark Cave-Ayland Signed-off-by: Bernhard Beschow Reviewed-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20230612081238.1742-3-shentey@gmail.com> [PMD: Update MAINTAINERS entry and use SPDX license identifier] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 2 +- include/hw/char/parallel-isa.h | 30 ++++++++++++++++++++++++++++++ include/hw/char/parallel.h | 2 -- hw/char/parallel-isa.c | 1 + hw/char/parallel.c | 12 +----------- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- hw/isa/isa-superio.c | 1 + hw/sparc64/sun4u.c | 2 +- 9 files changed, 37 insertions(+), 17 deletions(-) create mode 100644 include/hw/char/parallel-isa.h diff --git a/MAINTAINERS b/MAINTAINERS index 4a80a38511..88b5a7ee0a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1740,7 +1740,7 @@ F: hw/rtc/mc146818rtc* F: hw/watchdog/wdt_ib700.c F: hw/watchdog/wdt_i6300esb.c F: include/hw/display/vga.h -F: include/hw/char/parallel.h +F: include/hw/char/parallel*.h F: include/hw/dma/i8257.h F: include/hw/i2c/pm_smbus.h F: include/hw/input/i8042.h diff --git a/include/hw/char/parallel-isa.h b/include/hw/char/parallel-isa.h new file mode 100644 index 0000000000..d24ccecf05 --- /dev/null +++ b/include/hw/char/parallel-isa.h @@ -0,0 +1,30 @@ +/* + * QEMU ISA Parallel PORT emulation + * + * Copyright (c) 2003-2005 Fabrice Bellard + * Copyright (c) 2007 Marko Kohtala + * + * SPDX-License-Identifier: MIT + */ + +#ifndef HW_PARALLEL_ISA_H +#define HW_PARALLEL_ISA_H + +#include "parallel.h" + +#include "hw/isa/isa.h" +#include "qom/object.h" + +#define TYPE_ISA_PARALLEL "isa-parallel" +OBJECT_DECLARE_SIMPLE_TYPE(ISAParallelState, ISA_PARALLEL) + +struct ISAParallelState { + ISADevice parent_obj; + + uint32_t index; + uint32_t iobase; + uint32_t isairq; + ParallelState state; +}; + +#endif /* HW_PARALLEL_ISA_H */ diff --git a/include/hw/char/parallel.h b/include/hw/char/parallel.h index 9f76edca81..7b5a309a03 100644 --- a/include/hw/char/parallel.h +++ b/include/hw/char/parallel.h @@ -25,8 +25,6 @@ typedef struct ParallelState { PortioList portio_list; } ParallelState; =20 -#define TYPE_ISA_PARALLEL "isa-parallel" - void parallel_hds_isa_init(ISABus *bus, int n); =20 bool parallel_mm_init(MemoryRegion *address_space, diff --git a/hw/char/parallel-isa.c b/hw/char/parallel-isa.c index 547ae69304..ab0f879998 100644 --- a/hw/char/parallel-isa.c +++ b/hw/char/parallel-isa.c @@ -13,6 +13,7 @@ #include "sysemu/sysemu.h" #include "hw/isa/isa.h" #include "hw/qdev-properties.h" +#include "hw/char/parallel-isa.h" #include "hw/char/parallel.h" #include "qapi/error.h" =20 diff --git a/hw/char/parallel.c b/hw/char/parallel.c index e75fc5019d..147c900f0d 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.c @@ -31,6 +31,7 @@ #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" +#include "hw/char/parallel-isa.h" #include "hw/char/parallel.h" #include "sysemu/reset.h" #include "sysemu/sysemu.h" @@ -73,17 +74,6 @@ =20 #define PARA_CTR_SIGNAL (PARA_CTR_SELECT|PARA_CTR_INIT|PARA_CTR_AUTOLF|PAR= A_CTR_STROBE) =20 -OBJECT_DECLARE_SIMPLE_TYPE(ISAParallelState, ISA_PARALLEL) - -struct ISAParallelState { - ISADevice parent_obj; - - uint32_t index; - uint32_t iobase; - uint32_t isairq; - ParallelState state; -}; - static void parallel_update_irq(ParallelState *s) { if (s->irq_pending) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 42af03dbb4..44146e6ff5 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -26,7 +26,7 @@ #include CONFIG_DEVICES =20 #include "qemu/units.h" -#include "hw/char/parallel.h" +#include "hw/char/parallel-isa.h" #include "hw/dma/i8257.h" #include "hw/loader.h" #include "hw/i386/x86.h" diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 6155427e48..a9a59ed42b 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -30,7 +30,7 @@ =20 #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/char/parallel.h" +#include "hw/char/parallel-isa.h" #include "hw/loader.h" #include "hw/i2c/smbus_eeprom.h" #include "hw/rtc/mc146818rtc.h" diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c index 9292ec3bcf..7dbfc374da 100644 --- a/hw/isa/isa-superio.c +++ b/hw/isa/isa-superio.c @@ -21,6 +21,7 @@ #include "hw/isa/superio.h" #include "hw/qdev-properties.h" #include "hw/input/i8042.h" +#include "hw/char/parallel-isa.h" #include "hw/char/serial.h" #include "trace.h" =20 diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index e2858a0331..29e9b6cc26 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -35,7 +35,7 @@ #include "hw/qdev-properties.h" #include "hw/pci-host/sabre.h" #include "hw/char/serial.h" -#include "hw/char/parallel.h" +#include "hw/char/parallel-isa.h" #include "hw/rtc/m48t59.h" #include "migration/vmstate.h" #include "hw/input/i8042.h" --=20 2.38.1 From nobody Sat Jun 15 03:18:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686649891; cv=none; d=zohomail.com; s=zohoarc; b=BwS9P+9/0FaCdltcIiqYT2Agl1hfPocX9YeuDeNtozhppN8uOsiSWGrudExT/qivpoHbBAgQBLO+uz2OrXtXNfigoHJwJMDVSgc82BUKT5+AM8HZiTlFeafjILO829WgtkSmr6o9YgkJYumo9KmNgAzjJRVAGiS3o1jfO0Z2VYQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686649891; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=G228fEEG3KGPqTypnQQNKK4WYtjAfFhy5BxWLUD+e/U=; b=N0n9xT9tUvET+7Fbdr0+A4twY3K3f+OZrC5B08+XpRwTuvoT0aIsgb9tIiSMTk6mKWXxcaSCePNkCGwYBSr5rL8Eg7Vh//lhZoaI+E01XY8gS6Bfn3lAqjX+3U5TW3cZXLHVr7U+uVbZ77fnrzyAIbFxxRsPuZa0Ui0g/vLA2/8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686649891357185.88485065946668; Tue, 13 Jun 2023 02:51:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q90V8-0005km-Kq; Tue, 13 Jun 2023 05:39:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q90V6-0005kG-Qc for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:39:44 -0400 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q90Uy-0005gc-Ku for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:39:44 -0400 Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-5147e8972a1so9235104a12.0 for ; Tue, 13 Jun 2023 02:39:36 -0700 (PDT) Received: from localhost.localdomain ([185.140.244.249]) by smtp.gmail.com with ESMTPSA id a25-20020aa7d919000000b00511aea132b9sm6198912edr.3.2023.06.13.02.39.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Jun 2023 02:39:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686649173; x=1689241173; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=G228fEEG3KGPqTypnQQNKK4WYtjAfFhy5BxWLUD+e/U=; b=R4rj8sg6Hi0kVUyzc1faFJ1L557UaQ0xAO9Hcf5jAjeQNBD0weg2dfiyBC/CWE3CuF YyiRdR253zu7VNRtRXEVkN08gzWpP3rcxmvCzd8Uj1JAcJah1F9ZbOK6rhXL/H7UzZrH b5ehSPregSQXwUfmwJ/k2yREToZMONAfs/8rntWN4nVV+oolcSSsm+sukGNyQNoLg68j hJ1gVCUEERKe6/RqpsDTjPv9A5JJ56P/pGC4cI/kX7thT0+VubPuDpnYGqw/1wovPbVV HiFaGv2BJb3rrcT+QNld8RBkK9cc3yb5f/VFIcYhe78q6a2dYRttBASU3FrrhMcO1VRS Esog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686649173; x=1689241173; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=G228fEEG3KGPqTypnQQNKK4WYtjAfFhy5BxWLUD+e/U=; b=I1K8yjzF0vqpDHCWiBVUwdosaDNvKNcNn4J+p4Dy5aSUbAjtMfWuRSeA6b5xBhEJUd C5NyiSdNaHuSV+LrN46sH8LmBZuDizJqo8l101N3yQnqTAqKZhPrR/dTMTeoUXfh+Cxk duKZwSGiQqcdAR0HDKmV4kkCi8+uZVejdOV5w9EAlqYoIHUJaAbkt2lXxslRTCoy6iBU Ot9MrOCX1Yl0PxynhGuTnBihwGuHye0k1gmRTZV717yMuYY8gdI+jelKeb/nqGGeL7aE 1h6IM82nywJ/U36+rcO0mxVaG/KpC8/gDiTF0Mfh2w6uvctN67om+KR0g3p2N8Ty3MMP 805g== X-Gm-Message-State: AC+VfDx+D1FNGpjwnzgEVICuREL29Q5t+0f/NozBNHLPzKs+DqaxGGNU mqGknLmBcjH52xOc+GHt0xYRRNzEplkWl479wXCLrw== X-Google-Smtp-Source: ACHHUZ7EF8NRUhbcNcf/o6GffypDnxFTyPcq1+IQkLeDMH3F83pnFhg6YxQXQc53f4b+QgK4eyTBDw== X-Received: by 2002:a05:6402:1487:b0:518:670a:7c57 with SMTP id e7-20020a056402148700b00518670a7c57mr2243685edv.14.1686649173369; Tue, 13 Jun 2023 02:39:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Joao Martins , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 15/17] exec/ram_addr: Return number of dirty pages in cpu_physical_memory_set_dirty_lebitmap() Date: Tue, 13 Jun 2023 11:38:20 +0200 Message-Id: <20230613093822.63750-16-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230613093822.63750-1-philmd@linaro.org> References: <20230613093822.63750-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=philmd@linaro.org; helo=mail-ed1-x532.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686649892535100001 From: Joao Martins In preparation for including the number of dirty pages in the vfio_get_dirty_bitmap() tracepoint, return the number of dirty pages in cpu_physical_memory_set_dirty_lebitmap() similar to cpu_physical_memory_sync_dirty_bitmap(). To avoid counting twice when GLOBAL_DIRTY_RATE is enabled, stash the number of bits set per bitmap quad in a variable (@nbits) and reuse it there. Signed-off-by: Joao Martins Reviewed-by: Peter Xu Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20230530180556.24441-2-joao.m.martins@oracle.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/ram_addr.h | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 90a8269290..9f2e3893f5 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -334,14 +334,23 @@ static inline void cpu_physical_memory_set_dirty_rang= e(ram_addr_t start, } =20 #if !defined(_WIN32) -static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *b= itmap, - ram_addr_t start, - ram_addr_t pages) + +/* + * Contrary to cpu_physical_memory_sync_dirty_bitmap() this function retur= ns + * the number of dirty pages in @bitmap passed as argument. On the other h= and, + * cpu_physical_memory_sync_dirty_bitmap() returns newly dirtied pages that + * weren't set in the global migration bitmap. + */ +static inline +uint64_t cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap, + ram_addr_t start, + ram_addr_t pages) { unsigned long i, j; - unsigned long page_number, c; + unsigned long page_number, c, nbits; hwaddr addr; ram_addr_t ram_addr; + uint64_t num_dirty =3D 0; unsigned long len =3D (pages + HOST_LONG_BITS - 1) / HOST_LONG_BITS; unsigned long hpratio =3D qemu_real_host_page_size() / TARGET_PAGE_SIZ= E; unsigned long page =3D BIT_WORD(start >> TARGET_PAGE_BITS); @@ -369,6 +378,7 @@ static inline void cpu_physical_memory_set_dirty_lebitm= ap(unsigned long *bitmap, if (bitmap[k]) { unsigned long temp =3D leul_to_cpu(bitmap[k]); =20 + nbits =3D ctpopl(temp); qatomic_or(&blocks[DIRTY_MEMORY_VGA][idx][offset], tem= p); =20 if (global_dirty_tracking) { @@ -377,10 +387,12 @@ static inline void cpu_physical_memory_set_dirty_lebi= tmap(unsigned long *bitmap, temp); if (unlikely( global_dirty_tracking & GLOBAL_DIRTY_DIRTY_RAT= E)) { - total_dirty_pages +=3D ctpopl(temp); + total_dirty_pages +=3D nbits; } } =20 + num_dirty +=3D nbits; + if (tcg_enabled()) { qatomic_or(&blocks[DIRTY_MEMORY_CODE][idx][offset], temp); @@ -409,9 +421,11 @@ static inline void cpu_physical_memory_set_dirty_lebit= map(unsigned long *bitmap, for (i =3D 0; i < len; i++) { if (bitmap[i] !=3D 0) { c =3D leul_to_cpu(bitmap[i]); + nbits =3D ctpopl(c); if (unlikely(global_dirty_tracking & GLOBAL_DIRTY_DIRTY_RA= TE)) { - total_dirty_pages +=3D ctpopl(c); + total_dirty_pages +=3D nbits; } + num_dirty +=3D nbits; do { j =3D ctzl(c); c &=3D ~(1ul << j); @@ -424,6 +438,8 @@ static inline void cpu_physical_memory_set_dirty_lebitm= ap(unsigned long *bitmap, } } } + + return num_dirty; } #endif /* not _WIN32 */ =20 --=20 2.38.1 From nobody Sat Jun 15 03:18:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686656410; cv=none; d=zohomail.com; s=zohoarc; b=GLgqsbmSPcb4CQ2lvEPDXHYbTMmJHfQ5PGgEZzmmTEla7fwu4brQKbGB6nUlxB7xL8RimCIwC9VXfLpXaEY3RzY5TeW4zyXbOuc0VgRe9uAe3juRIKGuqOD1dX5Z0sRA4Ol0hmVkS0zJwDiYuZlkFGOv96+TKgAnT/rpHzepYFc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686656410; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8Fjis3842wl6k6Jb8zbXdSMkjzpqKuYtbmTIrMzfnM0=; b=MVSy7nSPbKBl0K5TolP3DnxUoonQhW9OHpiCHPJ0EZbJxELDnFsLHgeMLq+Zyfuk0jg69k+xtZy8reeZ9UNVOPbdtvUOLaNdvC2ziUZjZB8BfqC/IeWgUe+DsFksZfHhs+JviALAS2aTmajENLEXduKGKJXVVIWnQDWpz5BLgAM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686656410959153.3618442963981; Tue, 13 Jun 2023 04:40:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q90VI-0005lh-0L; Tue, 13 Jun 2023 05:39:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q90VB-0005l0-AE for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:39:50 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q90V2-0005h5-JX for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:39:49 -0400 Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-51492ae66a4so7516164a12.1 for ; Tue, 13 Jun 2023 02:39:40 -0700 (PDT) Received: from localhost.localdomain ([185.140.244.249]) by smtp.gmail.com with ESMTPSA id o7-20020a056402038700b00514a6d05de9sm6169282edv.88.2023.06.13.02.39.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Jun 2023 02:39:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686649177; x=1689241177; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8Fjis3842wl6k6Jb8zbXdSMkjzpqKuYtbmTIrMzfnM0=; b=OUkVQgen/DpXQjJCyv+7Wc21rqOVVrYEtLKIei3XPNpqNBDPdYo5WgOqt0X6qZxuFe uiTWNJE6azCgrmwocOiwQai8TCt32TlQcWldN40ZOsyWLybmV1b3OSqcZbHK66RvSu+e XFl8OzphodCT/t3t7ELWzdyXqsfnZeZY8NvTOzRk7yZCJE3N9cGvb2vjkIthOMvWn9vZ HO+ccKtETR+nRbndECWZUbsgcNQGxZqLk05lmO4s/ULitYbsp3BhtpbLmiq8mwzcPmCN EHP9wF9UEE2KtTy1VFOyEUXsi9c2wIY/AnWfplFp4jVwwIcbv6wHsRfrf9d8B8KPvfbw yHqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686649177; x=1689241177; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8Fjis3842wl6k6Jb8zbXdSMkjzpqKuYtbmTIrMzfnM0=; b=fItBDqDTr+FBIH0d+vES/9BWB32NAMyJXFU9k+N8cTpX7g9akRW9r3H8ntHT8YMeft VDeY+CI86mi+UHZdF2sKQOAwpg2UDENosVwrywmhlQp9bxHDxyV2kUwD4ek2ZKqEpLXI 0ulddSSsSbCHBwEAh9LBc2+vncHYFjJv1ylEcXVR7ZBiGh/QDRZe6z0puj8XwUiu4VKm MIaBqFD4UvltK36SbZIg4ZPMf2WbCsTOC1BBhdHxAQwkfneSI0vAtd72aAD8OBvaUQVO AnLBD3aO1fAqqzVwWv6M1XnH4Zc/ZXzmv3fB8Ew4MbufoM0iQLS/is0GF4wsbQgMVxyx OQ3A== X-Gm-Message-State: AC+VfDxMIroR5ay96NVP7m/Yxwo6sHZMo78UZYA8LAaYUgX8bKCAJ/m4 mtbXTmF0zs/EoqYzWHR+VPOokZgDvAnnP+taiEYkHQ== X-Google-Smtp-Source: ACHHUZ4fbAKwIzd8b/1+pZq+02UA/c2J2hhhUSl5cZeNUJ5BRhudzWfZ00blMMHT8zKM0AsWogkLAg== X-Received: by 2002:aa7:cfcc:0:b0:514:bc92:8e1d with SMTP id r12-20020aa7cfcc000000b00514bc928e1dmr5755920edy.14.1686649177550; Tue, 13 Jun 2023 02:39:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Joao Martins , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alex Williamson Subject: [PULL 16/17] hw/vfio: Add number of dirty pages to vfio_get_dirty_bitmap tracepoint Date: Tue, 13 Jun 2023 11:38:21 +0200 Message-Id: <20230613093822.63750-17-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230613093822.63750-1-philmd@linaro.org> References: <20230613093822.63750-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=philmd@linaro.org; helo=mail-ed1-x52c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686656411452100001 From: Joao Martins Include the number of dirty pages on the vfio_get_dirty_bitmap tracepoint. These are fetched from the newly added return value in cpu_physical_memory_set_dirty_lebitmap(). Signed-off-by: Joao Martins Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Alex Williamson Message-Id: <20230530180556.24441-3-joao.m.martins@oracle.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/vfio/common.c | 7 ++++--- hw/vfio/trace-events | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 78358ede27..fa8fd949b1 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -1747,6 +1747,7 @@ static int vfio_get_dirty_bitmap(VFIOContainer *conta= iner, uint64_t iova, { bool all_device_dirty_tracking =3D vfio_devices_all_device_dirty_tracking(container); + uint64_t dirty_pages; VFIOBitmap vbmap; int ret; =20 @@ -1772,11 +1773,11 @@ static int vfio_get_dirty_bitmap(VFIOContainer *con= tainer, uint64_t iova, goto out; } =20 - cpu_physical_memory_set_dirty_lebitmap(vbmap.bitmap, ram_addr, - vbmap.pages); + dirty_pages =3D cpu_physical_memory_set_dirty_lebitmap(vbmap.bitmap, r= am_addr, + vbmap.pages); =20 trace_vfio_get_dirty_bitmap(container->fd, iova, size, vbmap.size, - ram_addr); + ram_addr, dirty_pages); out: g_free(vbmap.bitmap); =20 diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events index 646e42fd27..cfb60c354d 100644 --- a/hw/vfio/trace-events +++ b/hw/vfio/trace-events @@ -120,7 +120,7 @@ vfio_region_sparse_mmap_header(const char *name, int in= dex, int nr_areas) "Devic vfio_region_sparse_mmap_entry(int i, unsigned long start, unsigned long en= d) "sparse entry %d [0x%lx - 0x%lx]" vfio_get_dev_region(const char *name, int index, uint32_t type, uint32_t s= ubtype) "%s index %d, %08x/%08x" vfio_dma_unmap_overflow_workaround(void) "" -vfio_get_dirty_bitmap(int fd, uint64_t iova, uint64_t size, uint64_t bitma= p_size, uint64_t start) "container fd=3D%d, iova=3D0x%"PRIx64" size=3D 0x%"= PRIx64" bitmap_size=3D0x%"PRIx64" start=3D0x%"PRIx64 +vfio_get_dirty_bitmap(int fd, uint64_t iova, uint64_t size, uint64_t bitma= p_size, uint64_t start, uint64_t dirty_pages) "container fd=3D%d, iova=3D0x= %"PRIx64" size=3D 0x%"PRIx64" bitmap_size=3D0x%"PRIx64" start=3D0x%"PRIx64"= dirty_pages=3D%"PRIu64 vfio_iommu_map_dirty_notify(uint64_t iova_start, uint64_t iova_end) "iommu= dirty @ 0x%"PRIx64" - 0x%"PRIx64 =20 # platform.c --=20 2.38.1 From nobody Sat Jun 15 03:18:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686655786; cv=none; d=zohomail.com; s=zohoarc; b=KiAd0p3HYrAd1NqcE+Zb1MgzrKlu6N4tOY984mjJxdPaYj8CVHH3G4YiXl08FgVXwW3P962tlVWLk09aZ2eZ0hAYeS+uornWq9bVK5ZaTgLJo3B3TgS9oev1yf4bcFuO5mwsI1QqUa09y6/XTvmMc/MrT/TBPqgmJI7mpdHNKCs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686655786; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tn6UViqugu1iPM5CBgyVG1U7YWBaY3WOqVleP4qvVWg=; b=aF3YNuG7WyM/RTkoTBKS+PY2yfu5EO3ZIXtkEF08SR0AXGz6aej1EKk1/CXwYw/eNNb/afW/w4n5IVednCMmAhjiZrUUzIvOyzJwM31Al6HrMEejzShF3ljSb3W7oQAkKhLCmOtKG354quaTBTtRmDhBmEYeNuiXl+oimKrGUZw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686655786072873.6306141592738; Tue, 13 Jun 2023 04:29:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q90VO-0005oB-9V; Tue, 13 Jun 2023 05:40:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q90VF-0005lY-Ah for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:39:55 -0400 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q90V6-0005hT-7w for qemu-devel@nongnu.org; Tue, 13 Jun 2023 05:39:53 -0400 Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-5183101690cso5400457a12.0 for ; Tue, 13 Jun 2023 02:39:43 -0700 (PDT) Received: from localhost.localdomain ([185.140.244.249]) by smtp.gmail.com with ESMTPSA id ks9-20020a170906f84900b009786c83d5d6sm6384144ejb.25.2023.06.13.02.39.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Jun 2023 02:39:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686649182; x=1689241182; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tn6UViqugu1iPM5CBgyVG1U7YWBaY3WOqVleP4qvVWg=; b=R0zb4M9RAEzXPO7CQcnjo+h9pA3mCXQsgY4HVYTWp9uenStcAbDsJL0rhChV09HK6c mSe9xV5k6iQ3ldd/Ra103M5Gloi4fMWnW8TWEa0I2n81LJINDg8EdIpxK46bEY1EJikK BbYw848lKam6Sbw9Byw9JRmlfcpR6Da2rnLAiZpbq8ndAxKpL/nxBjrVHeGzlJcI/ai8 TqfL8YQhoBDCNGeteVj8asmCATFxJW1ERdRbCgv+IB1YNRO5A4XOJjPvfiLZtu0Afx2I AM13GAhWf1SfRQdc5PRSHwRaY/3uw52EXBzKMwEOVchBQTzGkgJGQ3jLayOfHJPFdiba jCcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686649182; x=1689241182; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tn6UViqugu1iPM5CBgyVG1U7YWBaY3WOqVleP4qvVWg=; b=bfdCkoiL+CL5kVEmvVUTDZwYoI101W3qsJidSYZwlcyn9YBji7e1cGqkomAWG2DiRT 17OUUuFm9aPWrq/GJy82sNdtXh0HJOjPRqbKq4Soa8KVV+YSM42o9beiU+/1FzIIkymW LT4Rdm8qtNP+S19QOrRjix+/0xIzHUjBP74RIqzyFDOpf2BZhgonbrn5lVzTA0LcHA9f 754JeciSvpu6oCfD2GYH6iRWglKaaHdhDivRyV6U5gTVHXOCMkvPseqLkd6OddSJeqly b3rkYZ70AEGeTn3FLPdd+fSESgVlY4KA2xxd+zzeLucIiVsaU6EI4IWDECTQGysdeTIL wkMA== X-Gm-Message-State: AC+VfDz2Fd7AdIra3+cKXVMnscs9RpPaxIAktBfUmYp2izAkzRr0AqDN wKqkqfPvyCMuf2LzTR1Pnx1dyJghJau4h9vJIYmunQ== X-Google-Smtp-Source: ACHHUZ4TG8QU+j+COk/iolc88umgIiPyq+mfJvhX7537QkTcAXY0VbnJgyJwnWPs/lhftLFIjqK53w== X-Received: by 2002:a17:906:5d09:b0:978:af9d:c004 with SMTP id g9-20020a1709065d0900b00978af9dc004mr10809240ejt.4.1686649182368; Tue, 13 Jun 2023 02:39:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Steve Sistare , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 17/17] exec/memory: Introduce RAM_NAMED_FILE flag Date: Tue, 13 Jun 2023 11:38:22 +0200 Message-Id: <20230613093822.63750-18-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230613093822.63750-1-philmd@linaro.org> References: <20230613093822.63750-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52b; envelope-from=philmd@linaro.org; helo=mail-ed1-x52b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686655787364100002 From: Steve Sistare migrate_ignore_shared() is an optimization that avoids copying memory that is visible and can be mapped on the target. However, a memory-backend-ram or a memory-backend-memfd block with the RAM_SHARED flag set is not migrated when migrate_ignore_shared() is true. This is wrong, because the block has no named backing store, and its contents will be lost. To fix, ignore shared memory iff it is a named file. Define a new flag RAM_NAMED_FILE to distinguish this case. Signed-off-by: Steve Sistare Reviewed-by: Peter Xu Message-Id: <1686151116-253260-1-git-send-email-steven.sistare@oracle.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- qapi/migration.json | 4 ++-- include/exec/cpu-common.h | 1 + include/exec/memory.h | 3 +++ backends/hostmem-file.c | 1 + migration/ram.c | 3 ++- softmmu/physmem.c | 7 ++++++- 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/qapi/migration.json b/qapi/migration.json index 179af0c4d8..5bb5ab82a0 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -465,8 +465,8 @@ # block devices (and thus take locks) immediately at the end of # migration. (since 3.0) # -# @x-ignore-shared: If enabled, QEMU will not migrate shared memory -# (since 4.0) +# @x-ignore-shared: If enabled, QEMU will not migrate shared memory that is +# accessible on the destination machine. (since 4.0) # # @validate-uuid: Send the UUID of the source to allow the destination # to ensure it is the same. (since 4.2) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index e5a55ede5f..87dc9a752c 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -93,6 +93,7 @@ void qemu_ram_set_uf_zeroable(RAMBlock *rb); bool qemu_ram_is_migratable(RAMBlock *rb); void qemu_ram_set_migratable(RAMBlock *rb); void qemu_ram_unset_migratable(RAMBlock *rb); +bool qemu_ram_is_named_file(RAMBlock *rb); int qemu_ram_get_fd(RAMBlock *rb); =20 size_t qemu_ram_pagesize(RAMBlock *block); diff --git a/include/exec/memory.h b/include/exec/memory.h index c3661b2276..47c2e0221c 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -232,6 +232,9 @@ typedef struct IOMMUTLBEvent { /* RAM that isn't accessible through normal means. */ #define RAM_PROTECTED (1 << 8) =20 +/* RAM is an mmap-ed named file */ +#define RAM_NAMED_FILE (1 << 9) + static inline void iommu_notifier_init(IOMMUNotifier *n, IOMMUNotify fn, IOMMUNotifierFlag flags, hwaddr start, hwaddr end, diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c index 38ea65bec5..b4335a80e6 100644 --- a/backends/hostmem-file.c +++ b/backends/hostmem-file.c @@ -57,6 +57,7 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Err= or **errp) ram_flags =3D backend->share ? RAM_SHARED : 0; ram_flags |=3D backend->reserve ? 0 : RAM_NORESERVE; ram_flags |=3D fb->is_pmem ? RAM_PMEM : 0; + ram_flags |=3D RAM_NAMED_FILE; memory_region_init_ram_from_file(&backend->mr, OBJECT(backend), name, backend->size, fb->align, ram_flags, fb->mem_path, fb->offset, fb->readonl= y, diff --git a/migration/ram.c b/migration/ram.c index 88a6c82e63..5283a75f02 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -197,7 +197,8 @@ static bool postcopy_preempt_active(void) bool ramblock_is_ignored(RAMBlock *block) { return !qemu_ram_is_migratable(block) || - (migrate_ignore_shared() && qemu_ram_is_shared(block)); + (migrate_ignore_shared() && qemu_ram_is_shared(block) + && qemu_ram_is_named_file(block)); } =20 #undef RAMBLOCK_FOREACH diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 588d0d166b..6bdd944fe8 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -1570,6 +1570,11 @@ void qemu_ram_unset_migratable(RAMBlock *rb) rb->flags &=3D ~RAM_MIGRATABLE; } =20 +bool qemu_ram_is_named_file(RAMBlock *rb) +{ + return rb->flags & RAM_NAMED_FILE; +} + int qemu_ram_get_fd(RAMBlock *rb) { return rb->fd; @@ -1880,7 +1885,7 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, Mem= oryRegion *mr, =20 /* Just support these ram flags by now. */ assert((ram_flags & ~(RAM_SHARED | RAM_PMEM | RAM_NORESERVE | - RAM_PROTECTED)) =3D=3D 0); + RAM_PROTECTED | RAM_NAMED_FILE)) =3D=3D 0); =20 if (xen_enabled()) { error_setg(errp, "-mem-path not supported with Xen"); --=20 2.38.1