From nobody Sun Sep 28 16:32:32 2025 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=1756818707; cv=none; d=zohomail.com; s=zohoarc; b=a9tQAoAG8mrXxREIcp8/58pKlDu0FMDQ+99iLK4XNS9gNYFX8z4fdnx8eisMLtixr5rjq4YgPz9NioNXGrkXqekZg42cfEyehYhGW0GMzYo66IHkcad9Wkhd4IHOUu7R9891ycXdQ9X2egfmhBjqXX75K/douAYL2HeA7LSRYCk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818707; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=UcjLwpsqf87AISo9maOgTW1/b11sEJi/zY3MvqFe2Zo=; b=NcRoLX5bYZ/IP1ne/cGkNeWgmMPFHqHE7Ye8r6ey+gDaqpPaYzkPdxKJ0RY6wbGUAwaflcOt6/UGted68FgRBxHNCbE07IpOz5Khcy6vSFl1IHAkyJz78TSLmHmoOgeSRPjbOIJcLSmRfS8bGHfuW/l848GFDpYWwV2m1L6/N+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 175681870679347.02419142538815; Tue, 2 Sep 2025 06:11:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQmS-0000Gj-Co; Tue, 02 Sep 2025 09:10:36 -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 1utQmQ-0000Fd-6n for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:10:34 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQmL-0004Mu-1g for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:10:33 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-45b8b7ac427so13552685e9.2 for ; Tue, 02 Sep 2025 06:10:26 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3d85f80d8casm6336051f8f.54.2025.09.02.06.10.22 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:10:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818623; x=1757423423; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=UcjLwpsqf87AISo9maOgTW1/b11sEJi/zY3MvqFe2Zo=; b=YYdeJH4+y/K0pLg5rYFaGFyZsG0tzlS3VwTWF5+kHaRlcWho+bRvpsYv4Kdr2zRCYU sVESnquPkVEaCA+C4oI3Rq+KHkNuboRWGNPr9IzWlBlFdOrhCXY90lTyMwoqFznjE+nf OOy6koca7QwuvG3K6r5PPxr+cGM25WFuLaCXvsH8SZnBvV7+Xkb/r3RgG7eaXJPfAZDz o0okj2WtZLqRTALLBjZUfg+8/D9uevV77pFGxc6HmDwwGGSx6Kh3KJ3/PRBnaaPpgY4t 9iwd57t71ya6pXaptSf3Bq/8ke/nyRWOTs7Bdi1+L/wpSeqRtvtd5PqDkpxhtGLwgC4n b7/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818623; x=1757423423; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UcjLwpsqf87AISo9maOgTW1/b11sEJi/zY3MvqFe2Zo=; b=WVsIHCmc87eBALLFsck/xO0D+d9fawLiu+uL+WjMLNw9l8EBnRfE1fGSBBpRDJSd/2 OikD7FRbgblCxi5Oj5PY6yoVDUw+kewidwAM/FI2vYZ/XHZ6CAO4WVMupW9y+unbxKuI hnq5SsW5+uSr5HM4qFE6sbmRJbW/0BlathrDFKGpGjIxwZWCLUmxw2QtjLJntUdPp7J5 Z9WGV4lmVcDDjHUeekKH3LfUIrEvmV1U2RnEH9Qa4L5NY/xNAfq2tUBGaPfqmFYDtnKi jqSWpGbfJH1pK2UIanA+bKGWJTRFXc1B1MTlUh6u2hJc56itgSQWY0WiQrSBZqUA5TG+ jpXA== X-Gm-Message-State: AOJu0YzqnNZhSSd+1siI3W9ObMipgM+NrnRiSKKxVVu+071/Zsc6sL05 tzqdYMU3Es+9cC/CoVM3ii7KNPZz1/h7g238cWkYmqioFDj4KknAkubqqkk8gdqIYeQQwYuARsN /VxSI X-Gm-Gg: ASbGncsrzgws5YDahM+xff2+IYUQ18eodBVIb/OWaseou5gkSwoU0NMo4OQFmOCarNm /PRYicPypR+6yo4ioX9utn+XTS287VQiH7WIDkGPw3ac9QOgYPC+oxMZtq11QP7iELpsBNoSUXR w2qhx+vCmZIwsKwBpMILq4dnYx8dRjooDFnImEowgv81ZxPdjpVYlK9TaK3kaZMOZWm3hsTX+XY iZVuMSYAMeT/VzRXP0utRqOcAwo1G0GZ2Cw7E1BgfHBv9wAx2GuI/RUsk7byC00z0PsNm//IHuU f/rjfFZmYk3teF07lFmLstJ05sEfzn86iHLi2ihjvGoK5YrTWr+4N1Wp1YTmZfy+8zS2UyQUg/v qZ3eIk8uxAC4Sej1Ox9viPndwMkFbT5FrNY9IRiUIbTq3X2XmWZ1KPz1VQg0K6158Lu/dhI+G X-Google-Smtp-Source: AGHT+IEuFY57piJM7GsBhC1Hi9XbBEowvG/cvPF9V4SYNzDdEAJad/ZB2PRFaoVe9nlOp6oLqyhY6g== X-Received: by 2002:a05:600c:1387:b0:45b:615c:cd2 with SMTP id 5b1f17b1804b1-45b85525da3mr105213185e9.8.1756818622777; Tue, 02 Sep 2025 06:10:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 01/39] hw/sd/sdcard: Remove support for spec v1.10 Date: Tue, 2 Sep 2025 15:09:38 +0200 Message-ID: <20250902131016.84968-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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 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: 1756818708484116600 Support for spec v1.10 was deprecated in QEMU v9.1. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-ID: <20240627071040.36190-4-philmd@linaro.org> --- docs/about/deprecated.rst | 6 ------ docs/about/removed-features.rst | 5 +++++ include/hw/sd/sd.h | 1 - hw/sd/sd.c | 12 ++---------- 4 files changed, 7 insertions(+), 17 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 5d1579dcf82..6ae69206817 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -434,12 +434,6 @@ recommending to switch to their stable counterparts: - "Zve64f" should be replaced with "zve64f" - "Zve64d" should be replaced with "zve64d" =20 -``-device sd-card,spec_version=3D1`` (since 9.1) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -SD physical layer specification v2.00 supersedes the v1.10 one. -v2.00 is the default since QEMU 3.0.0. - Block device options '''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index 25a904032c5..332d07e2b18 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -1186,6 +1186,11 @@ by using ``-machine graphics=3Doff``. =20 The 'pvrdma' device and the whole RDMA subsystem have been removed. =20 +``-device sd-card,spec_version=3D1`` (since 10.2) +''''''''''''''''''''''''''''''''''''''''''''''' + +SD physical layer specification v2.00 supersedes the v1.10 one. + Related binaries ---------------- =20 diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h index 55d363f58fb..91b5c40a5f8 100644 --- a/include/hw/sd/sd.h +++ b/include/hw/sd/sd.h @@ -56,7 +56,6 @@ #define AKE_SEQ_ERROR (1 << 3) =20 enum SDPhySpecificationVersion { - SD_PHY_SPECv1_10_VERS =3D 1, SD_PHY_SPECv2_00_VERS =3D 2, SD_PHY_SPECv3_01_VERS =3D 3, }; diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 8c290595f01..8b142e4796f 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -195,7 +195,6 @@ static bool sd_is_emmc(SDState *sd) static const char *sd_version_str(enum SDPhySpecificationVersion version) { static const char *sdphy_version[] =3D { - [SD_PHY_SPECv1_10_VERS] =3D "v1.10", [SD_PHY_SPECv2_00_VERS] =3D "v2.00", [SD_PHY_SPECv3_01_VERS] =3D "v3.01", }; @@ -407,11 +406,7 @@ static void sd_set_ocr(SDState *sd) static void sd_set_scr(SDState *sd) { sd->scr[0] =3D 0 << 4; /* SCR structure version 1.0 */ - if (sd->spec_version =3D=3D SD_PHY_SPECv1_10_VERS) { - sd->scr[0] |=3D 1; /* Spec Version 1.10 */ - } else { - sd->scr[0] |=3D 2; /* Spec Version 2.00 or Version 3.0X */ - } + sd->scr[0] |=3D 2; /* Spec Version 2.00 or Version 3.0X */ sd->scr[1] =3D (2 << 4) /* SDSC Card (Security Version 1.01) */ | 0b0101; /* 1-bit or 4-bit width bus modes */ sd->scr[2] =3D 0x00; /* Extended Security is not supported. */ @@ -1555,9 +1550,6 @@ static sd_rsp_type_t sd_cmd_DE_SELECT_CARD(SDState *s= d, SDRequest req) /* CMD8 */ static sd_rsp_type_t sd_cmd_SEND_IF_COND(SDState *sd, SDRequest req) { - if (sd->spec_version < SD_PHY_SPECv2_00_VERS) { - return sd_cmd_illegal(sd, req); - } if (sd->state !=3D sd_idle_state) { return sd_invalid_state_for_cmd(sd, req); } @@ -2773,7 +2765,7 @@ static void sd_realize(DeviceState *dev, Error **errp) int ret; =20 switch (sd->spec_version) { - case SD_PHY_SPECv1_10_VERS + case SD_PHY_SPECv2_00_VERS ... SD_PHY_SPECv3_01_VERS: break; default: --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818732; cv=none; d=zohomail.com; s=zohoarc; b=F/FHpvpw+6a8dizlvDbboOEPRL+phqPTUPze5Li5H3Up6dObv9XfhfEMgMyy0DaZZbdozJmzGhJbFDFNK4AUuPFi6a6Qov1z8s1iYZYH8CHGnOE2mr8f5Ph/zv+BhuoJ8THYoWCSj1sYYjYmizH03F/uZcNV0IW1ga6fjTyLLAg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818732; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=GPee0txgZJCRwPW5GCHfm4cEZQr/K6Xo/55H9PnDEgg=; b=mJLp+DPMkE21ETe61nJP3mn5C0y/gK8x3R1rUySuTnFSutAfMYOammUtGu6AUzLASAB6UHEaxb56HzCAyT6Rb6CDEHGkVMuCfDpE5bZa/+SC6Zz/tf9C8C4/dGWPistnlxKibUDoAoR3RAuB/lVMVi6fYWjTRJfU2TJc6HLOxH8= 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 SMTP id 175681873256752.48375984234451; Tue, 2 Sep 2025 06:12:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQmU-0000Hn-PV; Tue, 02 Sep 2025 09:10:38 -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 1utQmQ-0000Fy-Ng for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:10:34 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQmM-0004OV-19 for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:10:34 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3dad6252eacso264915f8f.1 for ; Tue, 02 Sep 2025 06:10:29 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3cf33fb9db4sm19733791f8f.47.2025.09.02.06.10.26 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:10:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818627; x=1757423427; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=GPee0txgZJCRwPW5GCHfm4cEZQr/K6Xo/55H9PnDEgg=; b=X+MvMEvdTe3FG2ji8xXr17lNfZBPpA/koAPiW2Ir/3iBydw087fnfQRg4iOax44qgR uxMxMKEMzCeMoelx0TbkjJxlMxY17bdhAJnzUYDazgxPkI61g881SPtYSp05omc4+xyb En4JCWHjk03cG7a8efJD/uoPxkwHCSVxyGGbX90T/LJwzc/nRYkiC9TGW4m68KNCkSdG CiSd4XKc4yFICLx0x52Gj5Ya4qa47ENin6h0OiFAOs2TVZdb4oV4kv4NakiuZcJXQ+to P9L6vsf0On/vVxMAcWw2qbMWGd72qY9h45TYKaP8caH3Q5tcpoBjGQNaI855BjoU3N0V VuFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818627; x=1757423427; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GPee0txgZJCRwPW5GCHfm4cEZQr/K6Xo/55H9PnDEgg=; b=MH8iKTBD5zNv5HODAMymo+V2bFgB+wsHnkaiqKv9+fgxtL7Y/4jCVy3VMZ+NZYYMIy j1Yra6vmfIbduzQ4kZhM/V+HShxc5ARWBZIBoEJ0KJbw5k9MJTWogw/XcIkyhOtJedHI eyp8AGnOtnyy7ikJ04raEEqv4UicTYdQZlVjQvL7Uug64Cb2J/ireqXsezNXx72qiWBR BniY2pUgu3GJ7JmBqPobPiiRPkzk7p2pjgM2TziesKIwsuu7qWMzb3laJnZMz0oA7io1 IuRMiEk/C8Q0JYl/3zE1KVNRnVszukjSQUGiMiY8Y6CAFgn78Bpye31IFnRe8UPJqRoX iOUw== X-Gm-Message-State: AOJu0YzDXsxd0RonWmGCVTRqp/Jv7nM77hM4InOjNom6OYHvTIOi7dfN +Vl7ngOp/G0GZjNMrF3YQZ/59aY1oVc5b3FPSCjXDK+cfaMTrhkME0kCqBxxoNhqPq8qmHKyd2R 78qRS X-Gm-Gg: ASbGnctmgkT7aQGJagP04pevpB+crHf5GAIox9rox2rGBfGscxIiObWPLDaEX2RMZo7 O+sIpzsr5BS5BKdfOOkphaIfH8Bf5ilkMxDbl+eD6yhUm7GPKXbct4oKcfdvceTFf10sHUwdhlQ 3YAoBtlyzcrh1K8PGWW8YaYt9sWpyu1c4C/yWK2O3T8cLx/47e4yabVqabLX4vlhDqQ0Al9QXGR 3j86AzLyVf7rGB3kpGD7KtVy8VgsZNw1BmwjFUXi/2o2BW9ZrI4DRzvR5MR06syk+1YwcBpr/Sz YzP4RtMtCrswvw4b2CGdBIy0hfufRA4VBqhI2vZ4wVyInnMw3nhTb67iMTcMFWAYrZr7TKHZzkA ItMnmcJ2UI0PpKf5Oz4HWbnQ2KQzHTBuovgJhBvJxKy1iv3e3I+wyh4uutK0gFaslqEvIhQuW+v W6Emi2R8dPlQ/RzqCNeQ== X-Google-Smtp-Source: AGHT+IEIiVm1e17TkmkfQID/V++xhZwZF5wEPciowS03Y0lEDojUh88IZxrt4P4S50VYwWaMYhE6EA== X-Received: by 2002:a05:6000:1786:b0:3d1:4c3d:1933 with SMTP id ffacd0b85a97d-3d1dea8c5e9mr8976976f8f.43.1756818627324; Tue, 02 Sep 2025 06:10:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 02/39] target/ppc/kvm: Avoid using alloca() Date: Tue, 2 Sep 2025 15:09:39 +0200 Message-ID: <20250902131016.84968-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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 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: 1756818734709116600 kvmppc_load_htab_chunk() is used for migration, thus is not a hot path. Use the heap instead of the stack, removing the alloca() call. Reported-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Reviewed-by: Manos Pitsidianakis Reviewed-by: Harsh Prateek Bora Message-Id: <20250901132626.28639-2-philmd@linaro.org> --- target/ppc/kvm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index d145774b09a..2521ff65c6c 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -2760,11 +2760,11 @@ int kvmppc_save_htab(QEMUFile *f, int fd, size_t bu= fsize, int64_t max_ns) int kvmppc_load_htab_chunk(QEMUFile *f, int fd, uint32_t index, uint16_t n_valid, uint16_t n_invalid, Error **e= rrp) { - struct kvm_get_htab_header *buf; - size_t chunksize =3D sizeof(*buf) + n_valid * HASH_PTE_SIZE_64; + size_t chunksize =3D sizeof(struct kvm_get_htab_header) + + n_valid * HASH_PTE_SIZE_64; + g_autofree struct kvm_get_htab_header *buf =3D g_malloc(chunksize); ssize_t rc; =20 - buf =3D alloca(chunksize); buf->index =3D index; buf->n_valid =3D n_valid; buf->n_invalid =3D n_invalid; --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818707; cv=none; d=zohomail.com; s=zohoarc; b=AyMpt+yc4XjYb787efKlS2Yhm2Uc7CLCHKSqKzVYlmc09B70d7lR4RuObmunvs/C4MI2GKdeYZ9Iz6lgglQlLdRvN9IbQxXOkkdiw7iVytke70PkYX7fP50Te9lce8r8aceN4ZMK8tRCJymlt5CMApO7nJq24rJbQ0UUBzwoGRg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818707; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=Tb2/5+LCxvBqSP63ES6u+Ggj4lN9YY4GICOEbEI+b+k=; b=ndDNhr19X8ESfX5R/SyfBeHTr6vjBQThzOlOCHA1m+CAnU1hYGf5O6wPxIU9++7eg6mafjVOu6H07rjCVgZuvXjlDaMRTzqB34O/EzCBc/bai/FXNO4RvpXhZGCYPKtwrtay+lQljdcg3+1i5QIjnGMxKbMd8TQzGsOfMsSnBD4= 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 17568187074871006.4325602643783; Tue, 2 Sep 2025 06:11:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQmj-0000LU-Fb; Tue, 02 Sep 2025 09:10:59 -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 1utQmY-0000JQ-U4 for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:10:43 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQmS-0004Pt-IF for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:10:42 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3cf991e8bb8so2506292f8f.2 for ; Tue, 02 Sep 2025 06:10:33 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3cf33fba9fbsm19714372f8f.50.2025.09.02.06.10.31 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:10:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818632; x=1757423432; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Tb2/5+LCxvBqSP63ES6u+Ggj4lN9YY4GICOEbEI+b+k=; b=lTz1E7G0dBCapB3GqCwdL2PoKlAYbrOIAYw21mhINVwQIyPgVp4PTEAlk7UPWyTCgA 1K13elI4QwoSKD3ESUWIaE0k91hV3UalMdFxGwAYJxYyWgb0Eke9/aEATw8RBVd3fSxf PHARqxo2HIbz9m59F3C5YNxbrB3GJHQeYsxS5xe0b7S8rS2J71gZPDqO4oKaG+x5sd2f bPVDt5UbsjLstNbj9QgXb0YOtdvYypzILGBUwI4VqWFCQpWldrzGCE2ltTUimmfHNsVS c5We8KCar4PSrde7JpoXL3SkHTG/SgXyShFeq35Ds4aAQaVs70mRVZsOKiMfTz1Wxf1Y STRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818632; x=1757423432; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Tb2/5+LCxvBqSP63ES6u+Ggj4lN9YY4GICOEbEI+b+k=; b=s53Hk7YG3UBqGAZnsyWzBPa0pqZ4r13OExuayQ5pzPpGQNDsT+XJwjIuK4TO8gDF66 E0OvWG7D8DIPzaLGOVvbenaoqRFfmAiXjPLPxZ7vEIhQHkeGWKALAhStGr1s2luaaAaK QdC9cw0hloabnDlIKJI4+wqXez2up2u/MQNmUtNWnCwO9BIlDQTU/2t5rjRisLSssrU3 U6Ued2HJyNsDXxSycRPc6hhFzXb4xKkM4PE4aJWjOTM6+egdKcY2FbHpBmDyY9mmvQ2q 198xSvwwrUSZqBb9iyFSKyHnvup7zD3nhke7wec42fpub+akx3ezYhP4KfW3z2RD2kUo OgSA== X-Gm-Message-State: AOJu0YyfSBZ1tfTeemU29M4w1nx9TbVAmXjSvSAj8yenPg3m8Gp7GuU4 9MN5Pg7CgzKZlmAb89/HQHYepIU20Gsnca0uX93rFXRqU02BQcyrYHxb88iN9YEd3ep20CmP04T hPphW X-Gm-Gg: ASbGncufkcF2k+Vawz2Py4waUqjsAgQGoCIbN4fa37cWlxbY0uENh5pnUVZIS76w46i xLrGIVFVZE3dTmZX/YMI5lbUf5Mr/yl3EW+dfiejmRYkhY7I4fUazRWNEUVDlcg5qFyPkMR5Zas kBsuuNwqu/2mSf9oFKW6bpnZchggL1+rWAsgzsDq0NVVCwnJYk1lE5vTsgSQUE4NP/AaD1FBbWE BFgMJKCNK5UkroTnECiXNNgDfpnFlTcLEavWmqyJy4iOG+v70/31h77EDP3QA0kY/lPdsYJ7Ddn LW3FZM2jwkMbxIcf4aEnmpHR5StMmL0KFhhyP2ju7yTYRU6Yh3WDR4U1VK4tiIRqb4haq+uzM7E riOKP1prcuVuy7DsJSOIbLiBz012uBDMbG21chLjMTNAl6UMUh3FWOiJq8m4qFXgCrMPBVvId95 KxwIdDyjiG3dxslKTInA== X-Google-Smtp-Source: AGHT+IHzmLKJHkB4T6O31BUkE6jfAJJRjC1RwVf7YDW4MHQinrUy4d4icK7S3gTdLbTuSSMjKHQcfQ== X-Received: by 2002:a05:6000:4305:b0:3d8:9bf9:7c0e with SMTP id ffacd0b85a97d-3d89bf9819fmr3243358f8f.37.1756818631889; Tue, 02 Sep 2025 06:10:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 03/39] docs/devel/style: Mention alloca() family API is forbidden Date: Tue, 2 Sep 2025 15:09:40 +0200 Message-ID: <20250902131016.84968-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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 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: 1756818708410116601 Suggested-by: Alex Benn=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis Message-Id: <20250901132626.28639-4-philmd@linaro.org> --- docs/devel/style.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/devel/style.rst b/docs/devel/style.rst index d025933808e..941fe14bfd4 100644 --- a/docs/devel/style.rst +++ b/docs/devel/style.rst @@ -446,8 +446,8 @@ Low level memory management =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D =20 Use of the ``malloc/free/realloc/calloc/valloc/memalign/posix_memalign`` -APIs is not allowed in the QEMU codebase. Instead of these routines, -use the GLib memory allocation routines +or ``alloca/g_alloca/g_newa/g_newa0`` APIs is not allowed in the QEMU code= base. +Instead of these routines, use the GLib memory allocation routines ``g_malloc/g_malloc0/g_new/g_new0/g_realloc/g_free`` or QEMU's ``qemu_memalign/qemu_blockalign/qemu_vfree`` APIs. =20 --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818771; cv=none; d=zohomail.com; s=zohoarc; b=nhL9F6jfSVu0opac0nuqyDJEqqGy6y4gwY1/XiO6Z2m706pGSalYT1lU59VDRJpgsyuOFtJyfOn1FBEuh2O85FPUkKft5o1taMvAl38SJpb38huM/lnk9wsnphOsVTFWDISIEvsKrACqvcY1fzxebPBKLE5PXsE2nwEGEjxqjOw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818771; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=4QpZjSL6WPJcyAyM7tOCiJYUHX0dh90dWBkQ9yGcfOc=; b=SxcvFFNSZRs05fapkTAFOSU6bNqJZJiXU2ludwthI2RXfI/M9AT9r80yPLPgUVrKJMKJXuxmdnM6BfbREdG4AEbAkoLrY2iWa6iZbzphCA2BpMFSqmXFxAsM0kKm9EdYB1Tsvq7nRNWDZefTrvtA+yqdCIzCQazHqnipf1pSTSQ= 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 1756818771788714.5161768569404; Tue, 2 Sep 2025 06:12:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQmq-0000Ry-Ij; Tue, 02 Sep 2025 09:11:00 -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 1utQmc-0000Kb-4A for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:10:47 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQmW-0004QY-8i for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:10:45 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3c46686d1e6so3667653f8f.3 for ; Tue, 02 Sep 2025 06:10:38 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3d0a7691340sm18704464f8f.39.2025.09.02.06.10.35 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:10:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818636; x=1757423436; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=4QpZjSL6WPJcyAyM7tOCiJYUHX0dh90dWBkQ9yGcfOc=; b=zuZgKjrgQcKGSyJNiL+q65ZjZXJx8gMsHrIDQQAltkXN2/zMyzDVPOLfBwKTIzNSb4 U/YnSIozQUWRr3cN0M4dboN+gphFM/oETydO+OofYUjR8Ukse3LrH9RALPW/nblINRPc 3dxpqkcU/XwsJJzvwpfPqm+sDer6zYbvhYJPLMSfimtPl0XsVBprCsxSkH6tZPCn52AP Rf0TrTWvSrX0wiBm18g/VlpSntM8e2LJiBIJKfW4A2BUfnJsZo0RFeHvBfxs2DtMCrrb 3ejBhAgbABsmNq0xNSRyr3Aep+073XgpF0z7dyxu/rFPcQuj2nqHfLVYNmJ4DP0Mr5Tb Dqhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818636; x=1757423436; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4QpZjSL6WPJcyAyM7tOCiJYUHX0dh90dWBkQ9yGcfOc=; b=gIFDqwW0vC80yrjR48+zYAwbwnszax0RR80jkBucnOZ71saEcXt2JAZXotXQ/9+ALB NE6bAHU21XEui7N7YYMjcpXlanFWKXr48VhRPV9tvkehkBOXZPcBA8WKFz1O+32kzy+L Ze8/gYjKpc8DDsdyLit0l5P8M+KTAcXR1hgUiTqvjWCPCHEsYVMikImKliasM9Nvv6pq 7Krb73gcflbczT+CC6hmRMcM9uBP9B2iqXy8w27/eKH2e9XxJ7RkQ9erhPAEWdvLbNBb YBiE1mTrNSrVsWA8iqGHjm4mUVXmE41Sybpzk/btuyYITaCriYC0zqiHyGz2zX5bsiwC 9MGw== X-Gm-Message-State: AOJu0YwiIACW+vy37rM+HCbpojdupsGvQBZAxFimdu1XH5bT7dwPJDtJ xKsZS5fQ2h42xPiRj8Fg80RDMf95oHqKeQZdlMneF5CKkAq+ukYv4o76u5if0sGZtXgZjbvcz3n QTqdx X-Gm-Gg: ASbGnctM0ka71Pe9ShP+Hq/cYAWJFKeur+vRZBsZSsnyHMQVS4Joxr5DjKk/IRh+qet UzmrQcX4PfXAtdNSFC9P77gOQJoOUzUZv3ob28yHs6wrx3MqHn359M2H0Tw780fWHd0ay5ueWnl WmBB8PJA2MqvYDPN8BjKvXFuzN03aRu88GMPnJOQ32xrsAX1wFuXslqcPKM+CY2rZ+Dsnk+hk0L tpJQit9Rwe4mceBx0GQqVASZo1EnRC5z1v5PN6zfRwReDSS5yMfVcnJfql3QhdnapX6vWqe8a6R S6AYIm31IQVRfuCc2LM49Q/u78cRzdoWLbnxn+hr87E8Th7gyxuFFQY5QRdCCLdH5eS/R/iSsYj R/VtToJCHVqp1nN4vR9ALpeqhB7e//gQuZUwBTd7CEx1OQN+YwZkV5x69/QML0C84bfTPXtNa X-Google-Smtp-Source: AGHT+IEyEaV18L3elJpcwMMrHyxVDhHkAYqPgg3M31y/CLqCdO6J18EiF0YzTYYua+RlVlcHIHqdmQ== X-Received: by 2002:a05:6000:2102:b0:3d3:8711:d934 with SMTP id ffacd0b85a97d-3d38711dcc7mr5124643f8f.14.1756818636432; Tue, 02 Sep 2025 06:10:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 04/39] hw/pci: Allow explicit function numbers in pci Date: Tue, 2 Sep 2025 15:09:41 +0200 Message-ID: <20250902131016.84968-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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 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: 1756818773048116600 From: Djordje Todorovic Since there is no pch_gbe emulation, we could be using func other than 0 when adding new devices to specific boards. Signed-off-by: Chao-ying Fu Signed-off-by: Djordje Todorovic Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250901102850.1172983-13-djordje.todorovic@htecgroup.com> [PMD: Compare with null character ('\0'), not '0'] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci/pci.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index c70b5ceebaf..297196b2421 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -984,14 +984,15 @@ static int pci_parse_devaddr(const char *addr, int *d= omp, int *busp, =20 slot =3D val; =20 - if (funcp !=3D NULL) { - if (*e !=3D '.') + if (funcp !=3D NULL && *e !=3D '\0') { + if (*e !=3D '.') { return -1; - + } p =3D e + 1; val =3D strtoul(p, &e, 16); - if (e =3D=3D p) + if (e =3D=3D p) { return -1; + } =20 func =3D val; } @@ -2054,13 +2055,15 @@ bool pci_init_nic_in_slot(PCIBus *rootbus, const ch= ar *model, int dom, busnr, devfn; PCIDevice *pci_dev; unsigned slot; + unsigned func; + PCIBus *bus; =20 if (!nd) { return false; } =20 - if (!devaddr || pci_parse_devaddr(devaddr, &dom, &busnr, &slot, NULL) = < 0) { + if (!devaddr || pci_parse_devaddr(devaddr, &dom, &busnr, &slot, &func)= < 0) { error_report("Invalid PCI device address %s for device %s", devaddr, model); exit(1); @@ -2071,7 +2074,7 @@ bool pci_init_nic_in_slot(PCIBus *rootbus, const char= *model, exit(1); } =20 - devfn =3D PCI_DEVFN(slot, 0); + devfn =3D PCI_DEVFN(slot, func); =20 bus =3D pci_find_bus_nr(rootbus, busnr); if (!bus) { --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818717; cv=none; d=zohomail.com; s=zohoarc; b=GhdnEU7BfrflXw3itoA91N8PHsjuo+kV63IfWYWJaRLE91fLSKsjplJ6T7SfyC6ZQYvsW9xV0UzS73xnk5/Iub88nSRhKiE0tp0capmvWnzEaFbkeyuGv8llPaXv8V+OyGqfU48uS6sRhh+DtFSV9LZY0/KBgNVbbOBZ3UO3ghE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818717; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=IlCl1/WInAIaChnH1MrrsVEavnomBomGF3IqQHxPkXY=; b=ak10znmqDsRLuWXspQGXynWsWNm2/0xePDcX0ugLH/QXr5BxOQZ3KlNM+aAPRmrJvF0/+6Y064EomluRBw9JGe3hSWrXZQ1OZKmgYHA2wT9YYYY7sEIweaGjixdGagiqbjJNNsAXQ/7LbQLyqxzJg645Aw67n/+ULl1g5RC6bhc= 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 175681871704573.17798484630214; Tue, 2 Sep 2025 06:11:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQmw-0000U1-I2; Tue, 02 Sep 2025 09:11: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 1utQmg-0000NN-Np for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:10:53 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQmZ-0004R1-Ld for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:10:50 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-45b8b1a104cso21156105e9.2 for ; Tue, 02 Sep 2025 06:10:43 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b7e50e30asm198479935e9.24.2025.09.02.06.10.40 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:10:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818641; x=1757423441; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=IlCl1/WInAIaChnH1MrrsVEavnomBomGF3IqQHxPkXY=; b=UxvG76hEOedzc6/vYxvNk2h8U1EQ3a7niYZs+d67N+yVn0JHTjQaLuWmLdnUtI9SUN e6mtlRLkTzteW85pKrcLxkaD0QPDdax7X4NlvtOvmG5ESiVFxwqk4tTYSKMUAzwmg6pz z2GZjSHg3S+1Qogv3xsuPLCWQ1sQTlkOAWmSpuvzjcgGZ7WVNlHWcwuWlRl9ZxAHw09T kjUnf3MyEnAcUWh7ZnyrqXRKgGrm90HFHFIe+bHf3SRTE3zqAkxOxjtBCZdue4tDeHaW GCRhH403mq+RZ9NnpA0HwdObZ8ewahhJ+kIAqnJqIzM/c5lzm1MmDjrTIKZrrC2fvloo Pn9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818641; x=1757423441; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IlCl1/WInAIaChnH1MrrsVEavnomBomGF3IqQHxPkXY=; b=Fld9/LjiyPCUx6ADbqzF0emfQdF7g4m4Dg7nsbB2wrXpffnUEFXyUaeq3v6y3ZwjXC VGlmnbFCWlJsFpBDlRrBzjYnSm9dLeyo9OoZZNC8XOHGPLCv6LMAU2oiIMs4LLiX1U8f utmvGx+lz3L8qgDiiYpmZz2oEE68hGo4NlYspfUvTsovGjRB/RXJY+sUfPEznJjtL8JJ wLXFem+Z8jsLMDumtbUMq1FjG+NvoJmNlYcirQdyAy8NAXint1mJ1prG3qHagFTgFpxV JWnttPfoThSGt8WFmvJHA6h6cTdooR9og8pEWlFw1e2GGHCD0pJ+tm+2M/ps+6U7BRSN DSyw== X-Gm-Message-State: AOJu0YwgZyyK9K/lD3rPjHQMKn8TRpZ368rZFOo5hFKYNio8Z/2Nchqm A9e2u4tkjfOm0xDfSxTUfREIo1GQ6FTxZjiIrHJzmmvGBZg4lROB8kIS+GY/l5m877CjCvh+x+1 Ur3qV X-Gm-Gg: ASbGncuCZ5PXePg/IinlMzrX4UeHLRSQXRcBcGvC0Fs1c05cQASpYwV2N3rKcxqm8+9 IXIIiQBnK5KWoEy1UP5qYVkpBD1ol5xoCch2CPZOLowpqdtPzNXrvudEC+TPFSogH4iJPP0MA+d swkMOxhS6jvqBBbak0/hh49IMbj9rRhkY9z85btEK1tWaECznn60bxoymLAiUWLYxX1iOq3ITlp Ruo5LWrW//z8/Rrny3/fWk31BBw3vE5dhVMuD6xs4RLV6nT+B9VEyzz9LxGtm+mte0FqDxdlova ntK58BKPjkdw0GUHW+3Cu4Lm0OdDMYxxu2ORxLLJ0s3jgVlnkvrkzvX4kG6XXFLIY5LyzOC4b2I gCbpHOjTgrPIjF6YBs6af2IpHYHrssaC/zN5bzjtivgktEtqAKxt19F3eSM3KlHZsz3iVl48j5T yJ+UAH9R0= X-Google-Smtp-Source: AGHT+IHKmYytacJpgYckzyJGgV5T29HadHdvpBRz3DtGPjA23ez7MN9ABHicBTvxjwQvZUnfo4SThA== X-Received: by 2002:a05:600c:1c0d:b0:45b:9a76:ebea with SMTP id 5b1f17b1804b1-45b9a76ed12mr13421205e9.20.1756818641017; Tue, 02 Sep 2025 06:10:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 05/39] migration: compile migration/ram.c once Date: Tue, 2 Sep 2025 15:09:42 +0200 Message-ID: <20250902131016.84968-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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, T_SPF_TEMPERROR=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: 1756818717870124100 From: Pierrick Bouvier Acked-by: Fabiano Rosas Reviewed-by: Peter Xu Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson Message-ID: <20250730220435.1139101-2-pierrick.bouvier@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- migration/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migration/meson.build b/migration/meson.build index 276da3be5a3..45e9445f97d 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -31,6 +31,7 @@ system_ss.add(files( 'multifd-zero-page.c', 'options.c', 'postcopy-ram.c', + 'ram.c', 'savevm.c', 'socket.c', 'tls.c', @@ -50,5 +51,4 @@ system_ss.add(when: uadk, if_true: files('multifd-uadk.c'= )) system_ss.add(when: qatzip, if_true: files('multifd-qatzip.c')) =20 specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', - if_true: files('ram.c', - 'vfio.c')) + if_true: files('vfio.c')) --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756819211; cv=none; d=zohomail.com; s=zohoarc; b=UupGHZqQLQSsFPEiHt3LRVj5oWHzXssuCvLOoQEdHgkB5YpnTmzK5UoZxQjz4d4kd8vxtfgNi49vsk8LRmfEYWCgUq3lC0a1ZdAB4Q9O9FAbu2+6WI051BD5K0v9TV7k2jAaBYooWINb3iJOuoti3gPe0V1Rp2Z4KBFm0jVMbJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756819211; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=X+SFIFq6U9bHOZ8xKmEzKqugUCiHKif7YLVtYxmKJZo=; b=Cc7/il8rhJGOtJ5JdaFwJ44525uJ+HojhYeCKhfv8c00qTm/z5mGMl45vlCwqiqxd99DKQvjckL1dKTrfjFGbOPO9r91oJaE/fqWwNVx0r7ri5xjxv0GCWWak9XrPXg5RXub6kfTbDMwJqYTJy9p/BS/D/rgjqD2dhKhVQ9/Z3U= 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 1756819211433420.3140492732708; Tue, 2 Sep 2025 06:20:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQn0-0000Vb-5s; Tue, 02 Sep 2025 09:11:10 -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 1utQmp-0000RC-0l for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:10:59 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQmf-0004RN-FX for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:10:57 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-45b82a21eeeso34638285e9.2 for ; Tue, 02 Sep 2025 06:10:48 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b9a6ecfafsm23428815e9.21.2025.09.02.06.10.44 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:10:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818646; x=1757423446; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=X+SFIFq6U9bHOZ8xKmEzKqugUCiHKif7YLVtYxmKJZo=; b=v0s+uuMGzOio/te6N7rgd/O0T8KBhLnKLJu8k7hige/sG6eVrslZd8r/2NWVJ4y8US NSZ8mX7d5C3kFrQ9HBepvGhBOjzLi2/LbL9+4uo451ssEc595MjooCg40xE3Tiyup7cT DFG9INUZx94ouoZswbOlUG8NTP3ltyvQw08E9KDuIAjyB/D0EmE4Sgs2Tccv/qfY5q3Q dif81vF94Bjs9wK724GZwJfUkjWXvUV4S5P1bxFlp4AwQXFw+EutX/pGxdKNBI6iPRaM 17evC9RNdANqhlOoUW4CvlZH2AJtZNXYqVYpflv/N30xAiE6SpT+suplvqhK910s7/jA RL5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818646; x=1757423446; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X+SFIFq6U9bHOZ8xKmEzKqugUCiHKif7YLVtYxmKJZo=; b=rlxrXE8F3uhEm7EAkjoLR/i8vPrwfCHKuxu8Cf4QRAiqU70VaE5t2dtZc4Vbjx1/cD RljKvXJLGzB6L+w5e5QqAE+2fPv4WuQnvaXJJL45hG1Mkgoxo88ngmfL5ntmZY/5a2BF CgWrB8i+pGFzH42EJ8cEjTSrQ7j4HMYd0ZWDSqQNY9kKB3pfaUvHRWayDBRPXmM8unGh pWNdZtv0kNJ4sKAsXHV7tEB2qX8I9hegMT4nMCJ8+nARYJHlyIhVGj3R8xdpOJakxq3m M5BoN1zc35QdgJ6p7gK3Tc7/hWFmf9UrWSlkIctg+Ja7Uk7mJeZoSw/4RsE3CQBxku2k kr/w== X-Gm-Message-State: AOJu0Ywqwq9IbNz1PQUgaNvZR0EHR3L7sumfk/5dJtBa8HcE0z5+FPti F7vFjum5ZuPk5se+LX5j+0tMxCj9I5gb0DCaE1ltqOTXSWEWYqaIrrOPrBYXzSoYwo7tgjMGuRt 6bNbI X-Gm-Gg: ASbGncsFF3MOTpcG7SQ3pA8K1R/+bzb6ahoMJHFBpguga5oVS+x38lyQszOs7TEhghN krQ7OShzihyShi9d1MYMoe2S/MB+b3Xh0gW/rVqXMBeopQAskwJexiHcODiFJQpmfpBS7TDhmBO NO5dZQA5ndCm2SImCWwZAJDJ0/ZIAdzkERHQXPdc5LrTh42C9jw08rBPTo2yoylkgjTfuUissCA ZrnNe0MkoY4Ynx5oL+VlGO0lJ7qlhfFfC7FDXFOMphu0tqtd5qOZfi2L4yUpxuI8eiOwhUefnel Y7m/a0WlO66ePhjKyTMYYFWZr0O6eFly8tnxyYqsDWU6kAsnQD/sblHLoggsk1c8gEe639YU65q DHUg8ONO/1R+DgSByfGI6qckispa/vYUs1vqJmDbo3OH6GWekRAVSi2nmTkN51/PXjxNlvBiP1d GyG+Q7arU= X-Google-Smtp-Source: AGHT+IEYKryt2d0nkMVc4u4TFTS3RpP45uhnInPld68u6BuSaXOcmBp6TE302GNYTnlktiYdgePyRg== X-Received: by 2002:a05:600c:524b:b0:459:ddd6:1ca3 with SMTP id 5b1f17b1804b1-45b8549c817mr92937795e9.0.1756818645607; Tue, 02 Sep 2025 06:10:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 06/39] migration/vfio: compile only once Date: Tue, 2 Sep 2025 15:09:43 +0200 Message-ID: <20250902131016.84968-7-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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: 1756819212409116600 From: Pierrick Bouvier Acked-by: Fabiano Rosas Reviewed-by: Peter Xu Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson Message-ID: <20250730220435.1139101-3-pierrick.bouvier@linaro.org> [PMD: Cover vfio-stub.c in MAINTAINERS] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 1 + migration/vfio-stub.c | 16 ++++++++++++++++ migration/vfio.c | 14 -------------- migration/meson.build | 6 +++--- 4 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 migration/vfio-stub.c diff --git a/MAINTAINERS b/MAINTAINERS index 8147fff3523..07c9f929d2b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2268,6 +2268,7 @@ F: util/vfio-helpers.c F: include/hw/vfio/ F: docs/devel/migration/vfio.rst F: qapi/vfio.json +F: migration/vfio-stub.c F: tests/functional/aarch64/test_device_passthrough.py =20 vfio-igd diff --git a/migration/vfio-stub.c b/migration/vfio-stub.c new file mode 100644 index 00000000000..f59ebe075dc --- /dev/null +++ b/migration/vfio-stub.c @@ -0,0 +1,16 @@ +/* + * QEMU live migration - stubs for VFIO + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "migration.h" + +void migration_populate_vfio_info(MigrationInfo *info) +{ +} + +void migration_reset_vfio_bytes_transferred(void) +{ +} diff --git a/migration/vfio.c b/migration/vfio.c index 0b64e49ef06..af6ae2c1e19 100644 --- a/migration/vfio.c +++ b/migration/vfio.c @@ -8,13 +8,8 @@ #include "qemu/osdep.h" #include "qapi/qapi-types-migration.h" #include "migration.h" -#include CONFIG_DEVICES - -#ifdef CONFIG_VFIO #include "hw/vfio/vfio-migration.h" -#endif =20 -#ifdef CONFIG_VFIO void migration_populate_vfio_info(MigrationInfo *info) { if (vfio_migration_active()) { @@ -27,12 +22,3 @@ void migration_reset_vfio_bytes_transferred(void) { vfio_migration_reset_bytes_transferred(); } -#else -void migration_populate_vfio_info(MigrationInfo *info) -{ -} - -void migration_reset_vfio_bytes_transferred(void) -{ -} -#endif diff --git a/migration/meson.build b/migration/meson.build index 45e9445f97d..0f71544a825 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -49,6 +49,6 @@ system_ss.add(when: zstd, if_true: files('multifd-zstd.c'= )) system_ss.add(when: qpl, if_true: files('multifd-qpl.c')) system_ss.add(when: uadk, if_true: files('multifd-uadk.c')) system_ss.add(when: qatzip, if_true: files('multifd-qatzip.c')) - -specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', - if_true: files('vfio.c')) +system_ss.add(when: 'CONFIG_VFIO', + if_true: files('vfio.c'), + if_false: files('vfio-stub.c')) --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818711; cv=none; d=zohomail.com; s=zohoarc; b=C3KhTdZKVPA0XdzKq8S9BXiMum+hOeLq3v6Uk59g35nKyFdgoKD4oO7qLe851JA8NPzlYShL/zZFXjszO/v7NxLZxWILoLg0RFrfIP/2x9KDtZ9FEozLKL1OT0r5tEF7glFnUNqEJikB+kuMdGUN3W1No+93YmHKWRQa/MsuNUQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818711; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=s4e3k0wKe8UGrBw6C9hTIgyim+urVYyDtWjW9sJuOOM=; b=HQGy/cWyKOsAyen9KKtHL5tXFpOqkWB7Ev6MpzwgkQ7Djwn/V+WKN3MyXtP5MUH2hTiouNEg7AGTPwKS4JYUm+2f49j41sATzswhPoR3/WF/xdu7avONWhDcfRQ5fG/9lOXfGUfbowNaNoEwSKtKMQeyDIS4sLTWXlUFMPso7CY= 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 1756818711044327.11853256819757; Tue, 2 Sep 2025 06:11:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQmz-0000V4-HC; Tue, 02 Sep 2025 09:11:09 -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 1utQmq-0000Rw-3J for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:01 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQml-0004Re-R7 for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:10:59 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-45b8b2712d8so24370555e9.3 for ; Tue, 02 Sep 2025 06:10:52 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b7e898b99sm197199575e9.19.2025.09.02.06.10.49 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:10:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818650; x=1757423450; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=s4e3k0wKe8UGrBw6C9hTIgyim+urVYyDtWjW9sJuOOM=; b=ImE1ZzK3EPhN0SjsN/KKkknb8GCQ/iUGH1IxQ/CFcWDkpA/V7QHkCwvbtrL7DUSI7H bY+jdT1+dLhgtRt1utwi92KNw6/04lLtsx0Qe1iB/dr94deXdLmCQNRohjEUChfOKb5l 8kwtvGTttYFpvmuqD957OszQfR+RwPz8hruYBeI9z1omBMjcNfD1lEbzpVELhSsSIWo7 1GPHd/VLqdYIiWS5kH3tZZBB8udlVVUHjMIlcWyCEWvPYiqTgrWGH4Y17q/maAVnI+0s /0Gd6tYCujqlaBBI+xk7B7HfpRtvuO7Myus3KZ25K5IrnHma66JKi6Q11elA3BWyVIB7 /cEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818650; x=1757423450; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s4e3k0wKe8UGrBw6C9hTIgyim+urVYyDtWjW9sJuOOM=; b=uDgy3aVplbH5yHqUvMKnOFW9yc29a7Q7GdIQ3Q+K8+NKA816p+Jxo9erGZ7YcmeIdz d9D0UC5gGlQxa/ymmnhemnPxCY1RjMqH/mS1Z4FiLSeve3MLCNSc2C/1zejjssetIlXo J1zybA3mUI8LLOSsFHxLv+Jja6FTPT0niIzSAJRz8BYz/0YeaM0yCvnxOvvzSoiM8mk8 hmVCbcpUyB9H+RoxuzJYmEv7Ko0wGqIZMmFaQVm+tkH5qjBHfyvC//95o1KX7978Ve3a 4pfpMy1pFfz8pcxl3ssVq3cqMKYf+wn1Rw2A3/xfeDP0qcJebrk/4BBDhGBq61pV66DK oGTQ== X-Gm-Message-State: AOJu0Yy4EWP16uYbHC33uNa3F49RkJsJZdwHtojtMyduPx/9x3jjDEfP L1Kul7JQyfQxrisDLeqdMU+tZ6/88pg/TKSi0UW7YiJssuoGNlhskIBFnJSH6gxHsgXoUAoLThG ibJoc X-Gm-Gg: ASbGncs1KvwN/p/V2BfA++BSH4ReI7lCC+aN2zRSrtZtCtTp/yAFOnWMiX4gUmI9E2n sjLXdfGvwbqhvpjwfafAHoONkA0q+Cp2ZiX6GBImTVeHZZS13L4fZQEOewsmaQpsg2acuuduK9v KKBMgjeJOB2dPPdrLdGMY3+GwcDgWEQpcKBwPERygjBrBSPERgtofJfWIovFYnkvqbN/AkqXCac Yf17m8Dls6fPqQgSE2mIP3MZ6qOY3c+se88tqFHhefOMZbYepm6gjD5Azq5ryv9N+VGqQyt+Gma 9+nrS5LfuiOr4OucLe9364v4vS0oBEMpHCUqBahqsAYfiTQ59Lmm7BK2zFtTspIMMPq19JeB5+2 PyQr24D3YLwjdvndF/ycOQBgzzFO1TgdKfoMTxxDiTte4NLMZUzhSFfOCLGYY1OYOc2p1CNjA1f xgfUhiHF2hbHfCH7I6TA== X-Google-Smtp-Source: AGHT+IHZeBlnqkqhZ9Nk0M2gqdnPA2dZDS6kjHgFx1Q+HMQd5baXMf81tcqspQFV4oOmHxjiSUSYXw== X-Received: by 2002:a05:600c:154b:b0:45b:9961:9c0c with SMTP id 5b1f17b1804b1-45b99619d89mr17214445e9.33.1756818650157; Tue, 02 Sep 2025 06:10:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 07/39] cpu-target: build compilation unit once for user/system Date: Tue, 2 Sep 2025 15:09:44 +0200 Message-ID: <20250902131016.84968-8-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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 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: 1756818711787124100 From: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250730220519.1140447-2-pierrick.bouvier@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- meson.build | 3 ++- cpu-target.c | 5 ----- target-info-stub.c | 4 ++++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 0d42de61ae6..7ff84787cf1 100644 --- a/meson.build +++ b/meson.build @@ -3876,7 +3876,8 @@ if have_block endif =20 common_ss.add(files('cpu-common.c')) -specific_ss.add(files('cpu-target.c')) +user_ss.add(files('cpu-target.c')) +system_ss.add(files('cpu-target.c')) =20 subdir('system') =20 diff --git a/cpu-target.c b/cpu-target.c index 772e35495b8..f030e2c642e 100644 --- a/cpu-target.c +++ b/cpu-target.c @@ -18,7 +18,6 @@ */ =20 #include "qemu/osdep.h" -#include "cpu.h" #include "accel/accel-cpu-ops.h" #include "system/cpus.h" #include "exec/cpu-common.h" @@ -27,10 +26,6 @@ #include "hw/core/cpu.h" #include "trace/trace-root.h" =20 -/* Validate correct placement of CPUArchState. */ -QEMU_BUILD_BUG_ON(offsetof(ArchCPU, parent_obj) !=3D 0); -QEMU_BUILD_BUG_ON(offsetof(ArchCPU, env) !=3D sizeof(CPUState)); - /* enable or disable single step mode. EXCP_DEBUG is returned by the CPU loop after each instruction */ void cpu_single_step(CPUState *cpu, int enabled) diff --git a/target-info-stub.c b/target-info-stub.c index ca0caa3686c..d96d8249c1d 100644 --- a/target-info-stub.c +++ b/target-info-stub.c @@ -12,6 +12,10 @@ #include "hw/boards.h" #include "cpu.h" =20 +/* Validate correct placement of CPUArchState. */ +QEMU_BUILD_BUG_ON(offsetof(ArchCPU, parent_obj) !=3D 0); +QEMU_BUILD_BUG_ON(offsetof(ArchCPU, env) !=3D sizeof(CPUState)); + static const TargetInfo target_info_stub =3D { .target_name =3D TARGET_NAME, .target_arch =3D SYS_EMU_TARGET__MAX, --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756819110; cv=none; d=zohomail.com; s=zohoarc; b=lMwoDGELgMRQLHvEfeXnj8yBm2y9tAxnHzIuISqqSSYLUoJYAo7kA2H32Htc9fWbLzGgdXDrNB3oOOOSTR89mOgwYzw9E6ipI+CvBC2p6nGJIt27NdVo7rHjTlNOWKZfcINZKd2pLxjnl0VqitRGHWkM1ts0wLR/LBsp5/fNZLk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756819110; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=bdjUdksMSi5PcEKm6NTkntw2W6DG2YujIlvk6/azIfc=; b=h/kwKjhC6gLQxm8ZOY0TsBU2m8s2YwUddYRyzmhsb0Nplg5XLJjITfrtq/2IcxjhCHGIlL/FGOaWfAAsTYkQsQzeQIGjcwwNglcIVgQc+UujT+6NF5yhQO0ufhN3LThO1Oz7d9O3Da6WyGd4K4vXa/FHf7mUHKFI3dVZ23/Offg= 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 1756819110049999.8427083496733; Tue, 2 Sep 2025 06:18:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQn6-0000Ye-UT; Tue, 02 Sep 2025 09:11:17 -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 1utQms-0000Sf-2l for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:03 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQmp-0004Rn-2R for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:01 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3cf48bde952so3723208f8f.0 for ; Tue, 02 Sep 2025 06:10:57 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3cf270fc3fasm19381159f8f.5.2025.09.02.06.10.53 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:10:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818655; x=1757423455; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=bdjUdksMSi5PcEKm6NTkntw2W6DG2YujIlvk6/azIfc=; b=SrsnD9RrawR1dtynLS4siSs87MW6XyVElsaL3ekYgqUsvab38tF6LNEhpeZjrMlTbe OuF/ek1r8T4afXaLFQkBxlI1DS+2fu3YvlxQ8hC1Ajr+jOA6muUV0fLtBxxDHBjfDc8s 8jvwLETwAZY5ddvMh6JGb0velZRQVzkr0ymPnJDV6rEbA4m/dGZ6ldT8FxXjhJG54q6G 3AoEAQAfNp+F4cFN5B16W6xwgEMl1Fl0WMGID6KBL/fDClcSK+2JLVAF1F6KEmnKvNFO Lk3jBBQ7hjRx3V46XYgdjGPS1TqkdDuV95Rgec0uYsbzBHEvDOSq0NDYADnpymKDFjeQ AeZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818655; x=1757423455; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bdjUdksMSi5PcEKm6NTkntw2W6DG2YujIlvk6/azIfc=; b=rm6ST+pBvXHTi2g4jdP0tOGKmLnSSKOwRlmvl+ACd5KK5jGNTDT7R+gg9I2u3tkcV9 7TnZb69QoV+Jhq3MeGwgbrLEgl180hcjzS5FCodN94RFOLQJGDuLYRECdSM8cDdaBDda ujAwlEWnw5jgymrXGV/4HtlqZ3BVA64nxtoxfW+7QDlIuugAmnHnotANiWmY/ukyx39r PIcW2SYpYiBaPgcJPjWAp5yyDj9TWHvzGUDNfmfc/CDjngrxKj6vcv4agDNYDuForKB8 3cUdyaEcUP4g8jPUY5vp4xVAoxDZKyRsYClPPU5+XTGEKRGl8QLvbgYHapN1kwwrRfQR XTKA== X-Gm-Message-State: AOJu0YwpHXVI/PxT4IA7GzWwkyEwbYiVmMXUoPFPpNKP/l1adjtEvgf7 d0ZsMXiZg43KG6UgPxtCGj+enow39/xUX1qQXBCydh+VG+h8b9T96yuGEME+yX3iUt/UCZvfBYP EGuJe X-Gm-Gg: ASbGncty1j0f08jcX+VCbSu/6I6KseP8KFqxk25eE5TVMTBUKqjAtEdGhIFXdsibVHq tJjS3qF5DaoYHG9g/CnH0QsxTpK/SP1Xs6ZsJmgzGkiPqfW7/SW70/KHqoIpAZeEGJi3r4FWyEb St9vzgrFqZ84nRiCwa2L1ULjBiC9nPp0si5nyLDCpvru4kkSq5bcLp8lAgCRduslT8bOMOgSm8N ccFpSAHagdXfToQNInsVL1+LmPQ7xsBjNYUTB4dLgrKPaefGTHy/QVFIDt9vTk3q/1Q32tAy/xS Z1nDIEUV1RpmcRwpOgns54dodL3A4YKSjK36FVEyhRPi8LJ4c5br7V5KzJQvQGda/SLJWf0CSEV aeQ7FIV1XcOc4e0Nac1fdiPJ8oWfMYLfDWq5UO668pm3YcUhWeJiGni3Ix7Hz1WtkmXFAAmsDDA RTNCm7BC2dI8zpyPugsw== X-Google-Smtp-Source: AGHT+IHltI4oUZ06r03G6luP97pDDV9ZGvIYrYSujgJRf2wqYNfl6pOPrkB12g0+jiUPX3f6NwPysg== X-Received: by 2002:adf:a3da:0:b0:3d2:2989:224 with SMTP id ffacd0b85a97d-3d229892c7dmr5790880f8f.7.1756818654828; Tue, 02 Sep 2025 06:10:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 08/39] include/exec/target_page.h: move page-target.c to header Date: Tue, 2 Sep 2025 15:09:45 +0200 Message-ID: <20250902131016.84968-9-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.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 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: 1756819112756124100 From: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250730220519.1140447-3-pierrick.bouvier@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- meson.build | 2 +- include/exec/target_page.h | 11 ++++++++++- page-target.c | 21 --------------------- 3 files changed, 11 insertions(+), 23 deletions(-) delete mode 100644 page-target.c diff --git a/meson.build b/meson.build index 7ff84787cf1..fa6186db334 100644 --- a/meson.build +++ b/meson.build @@ -3899,7 +3899,7 @@ if get_option('b_lto') pagevary =3D declare_dependency(link_with: pagevary) endif common_ss.add(pagevary) -specific_ss.add(files('page-target.c', 'page-vary-target.c')) +specific_ss.add(files('page-vary-target.c')) =20 common_ss.add(files('target-info.c')) specific_ss.add(files('target-info-stub.c')) diff --git a/include/exec/target_page.h b/include/exec/target_page.h index ca0ebbc8bbd..813591c9b51 100644 --- a/include/exec/target_page.h +++ b/include/exec/target_page.h @@ -62,6 +62,15 @@ static inline int qemu_target_page_bits(void) return TARGET_PAGE_BITS; } =20 -size_t qemu_target_pages_to_MiB(size_t pages); +/* Convert target pages to MiB (2**20). */ +static inline size_t qemu_target_pages_to_MiB(size_t pages) +{ + int page_bits =3D TARGET_PAGE_BITS; + + /* So far, the largest (non-huge) page size is 64k, i.e. 16 bits. */ + g_assert(page_bits < 20); + + return pages >> (20 - page_bits); +} =20 #endif diff --git a/page-target.c b/page-target.c deleted file mode 100644 index 8fcd5443b52..00000000000 --- a/page-target.c +++ /dev/null @@ -1,21 +0,0 @@ -/* - * QEMU page values getters (target independent) - * - * Copyright (c) 2003 Fabrice Bellard - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ - -#include "qemu/osdep.h" -#include "exec/target_page.h" - -/* Convert target pages to MiB (2**20). */ -size_t qemu_target_pages_to_MiB(size_t pages) -{ - int page_bits =3D TARGET_PAGE_BITS; - - /* So far, the largest (non-huge) page size is 64k, i.e. 16 bits. */ - g_assert(page_bits < 20); - - return pages >> (20 - page_bits); -} --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818881; cv=none; d=zohomail.com; s=zohoarc; b=CxT1Aje1zpq0rqHFUECSX8jgSAVh3WS8pnCRZ9Q7S3wx/8t1XH9UAeWScF3u35r0MrZl7qn/LxuE57fiIwO7Dgs08lRtaZ5EOF85f1yS3Govz4T/tqb4W9B7EsjvoNCh7X29UYSl5aP4HlkAJS4g97kTYlLYOa/blbRWeMCgbS0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818881; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=7F5eIWtwGjAcSDjJbli/J422DEzt3H2+R5Kkkzggnos=; b=lMy5vO7dxIm4AVdx+ljVgttSOcqTprzolTcUCmxF56Yb8/qv+tdHvRbqfxJy1iAA1OaxnJeen9u3/V6NbPrL7i6ZgWENh0pb8j87WK2QxAmGqwYA3G09BBG040vRA3jFqeWt0rgKPARiumPlaKnb9o84GW44oLeC50F4D9N8WIs= 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 1756818880953302.79170433932643; Tue, 2 Sep 2025 06:14:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQn1-0000Wm-C6; Tue, 02 Sep 2025 09:11: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 1utQmy-0000Uw-27 for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:08 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQmt-0004SY-RR for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:07 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3d0b6008a8bso2100215f8f.0 for ; Tue, 02 Sep 2025 06:11:02 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3d21a32dbc5sm15924801f8f.11.2025.09.02.06.10.58 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:10:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818660; x=1757423460; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7F5eIWtwGjAcSDjJbli/J422DEzt3H2+R5Kkkzggnos=; b=UWO72YEwPSF9Aeah8oyng9DeUVrbLxuDYprk6L0kscF5XUsSlit5YXmYyGMEQMQmI4 GZKBj5+RMwA8JOT/bbJJUvROYucWKaa8kILq7vtsaBflHq1y0slsmegk4QZ2gDsXX+JJ 6+jRJKv1HMF6E1mIvPCra9j8xkwV6Fw6q6i6rcbSjU8avn7IkUX+JOpv+R2P8Kbk04/3 bjdV0B7Ca84oxv9rI4r1wjpAgdQVqBue6llcNfADZRKHEX4WseSkwetOA7RSW5mG7Bzw HrP2yCEZNu3b7vVh7G5uxMm/XwmK8NbeYe79pIfrfHGI7puevKhi7pYf6pqfO3btH0BE 7IqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818660; x=1757423460; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7F5eIWtwGjAcSDjJbli/J422DEzt3H2+R5Kkkzggnos=; b=NqcPTtUWmw1Pxqi0b4O0ZT9LUXK6qXdaGjveYb0PpNrobbdW2BxX/ocoNbQX+nZPNO kszE00QJ2vzCuv9RIU2z8fV2h0O9tFSzDmvQ/wi83jeSYrrS+Xc2LSTS00dewn7+7W6E qE5f98pmZL7FH3Q1zW8PSQT2JZ2CcPv+kScTtpHuBOoOiXd2JzphPyTe6I8EpGQ/PRGZ 51sq92YosDgmPMpP8+fngAnPk9W7DAcj+LYFJ6YONkHyqeqZcbar4nygim17BUtuikcp xzzC+5aovOizKKO1lSRSLiqeHyxHbKaQ/anWyJflv5c97UXc/8kGI4fl33+sJgwFHLXP KPag== X-Gm-Message-State: AOJu0YxSHZZd++HgFOVCm1aHXpiBzGRECT1c2AaWhxyeRPEfWiH5PC92 1BVivqnc95DyC5pu4xlEe+c4Wn7ND8dcTtIyPgsZ3FUM1sYv/mW/0g1GwnwTyDIxwAlhRSwg13C sHj3h X-Gm-Gg: ASbGncv4J9NQtBfdeLlpysj5EPQEJYCtpUHmfegv+H7/hxwKluDUPbxiP3/41Zma0dA 3EurSnpOd8YvOgySPj8Qwm/lfjm+y3KZ+1xcpN7uk3IAYTjp2Iv0wFDI7EXVkY54Zi3jWn4nM6U 6W8A5e76+5rX5Zz8sKf2rcWlKpL1B5MHIginzAvzTG4wy3odxeMWCYMryNi5pW4pLBi/Q7CC0z6 u3fXyr+bB3HCB0ar/xkCXDuIilho0ZfxTAT/hg2TCeHvkHlRHMCueiWnSiF0AlipoN0/gToUiux wNpm9LIjP5u7VakrZNixjDIyjMT31Fc7ts5Q7FA4aHvtD+ID0XMXYk/GzoGrX6kV8cc9ina6WX5 882wUJLHlmiRe+0eNzaFWytAu6Pm96NIcqRbSNaZYxIxf0sAQ2l8RAoZyVzOILrxuY7lwDaOnf7 8xtfDhWKo= X-Google-Smtp-Source: AGHT+IGRru28GlAmQS2YlNliqsRwTVl7DfXxRd0qyRgM+12gljJrpPCPPZykgf4JxInVdOjtPkHoTg== X-Received: by 2002:a05:6000:18a2:b0:3c8:d236:26aa with SMTP id ffacd0b85a97d-3d1e05b9a97mr9648132f8f.58.1756818659560; Tue, 02 Sep 2025 06:10:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 09/39] hw/meson: enter target hw first Date: Tue, 2 Sep 2025 15:09:46 +0200 Message-ID: <20250902131016.84968-10-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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 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: 1756818882318116600 From: Pierrick Bouvier We can reuse target source sets for "generic" devices that are related to a single architecture (like interrupt controllers). Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250801174006.2466508-2-pierrick.bouvier@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/meson.build | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/hw/meson.build b/hw/meson.build index 791ce21ab42..1022bdb8069 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,26 @@ +# Enter target code first to reuse variables associated +subdir('alpha') +subdir('arm') +subdir('avr') +subdir('hppa') +subdir('xenpv') # i386 uses it +subdir('i386') +subdir('loongarch') +subdir('m68k') +subdir('microblaze') +subdir('mips') +subdir('openrisc') +subdir('ppc') +subdir('remote') +subdir('riscv') +subdir('rx') +subdir('s390x') +subdir('sh4') +subdir('sparc') +subdir('sparc64') +subdir('tricore') +subdir('xtensa') + subdir('9pfs') subdir('acpi') subdir('adc') @@ -44,26 +67,4 @@ subdir('virtio') subdir('vmapple') subdir('watchdog') subdir('xen') -subdir('xenpv') subdir('fsi') - -subdir('alpha') -subdir('arm') -subdir('avr') -subdir('hppa') -subdir('i386') -subdir('loongarch') -subdir('m68k') -subdir('microblaze') -subdir('mips') -subdir('openrisc') -subdir('ppc') -subdir('remote') -subdir('riscv') -subdir('rx') -subdir('s390x') -subdir('sh4') -subdir('sparc') -subdir('sparc64') -subdir('tricore') -subdir('xtensa') --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818735; cv=none; d=zohomail.com; s=zohoarc; b=fbUzxFTiGq23BGrJZyOgMX1eSVCUUxbU79cUGqeRehJP9msCRIlBG2k4JF+PMRG/ATf0VTWS0lcJpmKIPAhobcx5ymepZBOlJ7eTv0qZF63W7whJx+7ozY6KpgE70cEKDmdIR5n8DMrNTQcRo0wOPnmw9uihILe9O+HLK/EIo18= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818735; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=MtRFtCAAXDtFa8mvdL9ZNn0tvJmLxLIbWyzszL4emGE=; b=VmGpIr0RmU8xx0sNsKYChdwosux0+FLhoVJ7nRqJbw+Je7K4ersg5Y0v1MRc2UvHNnUJmLNbmwbgLTCOcPvSC0rDhHeeNC1MC3TqzhWRRfmBpeOveCcLAUmv9idAScwnzFy293wRDRzVrQ5zxpEVBjDvd2X5fjB6WefSoqZHuew= 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 1756818735169264.09995563479026; Tue, 2 Sep 2025 06:12:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQnG-0000ad-8B; Tue, 02 Sep 2025 09:11:31 -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 1utQn1-0000XN-Vb for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:13 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQmz-0004Tk-7q for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:11 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-45b88bff3ebso15809195e9.3 for ; Tue, 02 Sep 2025 06:11:07 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b7e7d1319sm213632775e9.5.2025.09.02.06.11.03 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:11:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818664; x=1757423464; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=MtRFtCAAXDtFa8mvdL9ZNn0tvJmLxLIbWyzszL4emGE=; b=pAKswTnOB/l6PG80Rwpzdc5ZxmT2kykwicPFL3CzfK/Nk3a2nUCQ0OIKXeSetO5Rhl PC7Oi9nFlhUBO5Tidu+h2ZUQXKefFLS6ZmbHULpAXWsr9iYyJng1e+zAi+fQyDSgyr6g 9KLNXx9G7Je/XUjNVlcZB3YlsDpVeota3zAwG9X97xxosT2nKUW2IyL7y+1TRKU62zoH 6I7bs7+V34y0QcGLEr+m923YA6vMX2qK0r+urquad0ls5hZfrjzFHVo+jt17fdCERs/Q +yF92rBFMbeaxkzEQH7TV3KWPB76DZKZHqS623LiCfkeEmiPE98c3ms50BhnaD7JtTKH ZZxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818664; x=1757423464; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MtRFtCAAXDtFa8mvdL9ZNn0tvJmLxLIbWyzszL4emGE=; b=nKchKHOnKISxq46ZtHbbhP//3HIVoklmMYSejbDSPcY0chtDV8B+7qffjdLsyg2tmT dLGVYN4FUDUgV8OyzO7AucN1FNKYt2kdrohRg4oEE/lMsz4ajmO+5z1bVCgHcVe41m+l Lm+POz75DzKPSEj9YAH1cQzQ30PfP/wj33IfAEyaOCFB2r608+wew9Q8PXBBJJzVTB1d W6chCCXR5zzYkZNpIxyEHtIrCA2l6bsrhhU9M86Gikb59RM1tZ8MCYKD3ELNvRmv7SK/ TqjVchBEJITHx3+4IW8UYXz3tNG/GCWTWRh+Jp5rRZ55r4LpwTAYKBHjW3hGwx95w5qv gEPw== X-Gm-Message-State: AOJu0YwgJnzKG6meOVmbKpCxG+WZvksKCbul6Q8fGhMKk2CzzGAGNFrU 3juaBE2/Rxn8CAfXxuOqRbDOptC0/MU3+72ESJJ9mqDmrQuBKpfdm0qC85d6+2rMqLPY1gzBCiR Neu5L X-Gm-Gg: ASbGnct1bVDIXW+WvCfaGgyt6EZJo0m8zsn61tNBU5Mztj7rGzgaRtfvqpTgEcX88eG 9MwUDAYWLVtdFU1mJ7qopFl8bbjto7esnKeKJZ8pxXCM+h2pr4pxOwiZbtZ23sZZEoLWTk4vHFm nVf0Wz58J//OlgBp2mTONATIjQTyJ1HuR74RFgIts/i9kwW8H8uKLq2XjLjmmdcHNXAQZTbwK5D TvLOBzNieqby1leual2fF+IX8j1GBJrV68c69Ek/dvbb4+usGOiQMycb4jp/PGGdtXyzdhEVfk5 Zh1pGSqANGbFav3lIGWvO17fIakHOQnAr5kx6N0x9hQHuUjsSR/fdzvKsJZ+/OAOagQBumvvQgh zkHFQ7NL9UpkFWXyg7rkJzqRJYv6d/J/ED6fomZwgqAF3h4Tl2wQj8cmw5RC1qYo4C6WDts9nP7 0fLNknSMg= X-Google-Smtp-Source: AGHT+IHF5CwLu8xipLp/GA24kmgu6oGz+SVE9DQlP+85/c3Jt+mzjHNeo6gMP4OPSGb2Ku97cH+4LQ== X-Received: by 2002:a05:600c:3556:b0:45b:8822:d6c1 with SMTP id 5b1f17b1804b1-45b88321bf8mr85484995e9.12.1756818664255; Tue, 02 Sep 2025 06:11:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 10/39] hw/intc: compile some arm related source once Date: Tue, 2 Sep 2025 15:09:47 +0200 Message-ID: <20250902131016.84968-11-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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 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: 1756818738048124100 From: Pierrick Bouvier Let kvm related gic file out for now, as they are compiled only on aarch64 hosts. Signed-off-by: Pierrick Bouvier Tested-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250801174006.2466508-3-pierrick.bouvier@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/intc/meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/intc/meson.build b/hw/intc/meson.build index 3137521a4ad..3efb276b6e6 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -38,11 +38,11 @@ if config_all_devices.has_key('CONFIG_APIC') or \ endif =20 specific_ss.add(when: 'CONFIG_APIC', if_true: files('apic.c', 'apic_common= .c')) -specific_ss.add(when: 'CONFIG_ARM_GIC', if_true: files('arm_gicv3_cpuif_co= mmon.c')) -specific_ss.add(when: 'CONFIG_ARM_GICV3', if_true: files('arm_gicv3_cpuif.= c')) +arm_common_ss.add(when: 'CONFIG_ARM_GIC', if_true: files('arm_gicv3_cpuif_= common.c')) +arm_common_ss.add(when: 'CONFIG_ARM_GICV3', if_true: files('arm_gicv3_cpui= f.c')) specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c'= )) specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true: f= iles('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c')) -specific_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c')) +arm_common_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c')) specific_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_irqmp.c')) specific_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic.c')) specific_ss.add(when: 'CONFIG_LOONGSON_LIOINTC', if_true: files('loongson_= liointc.c')) --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818874; cv=none; d=zohomail.com; s=zohoarc; b=frp7tMSOiNCcLRB+VLZiodiKph5DlruL5tY1j2DEwB/ocZoVNjDNRBF5iyH4J8d5ff3HPJTuXgO68RcGj3wjjVe2ZOuLtNJ9S5qNWD+sVcLXsM8hqysNPTJNXXbY6cEytgenFnmvUlyA+tVdy5FRJ58dtbpJKpR8aEt0U9+wZbk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818874; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=ZO8GkHAjAS9SCd/410xii2goyI4MjiXciEMBan796CQ=; b=LWGujEjt4elWHe+TtrakuxqUQOL3O3T+YdSozPWipw8+aBODxuZd8a379yr0l6fnrHhYD9aq/CK5HzmF2s6XoPqjDmT6iHMtjyl0BzYeQzRjG52/ow0510y/VjY9YQop0IT34YsiehpLJ3Ul+DBg+EKd3e5DcM9fMu+C8LSh5vM= 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 175681887479732.833195209384144; Tue, 2 Sep 2025 06:14:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQnb-0000xQ-5A; Tue, 02 Sep 2025 09:11:49 -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 1utQnK-0000rg-2O for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:33 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQn2-0004Uc-Se for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:29 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-45b8b1a104cso21161745e9.2 for ; Tue, 02 Sep 2025 06:11:11 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b6f0d32a2sm303454045e9.9.2025.09.02.06.11.08 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:11:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818669; x=1757423469; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ZO8GkHAjAS9SCd/410xii2goyI4MjiXciEMBan796CQ=; b=mWrLD0Dc5/2Rcx8FOPStxW3sAg0irDs0E0EO5H8t1y1HKLSTO5/3spUUF0cGdRzE6l V3OHgj0wSbBNVagpSvpWikTNZRqg2xJEvZu3Xj6d28gn0OI8O1ss6xEE4nF+NRsRnDPB XEG2znT3eReN4S0QihMdw9iQz5bmzbBLNPaxcShb0zJBBIP+gnPyVlTD5QvY7qrj/zRJ JzpNSpqxoBfaxmPspJA+qHu7zDX2UXKzJqnrn8i91HYhdy8g59G7SHV7xdpd7t5FF9dk jso+y3DLk+JZVRLzDHhtKPkPkUjhdgfk5kicdZsCQr+hAcoH+v+taidNBGZyKCMVhhon g6Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818669; x=1757423469; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZO8GkHAjAS9SCd/410xii2goyI4MjiXciEMBan796CQ=; b=QTT0QylusVKCYcsVImVLjsyh1F0dIGOFF+kxInaXtQ5DhgXGJj5mDeN0OnnTLjeuEH zfE3wPRM4CvGED38NWcPwUsda6xioTCE3ajVn5PtyM39rmhJ9HBcZja0/5VWusPwd7Js O4N+NNLu4mixNaomdVcGJxGGJShUZh/MSau435jlaiwlLczO7xIfeZClQSevWCD/sZD6 whJZl+4t5Tj/bzq1dy6WjSA9K+Doc03iCyv8ZWQVL1H7tJ+ZC8MtGwC/nbc2gYdcXJdc ZQgVRLLMtuS844/a2iWpsqVwdYFBREnX3KxfRlAJHK/LpjMPxyDFIeGYBwsIrzrcYdOV RfBg== X-Gm-Message-State: AOJu0Yw7A+1bN9vNQx9Y9zmF8eyAYBuR6zHck/0/MY7l62IiIsj4gvUX LKTP71vGuH0TjNzdirdeWPQetPL80gg7dK6UclJoME9O1D5Tjw80JxP/tWOUJJynFX5aNsMBMKZ 49jBs X-Gm-Gg: ASbGncvHDGpGT1XHxOu36Kime9TURpGhsuo51yFluPn4HoWpDApVSVyclOClmlUd61K pgXpE282VoVJh3jH7WrIs9e89b9WtvRlwpj7kh7AeI97vEIVM8PTc327FW+3cZMdzczwnEsJKX4 5dj8CotrwfnAyglQJvnbFrUvrHu+wCK6k6dNQU7xkYfXMGnrgspu09+OKuBwmANrObTXbTX+pnh HEykZoEEzubIhzZAJWQg+AnGjVYxeCG385gumkwLn2yKaQwzNVUKIv6Am2NYrPT5M5eQ6NOl/1T d+kIgyjh27LzQOjdjLgFGbEZ5gt9ZPfGSyCCm1fpKnVyUDO6uUtZJ5wsamZsu+taQCTN26Z0Qv8 Y+3ETpnlQsntyco12W+wXI7lGtfLO3I8FxSM2miJzGdhf8xDSyUdGn+gkZOuyxas11WYwiCanUJ LFiRkdsPY= X-Google-Smtp-Source: AGHT+IH8JY8CCrI4uIi4M+ZyCNFpGD+mDcK0OQeXubBdonC8cQv2Ja2TbLQkYu3JpiLMhVX1LpnGbQ== X-Received: by 2002:a05:600c:3596:b0:45b:8a45:b540 with SMTP id 5b1f17b1804b1-45b8a45b97amr62463075e9.19.1756818668831; Tue, 02 Sep 2025 06:11:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 11/39] e1000e: Prevent crash from legacy interrupt firing after MSI-X enable Date: Tue, 2 Sep 2025 15:09:48 +0200 Message-ID: <20250902131016.84968-12-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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, T_SPF_TEMPERROR=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: 1756818904150124100 From: Laurent Vivier A race condition between guest driver actions and QEMU timers can lead to an assertion failure when the guest switches the e1000e from legacy interrupt mode to MSI-X. If a legacy interrupt delay timer (TIDV or RDTR) is active, but the guest enables MSI-X before the timer fires, the pending interrupt cause can trigger an assert in e1000e_intmgr_collect_delayed_causes(). This patch removes the assertion and executes the code that clears the pending legacy causes. This change is safe and introduces no unintended behavioral side effects, as it only alters a state that previously led to termination. - when core->delayed_causes =3D=3D 0 the function was already a no-op and remains so. - when core->delayed_causes !=3D 0 the function would previously crash due to the assertion failure. The patch now defines a safe outcome by clearing the cause and returning. Since behavior after the assertion never existed, this simply corrects the crash. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1863 Suggested-by: Akihiko Odaki Signed-off-by: Laurent Vivier Acked-by: Jason Wang Reviewed-by: Akihiko Odaki Message-ID: <20250807110806.409065-1-lvivier@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/net/e1000e_core.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index 24138587905..06657bb3ac5 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -341,11 +341,6 @@ e1000e_intmgr_collect_delayed_causes(E1000ECore *core) { uint32_t res; =20 - if (msix_enabled(core->owner)) { - assert(core->delayed_causes =3D=3D 0); - return 0; - } - res =3D core->delayed_causes; core->delayed_causes =3D 0; =20 --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818980; cv=none; d=zohomail.com; s=zohoarc; b=isy52DDcyqY8b0bke1oPY3bkT9b4Ev++LGfS117nqJF2Jb7k7HxVw7FxVqz+bggJxKAqV+qSbnTXW4rRErwniBuNsNPNAFsKVrRaZlxg94pLvH7OerRG/KoQtTqBQGgfyVUe4bCQmhkLr0FDhZw168t0XWAiVWxQCWLZRyQGJRs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818980; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=h1bQ3YvXHpWdKZQA8th6hBcDTCJDn8e1NCM2+N1lCr4=; b=If+QWl8eUZ1C+6IbfOeicr3I01izQZKA1JiYU4KwIe9UIjXuSvU5DYQOH+uZBABn8QTf6ZWxLHLCIwoobYaO0dqhCAfYzPS34oCFkElFKwRuN7NbEErPELmswIEdzBo/GTq1nYpXvT5LHjL0AZUYVAl++7hhLDeOUOQldXVEZFs= 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 1756818980551635.7516220820024; Tue, 2 Sep 2025 06:16:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQnl-0001Ua-GE; Tue, 02 Sep 2025 09:11: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 1utQnL-0000rf-35 for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:33 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQn6-0004Ve-NF for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:26 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3d1bf79d75aso1080030f8f.0 for ; Tue, 02 Sep 2025 06:11:15 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3cf34493b8csm19233720f8f.59.2025.09.02.06.11.12 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:11:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818673; x=1757423473; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=h1bQ3YvXHpWdKZQA8th6hBcDTCJDn8e1NCM2+N1lCr4=; b=eT2Q4Ev/BFSWYoZgLckHVW+v2pprWe6ETLlJPFGkWOHiN8ZgS+1Ty1Q6P9LFDy7Jo9 yZWvcY8j+J/uRKsDPURyYKmxelZyDYFHx8f4EWIcuQXAyvDgBYFo4Gj1XLZkzcI/A1mv PQ0ZnPVC4Pm6QfRf2oOIk1pbCKJUcUg0vqE2b0vG3r1DTsCAMv9lgp7X/TH7NfrULTxB DUB/dvaSfrX41XFrfdZ/hrUEmbqF4MZS0nvaMfaeHYT6YwR1+hWs6tOK8ZNdKQ6P4fl5 uWIsVoZH1PlLrYxglMN2y2LM4PJsAz3rjHi0LLuHn5+0UE0Jn8AqZBFfkvyegzqfPSt1 Ewqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818673; x=1757423473; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h1bQ3YvXHpWdKZQA8th6hBcDTCJDn8e1NCM2+N1lCr4=; b=k/CdtWGEpGeHtFjdjAO5m4sr3dAvQia1K/35EbX9uWxZJ7QGNxJhIPb9CQg4WEWHa1 Xnl6NeEKFQ36FnlULkjiHyhuQ5Tu74ASVC7zHFftkdo1Gz/oZ6AsZ78c546pT7YgDsvn 9vQbKGml7NUnwxilex0p7y1GkHgGmfgQ/B8v0kiW7lByKKvHw5CTVFzO/kMsjWWPg76H VzVf5GF966dftVdaFrM2ATJDnig6t1rg4wdc9TWKfgPNKfDGVyEEzc2G18QTZDzVPXyb l6EKoIjZRGJZGNm0ywNR39MZITwusO4K4WOEfob2ejNNZM9B1hpojbQhGJJzCgkFqMm1 Pbfg== X-Gm-Message-State: AOJu0Yy/gveK9JO4tCl+lfD7PFNZnFhA9+qZkfo9TqivGLw/s3qOBejm xQGScjvkqu84xZJVMAbk2fkYWn3BsTBUkbc3N3+Nu8nSUhP8Vfi7W81QyzO14PzEe3d9NGu5Jy1 zfjVh X-Gm-Gg: ASbGnctwjcmClM5fj/lECUK8lXKy4MiCfa+oGBgk/Qs3IDD/K+WBnqd3Tv+S6tszdux /40KHq/IzzKXffQCAnD7XLxcYOaLk/rqkhuORJIpNqYQ74DTkV/Z1FIcPCPpUhiDghMKWjGBEVD ax4ndB0S7C6pLKCgoAMZ7LIXAzNm4YhBAc+jEOpa3v+HJeUIBcniZZQYmXuWhKbLYoqHC2QSaT5 IfR8wthd9Ps1u1p+jiPHXfj4B4jKTtasLgXtggPKlXy/8vUBBzq59IZY9pdwZbvGTWYSPuoJfds XdBQSpGZnCi2kPeBOzuByKKJqY0cm+XX6AICABFTAZFtwazYYELlqfYYG/lHy++krAOGMSFg821 Xqxql0TW6q0sFlUyd6S1ycrN6kTaqX6siWzxNo3XB+Z/tGLlfZYuYEn9X9bGLt3mUgvoecGIQ X-Google-Smtp-Source: AGHT+IHajneaawPqJGVPbngsHpW1dzCmK3xuoE2XLTazpZL7IEuk/CQWZF3UDFRqxoWPYf2r8sBYwg== X-Received: by 2002:a5d:5849:0:b0:3cb:e47c:5e4e with SMTP id ffacd0b85a97d-3d1df34908bmr11490735f8f.24.1756818673509; Tue, 02 Sep 2025 06:11:13 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 12/39] scripts/coverity-scan/COMPONENTS.md: Add a 'plugins' category Date: Tue, 2 Sep 2025 15:09:49 +0200 Message-ID: <20250902131016.84968-13-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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_PASS=-0.001, T_SPF_HELO_TEMPERROR=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: 1756818983030124100 Cover the TCG plugins files under their own Coverity category. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Acked-by: Alex Benn=C3=A9e Message-Id: <20250811094341.91597-1-philmd@linaro.org> --- scripts/coverity-scan/COMPONENTS.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/coverity-scan/COMPONENTS.md b/scripts/coverity-scan/CO= MPONENTS.md index 72995903ff9..95805b536bc 100644 --- a/scripts/coverity-scan/COMPONENTS.md +++ b/scripts/coverity-scan/COMPONENTS.md @@ -147,6 +147,9 @@ tcg system ~ .*/qemu(/system/.*|/accel/.*) =20 +plugins + ~ .*/qemu(/contrib|/tests/tcg)?/plugins/.* + (headers) ~ .*/qemu(/include/.*) =20 --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818995; cv=none; d=zohomail.com; s=zohoarc; b=n5I/8RSiyeHunPuIvTq+6AvmzLjJCN0dBHgeo/UqJssW6O3qedwYfsUtIzYLRMK2xZNIo/24IWqSATYczDgQwKDRbJWx4/upYy33FTXyYVxOLwf6bauQvEjlceeaslvyoHuniQdx8/1HF7Zq3xykpLZ1optYfXQa2PxruMFn1So= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818995; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=xLSY6a6sWL0T22LwducXeaaoZsK3dxB1C8UUGoL+RxI=; b=D8fUSSrPq+e/NnfGrQO6q73147clSF98hlkqL/WsWD5xvSst99+E8paCMDAmV5gWUZoInZMQeHnJyVBqIqJzEmgXdJ9TMDdECOC1zKHEE3AFtBQYJ7fxHK81HO3CSH+rEwPaWHOZ6x8t5isfHmZeTzK/c8y9EMhuCOxG7fFO/UI= 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 175681899581520.719641890426033; Tue, 2 Sep 2025 06:16:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQnj-0001Kh-EB; Tue, 02 Sep 2025 09:11:55 -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 1utQnL-0000s7-8m for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:33 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQnC-0004Xc-KW for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:30 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3cf48bde952so3723553f8f.0 for ; Tue, 02 Sep 2025 06:11:20 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3cf275d2717sm19669772f8f.15.2025.09.02.06.11.17 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:11:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818678; x=1757423478; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xLSY6a6sWL0T22LwducXeaaoZsK3dxB1C8UUGoL+RxI=; b=hDpQe2Mp6JvN1EUf9Qbo0bL/V2zhISbgxIbK2s0IHvcadoW89ssDpCEtFAettdSZIH K3L08JtZ0vNSvWm77899bWxyb5cLwgYr2ndOs5JIxm0747aRq7Yt1ljo0ieZ/r/lO7Pp 33P0w6H7iEnpDQHj4hEyvY5ZXZryfKQoYrr2wQ3hq+XFa32uj3WMBLqX/dgqTJPeT5ow kPZozOFLu7aEt2CB6WW1L6iKYwpWdGDMAMCB4fZZ9wV6Al6YDMfk54tBIekFv0SBzpAl a1ZdDeZlV4dIsXzXVmrAbEiUxpvigjTQ5tgkDpBt4Pyppk5PXkb3xYz6hLOJ96HTYamI NF9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818678; x=1757423478; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xLSY6a6sWL0T22LwducXeaaoZsK3dxB1C8UUGoL+RxI=; b=EUqwLvrlTjwg0CCQ1zEtaEZc4pL590WtWH0hZ/KNenYblyuLdGExtmwjsoys3WhRQ7 i+MyIn/bBNfeXvcQyKsYXvqR3+5xrAeAAQKFruFhvU+/fvWfHCOpZap+tp7/nfaMM7b7 tl9RwM5WIcVv4qzDOdCReuHsYYGE5vyWRnvwluxe1UO+0ZN6NOM+LDg1q9e5ssxQvcz3 1RG4ihm37ukXntY9r1eSwecwzIzVBfii0e/OYS+CgM/CaDGcGdwjga55+uFJISPpaU0G Jn7UH1TGIAn5k6+wkKHFdD/JZ4/wOU1nXW+SSKAiLxiiwHDemkyub4cTsM8rz+j2jUE1 3UKA== X-Gm-Message-State: AOJu0YzylQkAdMCIcM8TtZY+F8PqKzdWdLKssc35rz2R815F7f6kBSgK A1gVQIFGlJPAqaVUroGr0xuh0izkRXqGtPdtCtPcmINrazil6/rSe2UKTtYjuIjsCVG6Q/WoheQ D2+cf X-Gm-Gg: ASbGncvqKiJTLR7yeh5ewBaxIeSb9AGqt091OOru28SdaYjyA57SoSI2/vzD0uiaCry Aik0TbMMVMros5bnq9K9eX/51Js78JhJwLsHTvcCcHwq/zf9DluF1DC5MYlVmfKMhjszOVZp6ox iQuYiJPggEPx7CeJUV9RfyPIoUvAdOFZ0xBZckzYungS3ccRLtmQyDap2YQBTTeM7D0Jt+m1q9I /EClN8hHCt+mN/2C7FWxUFNBlxr10fkMReqWbNoZpHikkixgNbytzNDpAMhAwOCOnze5HF0IdHb vDTXdSVk2YGm6Uh6kP2eTuHQQSk4/++nRfUmQZ7dDkXyAe/MhXwPIN9HnDdvTxCSBr85ENCQLl2 u74qncZMU7CWrlNis5tn3tL0RjVR0mp7hkuvey4qW90GSM0QufVnTGPCTSfgnq1xgOD6CwdM2eX VcUwKdXIE= X-Google-Smtp-Source: AGHT+IF6m2HomZhoyW01LNdH7WwNgwHqiQcuHZtgARwPJQNnkuHVYg5IbLwDSRoiqXUMu4rdHP6e/A== X-Received: by 2002:a05:6000:430c:b0:3d3:9b18:227e with SMTP id ffacd0b85a97d-3d39b1825a8mr9416998f8f.10.1756818678185; Tue, 02 Sep 2025 06:11:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 13/39] hw/scsi/mptsas: Avoid silent integer truncation in MPI_FUNC_IOC_INIT Date: Tue, 2 Sep 2025 15:09:50 +0200 Message-ID: <20250902131016.84968-14-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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 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: 1756818997202124100 For the MaxDevices 8-bit field of the request / response structures of the MPI_FUNCTION_IOC_INIT command, the 0x00 value means "max 256 devices". This is not a problem because when max_devices=3D256, its value (0x100), being casted to a uint8_t, is truncated to 0x00. However Coverity complains for an "Overflowed constant". Fix by re-using the request fields in the response, since they are not modified and use the same types. Fix: Coverity 1547736 (Overflowed constant) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Message-Id: <20250811095550.93655-1-philmd@linaro.org> --- hw/scsi/mptsas.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index 1ebe0b82a79..4ada35b7ec8 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -579,11 +579,11 @@ static void mptsas_process_ioc_init(MPTSASState *s, M= PIMsgIOCInit *req) } =20 memset(&reply, 0, sizeof(reply)); - reply.WhoInit =3D s->who_init; + reply.WhoInit =3D req->WhoInit; reply.MsgLength =3D sizeof(reply) / 4; reply.Function =3D req->Function; - reply.MaxDevices =3D s->max_devices; - reply.MaxBuses =3D s->max_buses; + reply.MaxDevices =3D req->MaxDevices; + reply.MaxBuses =3D req->MaxBuses; reply.MsgContext =3D req->MsgContext; =20 mptsas_fix_ioc_init_reply_endianness(&reply); --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818796; cv=none; d=zohomail.com; s=zohoarc; b=B8LswFYJEh5eAQiuaLLSb74PwfCeWAVkld2k6WupqlGvFdx2xFjHKfDWO6D4F6ms9oeEYISX9eoDxoDtLo6X+Fgewx04h4CFtlxysjY5gEXEqPnF/xwYjF9cejoqLS/brphkMN8bXY9W1PVFmWzR+CPYjcSu6zVqOvexPV0vQ/w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818796; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=Ffy782YI9rbL70UmV1deEFYCAKelshR+/2GjIPy8X8Q=; b=WnXnQ0VfjSxOWOlhFent5LJXHOJk9mOkBY6KL13/2N4zno1BNmcxsH3BS0WOTuSyceWUhyojIeCukh9TZy6srPFpl+ANRTraEttbULPHHlvjxP0tYunvkAKnX06JFczUhQcxda/7eg6Gdyu1T1tA1pHQVLyMAfRr0bQEmb2G9HM= 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 1756818796015489.43656953994434; Tue, 2 Sep 2025 06:13:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQnk-0001SL-HD; Tue, 02 Sep 2025 09:11: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 1utQnS-0000w9-Ji for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:39 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQnL-0004Xw-1D for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:38 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-45b9c35bc0aso3448255e9.2 for ; Tue, 02 Sep 2025 06:11:27 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b7e7fec07sm193103085e9.10.2025.09.02.06.11.21 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:11:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818683; x=1757423483; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Ffy782YI9rbL70UmV1deEFYCAKelshR+/2GjIPy8X8Q=; b=pmFaowSgEqZZAy50P3iPSXsxMnEsrZSNJBZjNcCw3HZwUhDHBVDtYTLkRS1X2Hc4B0 XuMh5zwa/tqBPuzar2kdTOmm+sbaforY7n5DYJ9gkZv5/PzupREQe/J/CBxtd7AVbCQv YX07FYhSHCyapj4onWDX0U0p+KcvVD589NwRXLcFzLfIQIwWZTgn5CpqjHRey63M0CzW rThahVyJFtHWQO1zZDzxSIUl0BWI8gj++2fB7jsjJupJn16oC3cjsk/1neLKuDzs8IRA KvfVDB+GXNvlZk4Iv4iIMHk7MSjuWo+Ms/WLTmUIktg8MQ5XWCDzCLgC3d5rI7zz1MQG 9BzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818683; x=1757423483; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ffy782YI9rbL70UmV1deEFYCAKelshR+/2GjIPy8X8Q=; b=iiCAVIqe38BRgindzAxpLrPKbe2WTYCKkzXPLCOLXau9ASoYlia/P6Ne0qSWiJ5hZA 4RUHVahclINEjeOPUszpdnaAMSkm32agCIBw1q/F/1GkvsZUO/DBDgSyj92bxgETYYuJ t3BbpRg0vfKnoMX3GE0IUjPgDYztnKqWQX58sgqR0vAyodDSKLEoWi9gE3bev1lokPB5 HpFQ53Yp0upBYvSjI8RR4yIsF93NDGPDQWVpVSR/wWOBhcw3zK/1NLAbSzHFwl8iQR4K FVvbrwxyZkxWFCPoGs0jJ3VF4C3F6LK1W6Ue0ucc56/cRGFk91cuTR0wx1DN6drvewDh NTiQ== X-Gm-Message-State: AOJu0Yxz7yGplaOc7a3c13pwdrMSNiVcFJKBHep6VOqhbn95AZZ1JhwF zzvSycVj0WZmqyETqjaJnnOzSN10ZRmUZtr/bsd3P22g/UwkCME1b/JDUjUXBft9y6MKttpEi9T LICin X-Gm-Gg: ASbGnctDy9bzeNFq9PHptka+LNqf0ssS2i7/lttycsW6kjxMrMUNsIhRbhzRGjNUpVF JUbvWB9k3agHi/65FkIoY5ZhIsK6vDMZQiWA1a3y9VbyKYPjDO9ZKFPzcvb27s8LmsjPb9SzS90 J+OhQGI2dXACiHr7aUIzYMLFRmP9D0AXF5RVgLrNFrpBx16csGHqSEnC7vQzuTkqC7wviECtu0z /F9ugZ2euxcngeDDdHFloEDS1nGBnqEUJp75P8CPKnQ9YoVEBGhcvZnvpellKbWnYEBIBv2ac9F wNdZCSZO++VLMhrQ3RjnmKSLBgqUZYCBKO0+erXwaXUFrCF8HNcvx/DjE/IB/ejpb9JAvzWX5iR zPRMPOwufrTwyAJJYljD8V/flefLQUHqytEJlLaMbjP4S9RZ0gk6XY1XDnDMj0gMVvNlxFfAeQk wf0w8v3xBjIcBskRhC2Q== X-Google-Smtp-Source: AGHT+IGie+8qYrr46iOMFvLWII6ZPPL4DiSQ64IT2RKSkgVeNuurS1qTH440zo9+99cohtd6oOV5RQ== X-Received: by 2002:a05:600c:3115:b0:45b:81b4:1917 with SMTP id 5b1f17b1804b1-45b8555c359mr97915305e9.10.1756818682763; Tue, 02 Sep 2025 06:11:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 14/39] hw/ssi: Document ssi_transfer() method Date: Tue, 2 Sep 2025 15:09:51 +0200 Message-ID: <20250902131016.84968-15-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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, T_SPF_TEMPERROR=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: 1756818797246116600 A SPI transaction consists of shifting bit in sync with the CLK line, writing on the MOSI (output) line / and reading MISO (input) line. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Gustavo Romero Reviewed-by: Alex Benn=C3=A9e --- include/hw/ssi/ssi.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/hw/ssi/ssi.h b/include/hw/ssi/ssi.h index 3cdcbd53904..2ad8033d8f5 100644 --- a/include/hw/ssi/ssi.h +++ b/include/hw/ssi/ssi.h @@ -38,6 +38,7 @@ struct SSIPeripheralClass { =20 /* if you have standard or no CS behaviour, just override transfer. * This is called when the device cs is active (true by default). + * See ssi_transfer(). */ uint32_t (*transfer)(SSIPeripheral *dev, uint32_t val); /* called when the CS line changes. Optional, devices only need to imp= lement @@ -52,6 +53,7 @@ struct SSIPeripheralClass { * of the CS behaviour at the device level. transfer, set_cs, and * cs_polarity are unused if this is overwritten. Transfer_raw will * always be called for the device for every txrx access to the parent= bus + * See ssi_transfer(). */ uint32_t (*transfer_raw)(SSIPeripheral *dev, uint32_t val); }; @@ -110,6 +112,18 @@ bool ssi_realize_and_unref(DeviceState *dev, SSIBus *b= us, Error **errp); /* Master interface. */ SSIBus *ssi_create_bus(DeviceState *parent, const char *name); =20 +/** + * Transfer a word on a SSI bus + * @bus: SSI bus + * @val: word to transmit + * + * At the same time, read a word and write the @val one on the SSI bus. + * + * SSI words might vary between 8 and 32 bits. The same number of bits + * written is received. + * + * Return: word value received + */ uint32_t ssi_transfer(SSIBus *bus, uint32_t val); =20 DeviceState *ssi_get_cs(SSIBus *bus, uint8_t cs_index); --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818902; cv=none; d=zohomail.com; s=zohoarc; b=cKdZ1hE6VYQIfSXkQ7Lm7R/3zs59N/GPlOvZtT78wJpGmlXzwjJ3CoxQ11zsUvTkX+XzvR9w4+Gr/5khvHDIgiaT4iUTsvycnrMaQpeArKGzvHfKBsj7zyNf8rNfQjmo34kLfGnm9JBW1kxSEF7Rqv1rJANB9owCEllHePgh0l4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818902; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=kGjnx8sa3UdmOsmMC3wulSKg+FS359C3SZlRz5oWwLk=; b=AN4yON4MDW+X4xbXUPBKk8nX8+oIOFIBvuEAgItuGJkvRSpdw02JwKUO8Pv/lRHPel53Xi1wLQmFrrWX5tam4luiI93rmGlxVVAccS0UGcCnN2mrGOwSK+JMQR8XZ/HsTT2BmruXk8OlwuVh7zzIRcGEDyRnVfqTMugVbEUrql0= 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 1756818902941171.77921002086487; Tue, 2 Sep 2025 06:15:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQnn-0001e0-8E; Tue, 02 Sep 2025 09:11:59 -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 1utQnS-0000w6-Hm for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:39 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQnO-0004YD-Ie for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:37 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-45b7c56a987so17023685e9.1 for ; Tue, 02 Sep 2025 06:11:31 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b87abc740sm131778315e9.7.2025.09.02.06.11.26 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:11:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818687; x=1757423487; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=kGjnx8sa3UdmOsmMC3wulSKg+FS359C3SZlRz5oWwLk=; b=SouBM6u30/Pf1ne1Q8CrPhE8ywQ3r34Sp1V8ffx3nn1lWp2BShza1P4xNkQgkS51Zj 3RX4TSh3iSlnLCavxQ2mh0CCSe9jI20/bItXpgjoJ4HgwxnZ4fxfaQZ+twjuMY7AZF5U JHkXvisIwt4cMbjeLtJUW23IlBVLfeE5159gKEi6HhbFA5omd2zdKsuAt0qs6+LrTE2q A827Rx4Zn6WTNKup2w19tNXCd9jWhEZITRc7nM1hm+EzoxK3fvrguMTN1tuqY7kkykxf VO0VhdHLMz2ow9fQDB9vd6Qx09MBNgQ2OCXX3+4KeRSQXhlc2zbcnDI/aiJ5hDg1Ykrx vyUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818687; x=1757423487; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kGjnx8sa3UdmOsmMC3wulSKg+FS359C3SZlRz5oWwLk=; b=wJjKuDu9RFoZUjsyOjnlS5ki5YUTEO0Bp8tkLUGZpONQGbctUCLwlBoSTktza6sWD9 rw5ICWvljqZhNAFVQZc+fORaaXFUgKfnTAf1++4MITb2VsE/3mbDtOuhddcBJM54ieGQ yfSHJKKsUKoe01VwCIEi1X+JV2GKHNS7XMgC650w57REdnW+yNNkZjYL9loCubZilrNC drTn1H8CzMGh9sBDk4zG/a0US26qPjE4oEBKUaAzC8hKGrD5txSip9lebQoEzPhPz7Pm d624mG/ZXll1Go8Osvz8lKrT99bXybpLvozbmaJD9VMHFQcMAkbutXId3VKGlyYuJV6l 2ogg== X-Gm-Message-State: AOJu0YzfiK6mmriAdXln18jOh1ELnFoQ+JpymKCg7/evNdOXr7JOpd39 MQmxVU7d+meGzxZa4lMJ4q1XO35gJo9O2+LSxLmaw29WJDvcW72ll+AXpfNYUCXb1TkO4hJWUlB W0WCk X-Gm-Gg: ASbGnculpuMwe5OevFKixP3tOewYr5RWLmpivFD+vsue1R3z4ijKv4R1iRDAxpixfCB 0fIBj3OuXDdBpuzLHLLs8bv/SC2QXpAAcC3DBINvaFOMZsjKQH3L1bTrxlxvm6McBxav29qTl12 6MCIOoChtpk4CEsacZSawvw75dpK7DMAqnpooKwYM2QE3EESJJvo8yv9OQQKOiaT/7eaVqdK0Xa H3Sy98+OanNxVkupgUDLG/FuUc7p2RTJ38da3GCBiZt+gu9A0q8khbFHBHJD1s+yqNrIEDEQ+zA Z3H33WNPCXIBlLvrEIxp8eXmG6eBp0mPr+xq7zXZ0Uhlmt7zDdfvK2QKq12H3tCe6JCxwcL4A6Y q5Vrf97GnzeGYYvZ3YmHzfmOOTRmLT82W7HRRE1+I9vo3X6o2LL8STmJHHEIQD09U/QWUaSzqhf dlyjTKq3mUdgE80tj5dA== X-Google-Smtp-Source: AGHT+IGiN00Bd9Ei5ZwOe2F1UfbtRhm/C1Yw/ekp3qZveCcvRQH1UDLJ4dljFidO4SJai5eRJEPKQA== X-Received: by 2002:a05:600c:1d1f:b0:45b:8f11:8e00 with SMTP id 5b1f17b1804b1-45c055e1774mr3716675e9.37.1756818687350; Tue, 02 Sep 2025 06:11:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 15/39] elf: Add EF_MIPS_ARCH_ASE definitions Date: Tue, 2 Sep 2025 15:09:52 +0200 Message-ID: <20250902131016.84968-16-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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 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: 1756818904658116600 Include MIPS ASE ELF definitions from binutils: https://sourceware.org/git/?p=3Dbinutils-gdb.git;a=3Dblob;f=3Dinclude/elf/m= ips.h;h=3D4fc190f404d828ded84e621bfcece5fa9f9c23c8;hb=3DHEAD#l210 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20250814070650.78657-2-philmd@linaro.org> --- include/elf.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/elf.h b/include/elf.h index e7259ec366f..bbfac055de4 100644 --- a/include/elf.h +++ b/include/elf.h @@ -56,6 +56,13 @@ typedef int64_t Elf64_Sxword; #define EF_MIPS_ARCH_32R6 0x90000000 /* MIPS32r6 code. */ #define EF_MIPS_ARCH_64R6 0xa0000000 /* MIPS64r6 code. */ =20 +/* MIPS Architectural Extensions. */ +#define EF_MIPS_ARCH_ASE 0x0f000000 + +#define EF_MIPS_ARCH_ASE_MICROMIPS 0x02000000 +#define EF_MIPS_ARCH_ASE_M16 0x04000000 +#define EF_MIPS_ARCH_ASE_MDMX 0x08000000 + /* The ABI of a file. */ #define EF_MIPS_ABI_O32 0x00001000 /* O32 ABI. */ #define EF_MIPS_ABI_O64 0x00002000 /* O32 extended for 64 bit. = */ --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756819018; cv=none; d=zohomail.com; s=zohoarc; b=JV/biO5gYoQb+qyGojIhpNcXUqwzxkWNjB/UlUxdbOEO00clfWoyotJrSpjnjpU1QoNIIdhkq021TaN/FDJKLUkfzt+YK2/J1S/rbzX7juxbJ5XVP0l9k5PD5Mx6ecFYj3gq6O/WRxVGwZgnv4upzErV1aCMTltaZSDn2sOGG/o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756819018; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=x1UdQPyDFb8iGOnyNpIrVOFPur9SX4XEImJiKpCsTc8=; b=fjyff/yV6BJeWyEUnN30cDoihvE4tE5CPXGT0ceUyrraY4+WHry4Tudcys4G0dN6cag0zL6WvU7uMzoOaqImlQpgxsYpXMhmETq97fpMSAYnMk+/lpcUizeXKahpSEHQZiDMDzwX5vM3uLHros/2ds2Sfvm5KyEpf9GBvo2KcXY= 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 1756819018896570.1278889948803; Tue, 2 Sep 2025 06:16:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQnm-0001Z9-FZ; Tue, 02 Sep 2025 09:11:58 -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 1utQnX-0000ye-Qx for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:47 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQnP-0004Yc-WB for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:43 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-45b8b02dd14so14158145e9.1 for ; Tue, 02 Sep 2025 06:11:34 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3cf275d2717sm19670467f8f.15.2025.09.02.06.11.31 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:11:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818692; x=1757423492; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=x1UdQPyDFb8iGOnyNpIrVOFPur9SX4XEImJiKpCsTc8=; b=bCVfH3QZN0WF5x34IuLU4xsjD1aeMkCgV9VwpShzzogEEqWGu0OShxWxNbG6KZCtpF nNShd47ZczgxjWrPDksxSkWqvTIZb8hWpSlowTTieA7r4ifIkJfGgfwDsJnfY4FbaXKm iumce04C4iWl4IbbR0Wv1FJsRnqjB5QDXnRsMqMBbe0pnPXwqYU2EnJcS/FLb6YBD/yo ksk+SAOBl4BfLEg+x/M3kHHt9Wr9IkMfvm+AcGh0OZaJjxnxIF880DLJEtF9QokJn4s7 DWJlquTbnBzhc8RXGZdXBAbwMbbEK3hTat7cY+W+8O6KdytPrQ+KThTlO8WBpvTyiskb zntQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818692; x=1757423492; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x1UdQPyDFb8iGOnyNpIrVOFPur9SX4XEImJiKpCsTc8=; b=d+9v71motjgkxOCzXRU2Aa1No2d+IIjdFkUfwjqyW00vEOm2pI1rR0iahNV0aHUIOX 2BqZ6RWw7mf61djkUrC3E/k8G6EQqSnXtViSZztTQlLgnl5xi0HNQe4oYwmiUCHUVqbz FmR+nnppk+il+l4PVAthzFhjRCICtkXvsCzr+JDShc2fvDhd5iBzr5Zsq8acYpsAfJY2 pa72HRc0aHi+HnNH69Th4fT9YHo0Obr7JbWpjsB3kZdCsShJJt4qB3ZNN9Fezq7Cxf0V iXn1vk+tYQGlAdc8+IHmaMCSm5Ve3g8ykqEZJkGIwyJgmLpWHVKTDolOh7ktv7x4C9Us y/qA== X-Gm-Message-State: AOJu0YwqG8+eIpojRrKUfocCiBbbCg2ngC6mKaHe8jjiBdPP4dDYe599 iafAtO8cpBRz6oPcpdr0Scyitk7xT7GTSQKKCu98o0QzfzVzsr3t8uXuK4eYbQSJCo4lcPWXI2e YzEJp X-Gm-Gg: ASbGnct24DHhUYykuoKNml2nGsK03hNt3IscObflXy1fhpmGpOTP4CDKbo3qIxG2Q4J csIoMt7NQuK0nj9IaDX1qmTK3QhyoRnhNh7R5rqGAAxSbe07ceeJbJkU6/HpjGCuSlR1R6JsyWW JVPfy2fqeje6gSRik0ZDEOnJeSAjTUUOMgePqmxJjjiLHCg0RxVf92Rt/eDxzlqq+ekjJ4jisa8 EIiC6ACsXVWcyVxx1iBJbRJi8aQmJ3x41kgEEyC4NOURtsa9nX4d0wr9ggjeozmcTdVXyu1vMV6 NUIrgOJwlZteRiDANCBYZnVX3oz498snwUj0rE+2R57T9iUbPyj6IlpqcuJ+OpIkxuNxMD6cTQD qNECjukAWlsK5TfwokEUE574MgWCXTDngMhG6GJoQmkdSpk9pi5X1or/DAM1NeK+E2AdyHwBA X-Google-Smtp-Source: AGHT+IHlxuwAvZe2wq7WHO3yuyk1GupusewJ6fomccX2Pa/by4mT/HfjL0YuBNePAgQ6fDuM81gzBw== X-Received: by 2002:a05:600c:4513:b0:45b:7eb4:cee4 with SMTP id 5b1f17b1804b1-45b8557b769mr83420205e9.32.1756818691900; Tue, 02 Sep 2025 06:11:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 16/39] linux-user/mips: Select 74Kf CPU to run MIPS16e binaries Date: Tue, 2 Sep 2025 15:09:53 +0200 Message-ID: <20250902131016.84968-17-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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, T_SPF_TEMPERROR=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: 1756819019937116600 The 74Kf is our latest CPU supporting MIPS16e ASE. Note, currently QEMU doesn't have 64-bit CPU supporting MIPS16e ASE. Cc: qemu-stable@nongnu.org Fixes: 6ea219d0196..d19954f46df ("target-mips: MIPS16 support") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3054 Reported-by: Justin Applegate Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20250814070650.78657-3-philmd@linaro.org> --- linux-user/mips/elfload.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/linux-user/mips/elfload.c b/linux-user/mips/elfload.c index e0c50f50ed2..6f1880befcf 100644 --- a/linux-user/mips/elfload.c +++ b/linux-user/mips/elfload.c @@ -37,6 +37,9 @@ const char *get_elf_cpu_model(uint32_t eflags) if ((eflags & EF_MIPS_ARCH) =3D=3D EF_MIPS_ARCH_32R6) { return "mips32r6-generic"; } + if ((eflags & EF_MIPS_ARCH_ASE) =3D=3D EF_MIPS_ARCH_ASE_M16) { + return "74Kf"; + } if (eflags & EF_MIPS_NAN2008) { return "P5600"; } --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818812; cv=none; d=zohomail.com; s=zohoarc; b=lmor6ier1fGqnPcBIbt9N87F4VPzhlec/UITrsjpm61M0Nqm1q1qYlVR+Wh3fY8dcpSH1aLXKVQb9DRxZTilxa6psBxmNde+o7Z3adJIsTxgQfeOTQECCGTjVYerC+m5L9Y8E+1JKi8BUVL+5W4Im9j7oBKgTPl2WDl+DqfD/NI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818812; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=evqzluOcCtsmXOY5TmZDpJ3IXmsif43fvvVs3oQU2Ns=; b=FUYUGPsKsM1OPDkU3bZSoUKohgwNPi9mKzIXjY9LT1gMG648Djpv5N3bb0U/zeCE2axWjL5kJ1xlb01wMM16vjvgofNFyzEoeQyOvluYH7G1w+pJyI7Hh38TWDia3i8zc60JLg27wsOI8FtC3pHYIZxLMc9ARfn0ky3kwBDriRw= 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 1756818812158199.35643627457364; Tue, 2 Sep 2025 06:13:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQnn-0001i9-PW; Tue, 02 Sep 2025 09:12:01 -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 1utQnb-00014Q-4u for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:49 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQnX-0004ZB-Ov for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:46 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3d17731ac0fso3099155f8f.0 for ; Tue, 02 Sep 2025 06:11:38 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3cf33fbb3cdsm3379500f8f.51.2025.09.02.06.11.35 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:11:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818697; x=1757423497; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=evqzluOcCtsmXOY5TmZDpJ3IXmsif43fvvVs3oQU2Ns=; b=TsGlSqwA0aNDkJA3FUz+45VXBBm+9ICSnKr2Xm9/vjZhY/DoQyo/UQFWpgLI23NGCR 5RuvPLzSziXSJjBQu3tCniXi/7eIexdk+0sQSUpzRtOwbexgR2mH6SLApDnjf5K055UQ EkGlTX+fPjusv5aEXnRUBGqoKF8y9KUgVzOANukqp6RbMSyeP9GPp9J2sGSixyRsBzOe iGeKml2C1K5G9RkDMUcG1N+4LtRzeHBEdxLLJjBsIXUcPC7Er5nJru7KP9GUXGwNLbOR 3iTqRBaB2esPq4e9ktabvnwN3MIowbs7NdOjTaUlKfl0vTblDN8/Q2sepUr7/elfcEfN +hYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818697; x=1757423497; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=evqzluOcCtsmXOY5TmZDpJ3IXmsif43fvvVs3oQU2Ns=; b=wwA7vgidBtgrPn/PbbU4YWGxvWfD2OHpm+UIo5v0W2rTEPa+KXYlLjWrpdH/XYg1Y0 t9jkbe3nzt902m2EPF54r6jyefs/Ji5RrXcA1D45poNkVzCzT8h4UJq4PCWzv36IfLh7 NBWXkN7ym3gcHAFW2fMIhp+z5T6fEUdnT3XzjEecuWYsg/vYywnBg+sv/JxlsKi07sQi Y+EMcW0JIIV2vWqyER/emw2ubU/DnbY79FBE7FIjHBGdRJ/BujQvxX+7/uvesAtkoIve 58Ls83pd2xkt07s011yoSLvTnnkY10cfJEtIlQtXvZxPo6+lgzr/ltkWscz+YxVhrNpX Zr3Q== X-Gm-Message-State: AOJu0YyAFetLn3We2rXtr2DrQce7XoSv3PTCeK6EdMqU1SldOKmVZG5P rRzL9DybuPJq6Gw8fJ3Kri+e8eixUoN714Q2ksZ0qdaQ3u9D9c/qQRi8887kvE6LlbPpNr8Qn9O NKdNA X-Gm-Gg: ASbGncsqOESkV+9D+qnMziwOr5F7yuJWzJ8AbJU5eERNHJsymmKs6k10NLJF/b/Uo7V NGGNmXcCvaTF0PDyPbSbj6tS5IZ/kJPD9iBt3n4QdhvK5LpjRLZroeL+/6wfmu0GXBAoWV66caB CMemaW/b5SeoEclJQ0Rbxd1YQZ+tjtFyfdegrnj7yqkm4gGcdSwjQRlIzQmjdyrI7dvVNAdu9EO Vs9b5YfVAwFOzzjR5XXmUsck1ZIQRc7lhVNEbJ5xKSTRCzKajQU+I0gP+B0HO5JwKdWPUjkLLfb Fm7LSy9gwIhNwib8lwFtpEcO4+i3WJCrBBNM+ZU8+RSYuMD6j09S0ILMTj0myaGgH0nPZr+VBvZ dQQhViZm7Qj+19aDgt4X1BnE+ABc6nqYzR7topBwj9Qd1OrwejOcSsR4zjvO9a2GGSNlTiNhi+y BdvfdIEOM= X-Google-Smtp-Source: AGHT+IGUJo5I3kKjgFKas4KrsIDBmmrQ6GeCkU3KhUtRz+obYaGzQn3yVl8PiiThHB7C+vntMtaJWw== X-Received: by 2002:a05:6000:2387:b0:3cd:cf31:d77b with SMTP id ffacd0b85a97d-3d1dfcfb96fmr7765592f8f.37.1756818696564; Tue, 02 Sep 2025 06:11:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 17/39] linux-user/mips: Select M14Kc CPU to run microMIPS binaries Date: Tue, 2 Sep 2025 15:09:54 +0200 Message-ID: <20250902131016.84968-18-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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 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: 1756818813268116600 The M14Kc is our latest CPU supporting the microMIPS ASE. Note, currently QEMU doesn't have 64-bit CPU supporting microMIPS ASE. Cc: qemu-stable@nongnu.org Fixes: 3c824109da0 ("target-mips: microMIPS ASE support") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3054 Reported-by: Justin Applegate Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20250814070650.78657-4-philmd@linaro.org> --- linux-user/mips/elfload.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/linux-user/mips/elfload.c b/linux-user/mips/elfload.c index 6f1880befcf..cc5bbf05ab2 100644 --- a/linux-user/mips/elfload.c +++ b/linux-user/mips/elfload.c @@ -37,6 +37,9 @@ const char *get_elf_cpu_model(uint32_t eflags) if ((eflags & EF_MIPS_ARCH) =3D=3D EF_MIPS_ARCH_32R6) { return "mips32r6-generic"; } + if ((eflags & EF_MIPS_ARCH_ASE) =3D=3D EF_MIPS_ARCH_ASE_MICROMIPS) { + return "M14Kc"; + } if ((eflags & EF_MIPS_ARCH_ASE) =3D=3D EF_MIPS_ARCH_ASE_M16) { return "74Kf"; } --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818886; cv=none; d=zohomail.com; s=zohoarc; b=cxQINoAzJVkH05UTpQLhM3ERvSmpIXbZGyhqch6ZUNcWNI+Mee4kAnyAt8tzCbpP0OvAlM2P/pOSGZglx4PhMkdCjFuVroIpv1gI9ZQF4F9p7Oh6z6x75XAvYUjVxj2tKHEXhMASdm4zNjHFwWrwG/rteQQ81fZu9CQ9RxnV0I4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818886; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=klJLauKcTBQRkj6rhNvhA6dvevN6/JOhKIhhGyaIW80=; b=ApoKupouuozi3btR+WW3QVsMOred3vE50jphaJjhGli9F8ufP6EnDXg3+elYFnmcp1QMfOEFutYJ9w6e0QMCDR1C2O/afZnfMplWgg0pqcG2zO1xlS4x2nVS17pg6/YRPQ00ZxJBZMvhsbIrpxGnL43dxjCeA3dTTF/p/iCca1Q= 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 1756818886161453.5617851246818; Tue, 2 Sep 2025 06:14:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQno-0001nD-Rq; Tue, 02 Sep 2025 09:12:00 -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 1utQng-0001Al-Ss for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:53 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQnZ-0004Zn-OF for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:51 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3dae49b117bso536338f8f.1 for ; Tue, 02 Sep 2025 06:11:44 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3d0f85c287fsm17751634f8f.52.2025.09.02.06.11.40 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:11:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818701; x=1757423501; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=klJLauKcTBQRkj6rhNvhA6dvevN6/JOhKIhhGyaIW80=; b=fyEEtnK3UMBbT2u1ttTBGxMTvP/3XHACFjH594eHNUQRIihiCZy081plDkTHKIXmUm lQr7/0srZ+asbqjgywA5ynYRe+2mDkrUXSXPC7N3WkdSNMTRqDOOUHRg+bTr2ho0fitW dpzqAnLRdJNXu8xyPCH5HN4h2tjr2oFBu9SYowoTe51uNKqOVmBZIrqgee8796qJXAFa rgwivRGRNdA5Jt3m3XWzXPuaFQ4/97kNiCGp5yCh5QjRsJr6WR93s/aO9bg30ejZX/ZN zp/Q372jpxBtVAC+AJuJtJ6KWh4/3zaFnvmjsrONDgTn6DJGEhe4hN/y7MsVVBC5Y4aF HuHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818701; x=1757423501; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=klJLauKcTBQRkj6rhNvhA6dvevN6/JOhKIhhGyaIW80=; b=jusp/sF8ox8WKL+h49m2mYMHzjTORQg+QtuIoOreA1UT9vzUnKlqLoeuOkIRrMH/ui 5ROMxK3rbt+9eBpjlKpcXiIKmUf/coNwTdirV1DfMLaBdud/szGdq/Sn8wjkzYGoshID DE3Lfkf63d/GHkQM/L6ep8hhyyAIYkR9nFWSDDvGG+nCPr7ZY9nTD7y4k8IHJnVPM4LP FFokTDSLCCnyyDopyrrQMDxDOBWA6I4xiWSRnR4sauSBlZpmo0k2TBV1EsPs2yVOG4ov xyUfHS0yaYckJ+2aJM1EyNYVcZkJDjz8Mm/SbKJ4u7U9No79uB7ozrTn9HLP/L66T73B ykdA== X-Gm-Message-State: AOJu0Yz6YHOAIPElsvZqozfnbSbNimfIUAAYPzTALxuXAPLcapBnh3+t l1xuREp44BLqFB12BH4pkY+HWwyodceFYRSrl49+W91p87oGdYRuNFNLIeX41ZJFj14CdX/tgFo GGQVh X-Gm-Gg: ASbGnctOtROvCEx1ju5Dt3mdX7Qvr/3EFu+odhwa8dBkh3ggTJOrthWiTJKIuRhJWVE fM8VAnZ32omg6y2c5rKyhHDZjQcrZwTIUbKDYBwi60cfQK+V+8o+Fiu36QMqRvKq5jUezt9WNVC Edi63+HnrceIUkUKrwNNO2ycjwoTxLnSD4jZRl3eAbOzmHW+Q59aCCHnK2VtPeAZ95gM+BAu4d3 Q5G40VchaIcgWn9tWRlAcS9pL5d1DjZlJL1cpE4rGKor+L5C3HzQitm6pXjM9hTnG3rFbLmsjEU /xz3fUs1lz9y3A/2t34yRBg1DFJs4QougPHrbKYcoVUwc3SdrbJWGn9Jo5//+cqd9FIayMaYcpV 0CTaxGtxG8DY3XOldWTgWThuUa35o0uXK+Or0GunC5Id28YhcOazpcewEbYzED0Me4DjJFuOdAA rYBliQaf0= X-Google-Smtp-Source: AGHT+IGu1SVSuUut4oxN/MiQNLZh2+ig7pA7fvoad0M5PGCC5UH3u1BWLxazjTaXQC6K9FLtAX5riA== X-Received: by 2002:a05:6000:18a8:b0:3d9:9347:b2f9 with SMTP id ffacd0b85a97d-3d99347bb3fmr3059103f8f.34.1756818701245; Tue, 02 Sep 2025 06:11:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 18/39] target/mips: fix TLB huge page check to use 64-bit shift Date: Tue, 2 Sep 2025 15:09:55 +0200 Message-ID: <20250902131016.84968-19-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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 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: 1756818888417116600 From: Denis Rastyogin Use extract64(entry, psn, 1) instead of (entry & (1 << psn)) to avoid undefined behavior for shifts by 32=E2=80=9363 and to make bit extraction i= ntent explicit. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Denis Rastyogin Message-ID: <20250814104914.13101-1-gerben@altlinux.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/tcg/system/tlb_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/mips/tcg/system/tlb_helper.c b/target/mips/tcg/system/t= lb_helper.c index eccaf3624cb..1e8901556d6 100644 --- a/target/mips/tcg/system/tlb_helper.c +++ b/target/mips/tcg/system/tlb_helper.c @@ -652,7 +652,7 @@ static int walk_directory(CPUMIPSState *env, uint64_t *= vaddr, return 0; } =20 - if ((entry & (1 << psn)) && hugepg) { + if (extract64(entry, psn, 1) && hugepg) { *huge_page =3D true; *hgpg_directory_hit =3D true; entry =3D get_tlb_entry_layout(env, entry, leaf_mop, pf_ptew); --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756819208; cv=none; d=zohomail.com; s=zohoarc; b=BF0iaCO0j/lgpqsz0skbQ9iLIuDw2nNcHsvzAtQmvDZDc1D+4qj2/BzIP3DaLdfT/ddbJfjXa8M5DT2nsqmuTSUyy7uy6HYbPVieh5HAdD0a8WB5y6T3/RyOPEBEI/zTYkasJl9vyEtxWDryF9n/ItPduqsKiU1qkzQzMOAaOjg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756819208; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=o+jLO/3nb8aNGzAALSlOJPeY6QIm6fDGV5/Q+uhwhJY=; b=YSN8OO9aRsNQfQ4+EVquXqOOzbfXESbAR88lpHRqbBg0s86JqCwFmzOFGrJJUEIoEZtKlpI/oLT8QCfkVFonCU20JyT0gIk72BnNE96k0AzRxhSQ/tikqiLcHrpf3+QJOMshURPFo6yrKMaO4+n1QsgbrXaT8bl6XAZS07D/YE8= 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 175681920879986.34160686062614; Tue, 2 Sep 2025 06:20:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQns-0001yF-CI; Tue, 02 Sep 2025 09:12:04 -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 1utQnj-0001Nx-Q6 for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:55 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQnf-0004aS-Lw for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:55 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3da4c14a5f9so416070f8f.0 for ; Tue, 02 Sep 2025 06:11:48 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3cf34491a5asm19367334f8f.55.2025.09.02.06.11.45 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:11:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818706; x=1757423506; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=o+jLO/3nb8aNGzAALSlOJPeY6QIm6fDGV5/Q+uhwhJY=; b=E8J6kRT/zfOPJYldyRnrSQvDOjp+hVCLIiBWMEVFR44bDwgpqhGLUdrEN8WPpBCtAL 50bl/BOhS/gjE2RzhbBAcTEz9YiycS2Q4JB0QnTx3Xilxn+5LhDr9Yuw+p+1lqhGB9C4 A/tUMqplv67VFmCkOqPfASB1ZTora+tJssgBDY0XO5Td6jSvNVrejFYfl3sOmA4AD3Py q2To8OLMM0YJKlh8k3rN6yohlw9ZqLzgKAQ3crMNZXDvjqZyh1mQhwujE4KtJyujB4q4 9PGqJu2wOJb+sRnf+NQ+iq+RByqmLdJAiOcztR/z3w+Lh15r2DM9uEKWniwAMgZPd6et vw/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818706; x=1757423506; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=o+jLO/3nb8aNGzAALSlOJPeY6QIm6fDGV5/Q+uhwhJY=; b=s7+22fjrA3vS4E/Lv3u6utu0joLFfpI1r5pcdUGt3g6f8xbZeNlTer/nTn0biKxAkp VnPi6403AGSzOdzvRBeZAtUEwYDv2opRZx4qciqlcDz3BcoV1CxNWomzaB7ZXI6CbG2z vEF2Igwqgv9QrO0ODnqZ24f0TnxFO6TAeFMZ0SqTQvfQt6Qgmx19YzuqVJBvMlNvZqXy FvssrP38HfkIATftLR9kTcAfSQlrTbkcR04su4ELYepumTzgXzLPwNWMgWysPtlZmAjJ is2YglfPfONLLSxleb7hVlmBNgK5D99hok49Bl3uPStTjuRI46LDA4RZXE1qYOC6npe+ mMhA== X-Gm-Message-State: AOJu0Yx5orHY+N/oMjGx2GQ0vZyU6QXkYYNX5SaLiHCAcQUlyL+KIIDn 7U3DGQuojMgTfQUoJTbH5cWQklMUy4rGP+dbz6bVokgFtHhw8KkZWe1Of6yURNJJFJUBJwnv4mI q6JUZ X-Gm-Gg: ASbGncsY6OMs58aKsXGMYjwwP4DUPOoXqgyg3ZlZgtaJx5kt+AZtiZwSUVxGl4KpdOM ebS44HBHF1ogDcgqgY2n/as7jeRFp6MV1s6IlxLFDEWu4t/k7I3yasPy6tW/kV8NBmWyg6/zqnS TF+Nn8FklfafYANWGnMdjA4/5GSmuB9VrYQg9etHfLDS/sMJ1k2K/KU5pgof1gDZ4Rlo0PWk7mn MkA6l9p+YKhGOIVZWspO9rLd84h6NsJ1J3QIfEE3qCXxhtIuyMdxUA4j2ysGBJHQ51XB7/EVrEr 0oKacA7VCkKDPtDrz3hJC8VZ+2GcybtUA2Z65O+TXW/BS3ckNAFPF/f8tZuD27YS1KSu593kANC 3x8yBszu4Uuo62phercYRt+Nw3RZJGZHIUlEkudtz/q37Hnp8jYd0ME7M8Lgu12Ni8M3muB5m X-Google-Smtp-Source: AGHT+IEnd791XwRWyGuvmSYvq//9aPuv/ag6els0XgvtXAc+rU1ya6Xfaa3gOoas9ehRtwJtx6lUMg== X-Received: by 2002:a05:6000:2409:b0:3d6:4596:8a3a with SMTP id ffacd0b85a97d-3d645968c73mr4991116f8f.17.1756818705909; Tue, 02 Sep 2025 06:11:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 19/39] hw/ppc: Fix build error with CONFIG_POWERNV disabled Date: Tue, 2 Sep 2025 15:09:56 +0200 Message-ID: <20250902131016.84968-20-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.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 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: 1756819210105124100 From: Aditya Gupta Currently when CONFIG_POWERNV is not enabled, the build fails, such as with --without-default-devices: $ ./configure --without-default-devices $ make [281/283] Linking target qemu-system-ppc64 FAILED: qemu-system-ppc64 cc -m64 @qemu-system-ppc64.rsp /usr/bin/ld: libqemu-ppc64-softmmu.a.p/target_ppc_misc_helper.c.o: in f= unction `helper_load_sprd': .../target/ppc/misc_helper.c:335:(.text+0xcdc): undefined reference to = `pnv_chip_find_core' /usr/bin/ld: libqemu-ppc64-softmmu.a.p/target_ppc_misc_helper.c.o: in f= unction `helper_store_sprd': .../target/ppc/misc_helper.c:375:(.text+0xdf4): undefined reference to = `pnv_chip_find_core' collect2: error: ld returned 1 exit status ... This is since target/ppc/misc_helper.c references PowerNV specific 'pnv_chip_find_core' call. Split the PowerNV specific SPRD code out of the generic PowerPC code, by moving the SPRD code to pnv.c Fixes: 9808ce6d5cb ("target/ppc: Big-core scratch register fix") Cc: Philippe Mathieu-Daud=C3=A9 Reported-by: Thomas Huth Suggested-by: C=C3=A9dric Le Goater Signed-off-by: Aditya Gupta Acked-by: C=C3=A9dric Le Goater Message-ID: <20250820122516.949766-2-adityag@linux.ibm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/ppc/cpu.h | 4 ++ hw/ppc/pnv.c | 86 ++++++++++++++++++++++++++++++++++++++++ target/ppc/misc_helper.c | 59 +++------------------------ 3 files changed, 96 insertions(+), 53 deletions(-) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 6b90543811f..0e26e4343de 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1522,6 +1522,10 @@ struct PowerPCCPUClass { void (*init_proc)(CPUPPCState *env); int (*check_pow)(CPUPPCState *env); int (*check_attn)(CPUPPCState *env); + + /* Handlers to be set by the machine initialising the chips */ + uint64_t (*load_sprd)(CPUPPCState *env); + void (*store_sprd)(CPUPPCState *env, uint64_t val); }; =20 static inline bool ppc_cpu_core_single_threaded(CPUState *cs) diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index d84c9067edb..9c74f46091a 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -21,6 +21,7 @@ =20 #include "qemu/osdep.h" #include "qemu/datadir.h" +#include "qemu/log.h" #include "qemu/units.h" #include "qemu/cutils.h" #include "qapi/error.h" @@ -1794,12 +1795,83 @@ static void pnv_chip_power9_pec_realize(PnvChip *ch= ip, Error **errp) } } =20 +static uint64_t pnv_handle_sprd_load(CPUPPCState *env) +{ + PowerPCCPU *cpu =3D env_archcpu(env); + PnvCore *pc =3D pnv_cpu_state(cpu)->pnv_core; + uint64_t sprc =3D env->spr[SPR_POWER_SPRC]; + + if (pc->big_core) { + pc =3D pnv_chip_find_core(pc->chip, CPU_CORE(pc)->core_id & ~0x1); + } + + switch (sprc & 0x3e0) { + case 0: /* SCRATCH0-3 */ + case 1: /* SCRATCH4-7 */ + return pc->scratch[(sprc >> 3) & 0x7]; + + case 0x1e0: /* core thread state */ + if (env->excp_model =3D=3D POWERPC_EXCP_POWER9) { + /* + * Only implement for POWER9 because skiboot uses it to check + * big-core mode. Other bits are unimplemented so we would + * prefer to get unimplemented message on POWER10 if it were + * used anywhere. + */ + if (pc->big_core) { + return PPC_BIT(63); + } else { + return 0; + } + } + /* fallthru */ + + default: + qemu_log_mask(LOG_UNIMP, "mfSPRD: Unimplemented SPRC:0x" + TARGET_FMT_lx"\n", sprc); + break; + } + return 0; +} + +static void pnv_handle_sprd_store(CPUPPCState *env, uint64_t val) +{ + PowerPCCPU *cpu =3D env_archcpu(env); + uint64_t sprc =3D env->spr[SPR_POWER_SPRC]; + PnvCore *pc =3D pnv_cpu_state(cpu)->pnv_core; + int nr; + + if (pc->big_core) { + pc =3D pnv_chip_find_core(pc->chip, CPU_CORE(pc)->core_id & ~0x1); + } + + switch (sprc & 0x3e0) { + case 0: /* SCRATCH0-3 */ + case 1: /* SCRATCH4-7 */ + /* + * Log stores to SCRATCH, because some firmware uses these for + * debugging and logging, but they would normally be read by the B= MC, + * which is not implemented in QEMU yet. This gives a way to get a= t the + * information. Could also dump these upon checkstop. + */ + nr =3D (sprc >> 3) & 0x7; + pc->scratch[nr] =3D val; + break; + default: + qemu_log_mask(LOG_UNIMP, "mtSPRD: Unimplemented SPRC:0x" + TARGET_FMT_lx"\n", sprc); + break; + } +} + static void pnv_chip_power9_realize(DeviceState *dev, Error **errp) { PnvChipClass *pcc =3D PNV_CHIP_GET_CLASS(dev); Pnv9Chip *chip9 =3D PNV9_CHIP(dev); PnvChip *chip =3D PNV_CHIP(dev); Pnv9Psi *psi9 =3D &chip9->psi; + PowerPCCPU *cpu; + PowerPCCPUClass *cpu_class; Error *local_err =3D NULL; int i; =20 @@ -1827,6 +1899,12 @@ static void pnv_chip_power9_realize(DeviceState *dev= , Error **errp) return; } =20 + /* Set handlers for Special registers, such as SPRD */ + cpu =3D chip->cores[0]->threads[0]; + cpu_class =3D POWERPC_CPU_GET_CLASS(cpu); + cpu_class->load_sprd =3D pnv_handle_sprd_load; + cpu_class->store_sprd =3D pnv_handle_sprd_store; + /* XIVE interrupt controller (POWER9) */ object_property_set_int(OBJECT(&chip9->xive), "ic-bar", PNV9_XIVE_IC_BASE(chip), &error_fatal); @@ -2078,6 +2156,8 @@ static void pnv_chip_power10_realize(DeviceState *dev= , Error **errp) PnvChipClass *pcc =3D PNV_CHIP_GET_CLASS(dev); PnvChip *chip =3D PNV_CHIP(dev); Pnv10Chip *chip10 =3D PNV10_CHIP(dev); + PowerPCCPU *cpu; + PowerPCCPUClass *cpu_class; Error *local_err =3D NULL; int i; =20 @@ -2105,6 +2185,12 @@ static void pnv_chip_power10_realize(DeviceState *de= v, Error **errp) return; } =20 + /* Set handlers for Special registers, such as SPRD */ + cpu =3D chip->cores[0]->threads[0]; + cpu_class =3D POWERPC_CPU_GET_CLASS(cpu); + cpu_class->load_sprd =3D pnv_handle_sprd_load; + cpu_class->store_sprd =3D pnv_handle_sprd_store; + /* XIVE2 interrupt controller (POWER10) */ object_property_set_int(OBJECT(&chip10->xive), "ic-bar", PNV10_XIVE2_IC_BASE(chip), &error_fatal); diff --git a/target/ppc/misc_helper.c b/target/ppc/misc_helper.c index e7d94625185..0e625cbb704 100644 --- a/target/ppc/misc_helper.c +++ b/target/ppc/misc_helper.c @@ -328,69 +328,22 @@ target_ulong helper_load_sprd(CPUPPCState *env) * accessed by powernv machines. */ PowerPCCPU *cpu =3D env_archcpu(env); - PnvCore *pc =3D pnv_cpu_state(cpu)->pnv_core; - target_ulong sprc =3D env->spr[SPR_POWER_SPRC]; + PowerPCCPUClass *pcc =3D POWERPC_CPU_GET_CLASS(cpu); =20 - if (pc->big_core) { - pc =3D pnv_chip_find_core(pc->chip, CPU_CORE(pc)->core_id & ~0x1); + if (pcc->load_sprd) { + return pcc->load_sprd(env); } =20 - switch (sprc & 0x3e0) { - case 0: /* SCRATCH0-3 */ - case 1: /* SCRATCH4-7 */ - return pc->scratch[(sprc >> 3) & 0x7]; - - case 0x1e0: /* core thread state */ - if (env->excp_model =3D=3D POWERPC_EXCP_POWER9) { - /* - * Only implement for POWER9 because skiboot uses it to check - * big-core mode. Other bits are unimplemented so we would - * prefer to get unimplemented message on POWER10 if it were - * used anywhere. - */ - if (pc->big_core) { - return PPC_BIT(63); - } else { - return 0; - } - } - /* fallthru */ - - default: - qemu_log_mask(LOG_UNIMP, "mfSPRD: Unimplemented SPRC:0x" - TARGET_FMT_lx"\n", sprc); - break; - } return 0; } =20 void helper_store_sprd(CPUPPCState *env, target_ulong val) { - target_ulong sprc =3D env->spr[SPR_POWER_SPRC]; PowerPCCPU *cpu =3D env_archcpu(env); - PnvCore *pc =3D pnv_cpu_state(cpu)->pnv_core; - int nr; + PowerPCCPUClass *pcc =3D POWERPC_CPU_GET_CLASS(cpu); =20 - if (pc->big_core) { - pc =3D pnv_chip_find_core(pc->chip, CPU_CORE(pc)->core_id & ~0x1); - } - - switch (sprc & 0x3e0) { - case 0: /* SCRATCH0-3 */ - case 1: /* SCRATCH4-7 */ - /* - * Log stores to SCRATCH, because some firmware uses these for - * debugging and logging, but they would normally be read by the B= MC, - * which is not implemented in QEMU yet. This gives a way to get a= t the - * information. Could also dump these upon checkstop. - */ - nr =3D (sprc >> 3) & 0x7; - pc->scratch[nr] =3D val; - break; - default: - qemu_log_mask(LOG_UNIMP, "mtSPRD: Unimplemented SPRC:0x" - TARGET_FMT_lx"\n", sprc); - break; + if (pcc->store_sprd) { + return pcc->store_sprd(env, val); } } =20 --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818806; cv=none; d=zohomail.com; s=zohoarc; b=JV9cQMYl4Y3J0UobyWZvHH1zpPsGigTYFcbPaUGAmdJESgtGefH188V/Y+eszn0eSI+1oCRWazWBrFOyjfgMIdJcLknHnB1xJtHRyVbg7fZNIQCJpWG29BobdgQ88Ujhq13VVPrHsnxhWN6qhEpRjVvcdKlOjtdNE0+m6u0yFkE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818806; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=cpUvSmRcSRgE9yxLQY3R1BhVSeS7VEdo2LGu+IwX/JY=; b=TbjGRnUQ/OKhPM3vG6OO54n5LJbnmG6ljliXMBmo5z4j4rEO5nOdOLecYuNtj04SPBh2yoh0DNmCQWwYbprAXfCGF5MRyKe5cJnG5p9/R/4Ui63E53A6+3IGnNnNUX9oK8stfsnNTU/v9DnJazs7/csEs/0OgNmBZFs3tLqXyfE= 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 175681880668766.36891129454773; Tue, 2 Sep 2025 06:13:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQnv-0002Lx-6i; Tue, 02 Sep 2025 09:12:07 -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 1utQnn-0001iL-SO for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:01 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQnk-0004b2-T8 for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:11:59 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3d0b6008a8bso2100950f8f.0 for ; Tue, 02 Sep 2025 06:11:53 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3d701622b92sm8361444f8f.58.2025.09.02.06.11.49 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:11:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818711; x=1757423511; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=cpUvSmRcSRgE9yxLQY3R1BhVSeS7VEdo2LGu+IwX/JY=; b=k1uu6FpzOy+TTF6my9vqYXe0kA/gPDk4+/Dq4xtrld+PJuRO63gYZXmkQiHj3jW4GD TAbVjAo1e2orzQem/GBsBrpFBTgyOk2PXeQl9Tx8r2TRHtPc6s1coX7o9U7s1qmz7BzM OjTXtPx8IQiFAgFp3jPpg8Me4lWZTuDSSQIloY6039hGSh/Q8P7GC0bmWnGSz2/upK3G ak6yMtbyNeMvFgp5N/Hgg3Fvly8gCr/sZZi/wEb8qBICyW3FctBnfsAoYbEHTp//nqxL /VyYBOPk7I9D1H+1A++NJXFt5Q3ykL4nA3lyis56zf0MrWa5q/FQ5YFE5fepLILena5b ebhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818711; x=1757423511; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cpUvSmRcSRgE9yxLQY3R1BhVSeS7VEdo2LGu+IwX/JY=; b=Lv43Mg9aCNCqi8YfcGN75G9NY/DaP1wTpMEM+55N5fIoLpNSxku5F3DNdWzflbOJ7c OSK5zEjhSc+oF6QqVVuAunvhPktcVNBx/SmxoGZDx9HxnJEC7pmVYWo5bbEaIjBv1Ks5 hYTYbbUu0z+qkpLFKlQ0iNN7aW8vuLx84qu9zXngYYpo+8qiDZ9PK3IPLXoiLZRuSnxI g9swQQJqrxHW/xpVaN3hQmdSmVw2twY6UsK7GYJgc/NoyH7k+x0q/k6xn6MGqnhi6382 reh+Pl3f8tLH8Sb3oPj++HLuXXlMoMpeMF1BXUJ+fBR35LPv9VL7ASbqoC/MpBu1k1IF roRA== X-Gm-Message-State: AOJu0YwXF8srk2FoQdBC23hy0jvNHcV/jGKj6o/6630YyL+DtL/aY4zY EH4wtGy7EQxhZLdvOuW+m9duV1F4iEEcwiTtLv6XHpYdfxvzgojqqfsYWneOCKgjMI7IPL/3wUs u9zQK X-Gm-Gg: ASbGncuGFZxWQ7M+rGvfTLJ9aOVtG9uOZpJPQkFG8fgnKnxJZnNm91neXz3iFYuT5/M 0ZSQZbY4OZ0Rtbo+G4BIJC7HYWoL+18nnBOj8OYiiDbqD/iCMsPcncxPXAon8p40Qj8zUAAnM/L gp5k24J0KOodn774HNEBOaNEKdD+39Ynoax5OCYPIxi4SpsrZIr6wly3SP2acMlbUP4+fbfmRuS WT1VIpvxZQAwnksZdikAJ7+ygoYerJyuq2fNxNlJCtid+YOCKiGSdxQZ0Mp8Ba483t3DydcTBBf bGEugExulTW56zbynP6VMg+qm8TbYvi5LcayPwUySMkkvel9mdBbePIH8WZlGy4iFA+BlmJq9/7 wGYwu63JdWmfxk8tMjAzze201nANwt7nhLPcGT5SvzpL64YhEwKLVTkJfpGaKEhds/waGjpjJVh H+35ZgwJA= X-Google-Smtp-Source: AGHT+IGtQRywtRb0g/EcSCim4s/f2fH8xbRQOIW21QrtFjZFEox15SeDSyEqliR61nrSlpxPy8VpMQ== X-Received: by 2002:a5d:64c9:0:b0:3ce:e14a:a898 with SMTP id ffacd0b85a97d-3d1dddee967mr9118279f8f.14.1756818710501; Tue, 02 Sep 2025 06:11:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 20/39] hw/irq: New qemu_init_irq_child() function Date: Tue, 2 Sep 2025 15:09:57 +0200 Message-ID: <20250902131016.84968-21-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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 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: 1756818807366116600 From: Peter Maydell The qemu_init_irq() function initializes a TYPE_IRQ QOM object. The caller is therefore responsible for eventually calling qemu_free_irq() to unref (and thus free) it. In many places where we want to initialize an IRQ we are in the init/realize of some other QOM object; if we have a variant of this function that calls object_initialize_child() then the IRQ will be automatically cleaned up when its parent object is destroyed, and we don't need to remember to manually free it. Implement qemu_init_irq_child(), which is to qemu_init_irq() what object_initialize_child() is to object_initialize(). Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250821154053.2417090-2-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/irq.h | 23 ++++++++++++++++++++++- hw/core/irq.c | 8 ++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/include/hw/irq.h b/include/hw/irq.h index b3012237acd..291fdd67df4 100644 --- a/include/hw/irq.h +++ b/include/hw/irq.h @@ -36,11 +36,32 @@ static inline void qemu_irq_pulse(qemu_irq irq) =20 /* * Init a single IRQ. The irq is assigned with a handler, an opaque data - * and the interrupt number. + * and the interrupt number. The caller must free this with qemu_free_irq(= ). + * If you are using this inside a device's init or realize method, then + * qemu_init_irq_child() is probably a better choice to avoid the need + * to manually clean up the IRQ. */ void qemu_init_irq(IRQState *irq, qemu_irq_handler handler, void *opaque, int n); =20 +/** + * qemu_init_irq_child: Initialize IRQ and make it a QOM child + * @parent: QOM object which owns this IRQ + * @propname: child property name + * @irq: pointer to IRQState to initialize + * @handler: handler function for incoming interrupts + * @opaque: opaque data to pass to @handler + * @n: interrupt number to pass to @handler + * + * Init a single IRQ and make the IRQ object a child of @parent with + * the child-property name @propname. The IRQ object will thus be + * automatically freed when @parent is destroyed. + */ +void qemu_init_irq_child(Object *parent, const char *propname, + IRQState *irq, qemu_irq_handler handler, + void *opaque, int n); + + /** * qemu_init_irqs: Initialize an array of IRQs. * diff --git a/hw/core/irq.c b/hw/core/irq.c index 6dd8d47bd6e..0c768f7704e 100644 --- a/hw/core/irq.c +++ b/hw/core/irq.c @@ -49,6 +49,14 @@ void qemu_init_irq(IRQState *irq, qemu_irq_handler handl= er, void *opaque, init_irq_fields(irq, handler, opaque, n); } =20 +void qemu_init_irq_child(Object *parent, const char *propname, + IRQState *irq, qemu_irq_handler handler, + void *opaque, int n) +{ + object_initialize_child(parent, propname, irq, TYPE_IRQ); + init_irq_fields(irq, handler, opaque, n); +} + void qemu_init_irqs(IRQState irq[], size_t count, qemu_irq_handler handler, void *opaque) { --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818745; cv=none; d=zohomail.com; s=zohoarc; b=m6I6Gpj/r+CQ/4/zqLPeo/kzigLrnw4PJHdcIxwjSjAhDu1isYqWFpHBmhBbwy9OE8tmLRaW90gcFHgqbJZs5V+vHoxe7zwM9+FOwaPAOtUA89zXTYXdwxVq8HzyY5bj18Jn7bfZr7zRBGKVR97cwt9dvdSrZoZ0iKNjht2iRow= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818745; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=RM//SOSyMG1jcYS0Uj3ddE2XoaaYiQer2JjB+xASa4s=; b=lw+CEVS0uQUeX0s4ONNLdc0uS9oMEmM7osb+d/qB5AnyMcaO8JXXZ4WeqA+9KTckEZFE62yotCgRSscZDRKFqKnLkZdoz5XUC5BwwSWsD5rhaX92Cr4LTQifCmFvwzdJ4zRQwqeXQUJFXnDyY8zMbU0YHTEOSWFBKH5Y5umPTwA= 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 1756818745366611.4732209825854; Tue, 2 Sep 2025 06:12:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQnx-0002cb-ER; Tue, 02 Sep 2025 09:12:09 -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 1utQns-00024C-JP for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:04 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQnm-0004bm-SQ for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:04 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3cef6debedcso2433888f8f.3 for ; Tue, 02 Sep 2025 06:11:57 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3d53fda847dsm10623228f8f.0.2025.09.02.06.11.54 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:11:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818715; x=1757423515; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=RM//SOSyMG1jcYS0Uj3ddE2XoaaYiQer2JjB+xASa4s=; b=WKaMEc+rS1oYZAR1DxvBsKk22+zk2/CUbnpTEVS+zDP+Dc+VU2DD14xFX8je1vD0zj CRy5bVBi+xgh8QSw7D9ekoS+RohQht6b0hjskEUFYdBlWQNar9fnA5DR7rRF6ke45X/w T/AOBLyUX48C581b4eYeqOd6sQ3KM6uB69Mu+2U8VwK+b0LqwuRgdbZVNhdEqnFQOb8l DGGjwRgBh2JOWRb8Z/AOwfEvpJPJRjEHFReNZKVC5kkDtMKBNUSrFeqfxps6LpGTw39i EkgdxYVunbsy5J8UePHNAXc+u6hhNJ7kWSjN/lwl6hn+pFeO++SgRxBz7M0tWIAE5flm fESA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818715; x=1757423515; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RM//SOSyMG1jcYS0Uj3ddE2XoaaYiQer2JjB+xASa4s=; b=cw0OQ2Nw0z7sHgspXpB4VC0+n6gQoc2ioTNF6nUy+MXCiLd1jNvZrgF8xF2QIkB01r /o0ly6qY0z8169ygUQfxvP5aIc10Xo3eIwDBTu4eEI2WMie2JZpdDc1hGbDhFQo+yAP9 9HOndSCU/LMeZE0Gy02Qm8lV+vHJ/QzCzLsaGJfuI/JXYaRvyb0xhNyyshF3UqkA++uB Id437XEsfOAfCt4425YY8WTl111OUJhWLeTNclXNIoNXLinx2okBzH1ekjomBKJsgQ/P 18beAtcMywL79Oft8tW4Y9ZN2oxNJ5zCvivyxTodNUkMjQcImqOJ+/3jvh+E1LwlKgWa Nk6A== X-Gm-Message-State: AOJu0YwcK9gAmShdUtHMOV4kPjIZA15o6VmiOPr2RSU2tjR9SaifEY+e eDZenTi9ztS7F71tvuTViRw7gyn6IB3ua78M7JjyRfpdwr8CYO6+xoc3YHwcwe8ufvxkpww0fij 661IN X-Gm-Gg: ASbGncupN0xwqTYcTiq00LUwu63MGupWx4z4PlI53hREXh5aRNAkPZrePO2vslOlosU +JoGkts5eTh8iI5EG0AFOMPm1kuXO+UcIxEz3M08n3aNVSyje/foSpiLfUqqMB2ROG7+UGSU1T2 YWAxsxnwlZtl3s0iWDcFqEHHXqw3vkzUuvhesvIier2L+xfyAJRiwNeebGmX0L9xfew7FAzbgdf CXcV/DRONEu4ZzB5TbzotcROlop/cchPQ9a1KGwK2h9iOnb1rySyvk8kijqZgoOOSoL5PJhSst7 unkONS9gAIWEPhBcr8dJMUamQxK90I346uf29mDyvJbxfucgSbQC6pxTCrE2F6s3pDnvADc9Blw uHcJBcUM322AigMGghfKIRemhQmyj1ajqneGijlFTq6Q7JgGhBFD6aNLfugmQKdNf3/QwoRO0 X-Google-Smtp-Source: AGHT+IGn/QtRcRwvQpS0NGy0xyc9gtUZcOnYBTxRHUQsQ770bbSYnEvCseuTdtlMCTU6VtkpKMhf9A== X-Received: by 2002:a05:6000:25ca:b0:3cd:93c5:eabc with SMTP id ffacd0b85a97d-3d1dcb7627emr7293564f8f.18.1756818715176; Tue, 02 Sep 2025 06:11:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 21/39] hw/char/serial-pci-multi: Use qemu_init_irq_child() to avoid leak Date: Tue, 2 Sep 2025 15:09:58 +0200 Message-ID: <20250902131016.84968-22-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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 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: 1756818749209124100 From: Peter Maydell The serial-pci-multi device initializes an IRQ with qemu_init_irq() in its instance_init function; however it never calls qemu_free_irq(), so the init/deinit cycle has a memory leak, which ASAN catches in the device-introspect-test: Direct leak of 576 byte(s) in 6 object(s) allocated from: #0 0x626306ddade3 in malloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu= /build/arm-asan/qem u-system-arm+0x21f1de3) (BuildId: 52ece17287eba2d68e5be980e1856cd1f6be932f) #1 0x7756ade79b09 in g_malloc (/lib/x86_64-linux-gnu/libglib-2.0.so.0+0= x62b09) (BuildId: 1 eb6131419edb83b2178b682829a6913cf682d75) #2 0x7756ade5b45a in g_hash_table_new_full (/lib/x86_64-linux-gnu/libgl= ib-2.0.so.0+0x4445a ) (BuildId: 1eb6131419edb83b2178b682829a6913cf682d75) #3 0x62630965da37 in object_initialize_with_type /mnt/nvmedisk/linaro/q= emu-from-laptop/qem u/build/arm-asan/../../qom/object.c:568:23 #4 0x62630965d440 in object_initialize /mnt/nvmedisk/linaro/qemu-from-l= aptop/qemu/build/ar m-asan/../../qom/object.c:578:5 #5 0x626309653eeb in qemu_init_irq /mnt/nvmedisk/linaro/qemu-from-lapto= p/qemu/build/arm-as an/../../hw/core/irq.c:48:5 #6 0x6263072370bb in multi_serial_init /mnt/nvmedisk/linaro/qemu-from-l= aptop/qemu/build/arm-asan/../../hw/char/serial-pci-multi.c:183:9 Use the new qemu_init_irq_child() function instead, so that the IRQ object is automatically unreffed when the serial-pci device is deinited. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250821154053.2417090-3-peter.maydell@linaro.org> [PMD: Use "irq[*]" as child property name] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/serial-pci-multi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/char/serial-pci-multi.c b/hw/char/serial-pci-multi.c index 13df272691a..34f30fb70b8 100644 --- a/hw/char/serial-pci-multi.c +++ b/hw/char/serial-pci-multi.c @@ -180,7 +180,8 @@ static void multi_serial_init(Object *o) size_t i, nports =3D multi_serial_get_port_count(PCI_DEVICE_GET_CLASS(= dev)); =20 for (i =3D 0; i < nports; i++) { - qemu_init_irq(&pms->irqs[i], multi_serial_irq_mux, pms, i); + qemu_init_irq_child(o, "irq[*]", &pms->irqs[i], + multi_serial_irq_mux, pms, i); object_initialize_child(o, "serial[*]", &pms->state[i], TYPE_SERIA= L); } } --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818770; cv=none; d=zohomail.com; s=zohoarc; b=EDob41zDxiI0V54dKmmngGdo3+6mt3IeX1N5EiaLe/3Hwrhstle07nrCZQhYbMz9q2BxroGpkdIQ/mJGa663yBRzc2R5brsFthZb/bMOsJ1pn/HEDN3ptLD3WM4m4ZizH1jnbDDSkv9BpDM9m7tHx+9RqKlNAn/BPQ3RKKLJiXM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818770; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=P7MMLvy2F0B/H0xVteB+a4geiLFU/+Hk/YVYg6d+sXw=; b=MAGjmM9f3HdDdm384th9hTcUx5E8pz3txMf/fSt8CmrlCgiDeZUMIk2dFXzUrTFzZTP2MWxqF7OckROukEAvv4DzTuQ9eJAqvRzlTpir8bbhdteCaQ+YwWOrqpz3uSHuy2nRQCGzfdVhhhmvlP2/OLfXI4fF0EBoUCKBopEnD/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 1756818770113926.1354193819188; Tue, 2 Sep 2025 06:12:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQo3-0003bo-Af; Tue, 02 Sep 2025 09:12:15 -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 1utQo0-0003M2-IF for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:12 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQnt-0004by-NO for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:12 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-45b82a21e6bso25305005e9.2 for ; Tue, 02 Sep 2025 06:12:03 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3d64ba4ff83sm9214419f8f.4.2025.09.02.06.11.59 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:11:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818720; x=1757423520; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=P7MMLvy2F0B/H0xVteB+a4geiLFU/+Hk/YVYg6d+sXw=; b=PRnz7njJUiWlLNx/wVp1VsYxr/GFCYKGubx6LGnxCV9E5f+iRkkqNypPb4e4nFaA/k GGSpVJTUjHqnBvBDfUTwTlk5WZ8PEkRJwELT0V0+CeVSl1/P+008pF4nOPjxQsNFya5+ oQFsfJc4DLoFpWdxYjMUMYJ3x6shPJ5d9PR63Yu6twYuDavYJnu75FFto/7cVULNf9CA y4TU58HCbrZSbcwAotS3AjTt5RzC52iZCUcKPJCvKCAwjgVnoRiYKYICzsEyu6ECTvvq X8iHVhcYPvROTyslDjnnyl0yi5Zxj2cI1khkfUfSRyfo1vIgFybnGyCUFtUP+hplBSNx a89A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818720; x=1757423520; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P7MMLvy2F0B/H0xVteB+a4geiLFU/+Hk/YVYg6d+sXw=; b=I4j36th+xdOpF2uOTE//LhBoLv/TjWYq4jo5jfGCAkJSOAORUJIXisJVP+8LGBRiKv 4AjqeZkMO4bwRJQhHXeFLD+T5EIzJtD8Obd6tt8dBx+GVAevRcZQiIgzisLBooYd77eX 8jeCfhoYovgNrQIGJRDE8iqW8k/kugucf4iufyk0+QOv6bRg1mqhnBwIgHxM5yxxB0eR KnjYYX0lQuKeISiu7HLeFBPBg5UzQrfgifXeAThmiOUd8quqmt8bxryKbKqXIhSSskWK QVTeBW8sQEIl4Pz222jLmvNTenDKgxbVWzWS75c6rhu6GBZGCQDTCO8LJCAE1kdMrIqb 7lMA== X-Gm-Message-State: AOJu0Ywqy59lJJk84FtfXXVlRzubrRy4Cd7HDi+puFIMa+aB6CrzKs/g spblO5llh8bYHQC2YaxDs8wEzUDjoVC9EneGMn8GxOeS04LRaSSNlLMrd0cBqFgXq4mZGJfhg3b FU+h9 X-Gm-Gg: ASbGnctgel380xLrpYjJaGNv5K1Eh81N2pB0vHVrjmFqBSwUyg6Vzw9wxZblS/lzuHT 3KUGyAd8LnR9IwiamleoHnnqEruLFfLpw/HqWlNATw7eUd8XdaQY0v18ygYQfnYYlQ8Di0d2lgn 1+telV5e04P5Np3WjAmcQXaJ+hQJQ7aCdUkhYSLU1BTthF74j0m2l/NjYFqBlkd/mvLAIuiGxNJ vdfD7WA13MgGrr7R1oe1ouYbF9grauLAGbWAIRzR+PTKY3fA1klIQp+bFHlNRqVue+qIF0cM+/A CIh/hJbzkRsadasQa/bcAVrargBUBVez/MIpArt4upZICwEWLpFxM2yO3jE2ACGgKxDNC8FZN8m T/M8xx4EVsxiQ+QCOjy9zgs8Cbz3k7UC9jtW2pr2bAcVYtPhnl3qddzG6KkyQ/815DJ1beJyaIH snRe3xAR4= X-Google-Smtp-Source: AGHT+IEU/Q2GKKo8UlCz12NuLxKhNulzD5tAB8JJOYqN9sAGkVnc7J3BKY+Sr+hWTwxwk/4Iv5ba7g== X-Received: by 2002:a05:600c:4705:b0:45b:74fc:d6ec with SMTP id 5b1f17b1804b1-45b8553f1e8mr105150445e9.8.1756818719769; Tue, 02 Sep 2025 06:11:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 22/39] hw/ide/ich.c: Use qemu_init_irq_child() to avoid memory leak Date: Tue, 2 Sep 2025 15:09:59 +0200 Message-ID: <20250902131016.84968-23-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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 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: 1756818770967116600 From: Peter Maydell The ICH9 PCI device uses qemu_init_irq() in its instance_init method, but fails to clean it up in its uninit. This results in a leak, detected by ASAN when running the device-introspect-test: Direct leak of 96 byte(s) in 1 object(s) allocated from: #0 0x58f3b53ecde3 in malloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu= /build/arm-asan/qem u-system-arm+0x21f1de3) (BuildId: 8dcd38b1d76bd7bd44f905c38200f4cceafd7ca4) #1 0x72e446dd5b09 in g_malloc (/lib/x86_64-linux-gnu/libglib-2.0.so.0+0= x62b09) (BuildId: 1 eb6131419edb83b2178b682829a6913cf682d75) #2 0x72e446db745a in g_hash_table_new_full (/lib/x86_64-linux-gnu/libgl= ib-2.0.so.0+0x4445a ) (BuildId: 1eb6131419edb83b2178b682829a6913cf682d75) #3 0x58f3b7c6fc67 in object_initialize_with_type /mnt/nvmedisk/linaro/q= emu-from-laptop/qem u/build/arm-asan/../../qom/object.c:568:23 #4 0x58f3b7c6f670 in object_initialize /mnt/nvmedisk/linaro/qemu-from-l= aptop/qemu/build/ar m-asan/../../qom/object.c:578:5 #5 0x58f3b7c6611b in qemu_init_irq /mnt/nvmedisk/linaro/qemu-from-lapto= p/qemu/build/arm-asan/../../hw/core/irq.c:48:5 #6 0x58f3b5c6e931 in pci_ich9_ahci_init /mnt/nvmedisk/linaro/qemu-from-= laptop/qemu/build/arm-asan/../../hw/ide/ich.c:117:5 We could call qemu_free_irq() in pci_ich9_uninit(), but since we have a method of initializing the IRQ that doesn't need manual freeing, use that instead: qemu_init_irq_child(). Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250821154053.2417090-4-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ide/ich.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/ide/ich.c b/hw/ide/ich.c index 4cade0d1219..b00987f08d4 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -114,7 +114,8 @@ static void pci_ich9_ahci_init(Object *obj) { AHCIPCIState *d =3D ICH9_AHCI(obj); =20 - qemu_init_irq(&d->irq, pci_ich9_ahci_update_irq, d, 0); + qemu_init_irq_child(obj, "update-irq", &d->irq, + pci_ich9_ahci_update_irq, d, 0); ahci_init(&d->ahci, DEVICE(obj)); d->ahci.irq =3D &d->irq; } --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756819118; cv=none; d=zohomail.com; s=zohoarc; b=F7VXUOd8j/DGiDKt5ICOYAdGCWB/0kKXc01nW8KJjamjD62ibsqqERI61bOybU0q4Un9VvZhMRUNyV0nobouqt3w1jnPy20l4qvpQateHUzV0ZKVcu37GVC6gix+D9DJxXDEUfToX6q9GXbqDs+v4WfYAE2nyuqPTBB85yqbquU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756819118; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=BGV/b4AEUGgg2Lmee3eaJgstc5VLArS5HN+xqv3hQRw=; b=mwy10/bEsJbaeXkDfDORn7a75wg3BWQ9QvHxzipivUFnloGV81rvX/O4w8CuiwHEzjLdsFX4usm1HfJPk3EhgRCTRwfK+J61b1M43DyDyosA35JHcWE2rtAkKBjMu6ONTG21KVlB3p7ShrN1XUYTxBEgSUnTAIr9mD9xCrETEcw= 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 1756819118563460.7669607782202; Tue, 2 Sep 2025 06:18:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQoA-0004Bm-1q; Tue, 02 Sep 2025 09:12:24 -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 1utQo7-000472-Rc for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:19 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQnz-0004cF-HB for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:19 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-45b86157e18so16793835e9.0 for ; Tue, 02 Sep 2025 06:12:10 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b7e8ab832sm197197435e9.23.2025.09.02.06.12.03 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:12:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818724; x=1757423524; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=BGV/b4AEUGgg2Lmee3eaJgstc5VLArS5HN+xqv3hQRw=; b=B523NLin8Lu61jTo8BBb3sUhpQD6VFYpujI/Yk7SGyukDkE7sc5tTKGtwvwXjJrIVL 2gfE90QA9MUdONgyDJFdPvu7n4TfJ+jrVPCg7DzGigAJKUkkXp/emCaCkRd3gZU5IbsS P9qMOYG17okpVRAV4iyZZuVxRvI0rRih/CevOWyDLwOfUxUHMupwd4juTDCgeeb4NwLW +Ug9ckzTvVeAm8JwBQycEVTm23ifVCj3XtsSaaUx1QOahimoDV7PcwgmPGziAb7vtKBk 33DbQfW6qZZlwDLvBHpL1e0jzkHGmPEVwBgOVpaqRjhebY4JFcq1gsSOJRcnlMDbVcHL hlKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818724; x=1757423524; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BGV/b4AEUGgg2Lmee3eaJgstc5VLArS5HN+xqv3hQRw=; b=EFbYLCjpIt6sUdhJh+sf56samFvG3oZci7kTS3SSeDywo7uRCdyhOMa/ftKIgG62zy PFhowVEkYYU1bDiYQAR5tAAmWflWUg3u2DOjFYoJ+UaFY4veLkdoEmMwJ/ZY2DKEde/2 Anz446xcBL3/5jkqQNE3qbVK9oUCdBrzCUlcIBP5d3HUwe3/cvjnpilT9Ev//MHYAVyD EWjzf7sXeg/HUVZPrnJkJNHH1Nied+anpHHfCjXJ173JUegTXlCHSxDSswhNgBbaldOc mFCsO4pN26kLpq96B2qfbNNOyiX/KMl8j89yRmuegBFZ1Y9nsGIciWLfwzfs/HJe4Aes n+OQ== X-Gm-Message-State: AOJu0Yz2jQgWNqE3Glf5znFPAYfPCiAUmoQZ9lK+f0iwF6cG0CEJCR2F S0LqdUyhkNkf92jHUTBjEs8eDUvjfxt0xC6ZqAZ7un5VNWYG95dWUCmdk574cfVsHVFnOZuKX6Q ihRMc X-Gm-Gg: ASbGncvjn3ppluip6Whl9ViAgd/8VtDhnMR5pyJh14KGMR3MB9VE2mMecgvY4NwZwcL HuHBZSsVD0ZSKiVGdaf5mywBh/fLjkzpXoPwVt00gs8CFGE9EaWgIFrSkYdC/mFbELzYwP4QLC5 kSP5JpW8ZD9xHdJvH+mM6T8sL31E/bpBnOSo2LCfQcJMXAjtjPvN6XpmrdFQqG5B2HjV1CDKh+j hmwBMVOX9kgIr1i9CtBTWxZ4FYRUfik+iQBYY7tIWDJjYFfcCumxud0WGymKBOkCsKRQXtQvr49 /5QdkfxAhABi+nahH2XHlYzbD//QEreaiEKuFKn2dymGXnhuRHDW517C42yyNXldxXJNRGewQK8 vTLzihpx3nHB5xiE7eHsw2VI0kAWvILbUzvsdiV+238BMU9SACSMSBMgQM9r6FBnX4MJuVfaYO5 RthLoPWYo= X-Google-Smtp-Source: AGHT+IGgGMsB2zNrI6Qfc/XUXPNx5hudoOvsEWQmSzltg7fCg4ve8pBOYzezh5nKGaX+QZDXb6f+aQ== X-Received: by 2002:a05:600c:5486:b0:45b:9c37:6c92 with SMTP id 5b1f17b1804b1-45b9c376e30mr11451145e9.31.1756818724343; Tue, 02 Sep 2025 06:12:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 23/39] hw/gpio/pca9554: Avoid leak in pca9554_set_pin() Date: Tue, 2 Sep 2025 15:10:00 +0200 Message-ID: <20250902131016.84968-24-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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 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: 1756819119221116600 From: Peter Maydell In pca9554_set_pin() we have a string property which we parse in order to set some non-string fields in the device state. So we call visit_type_str(), passing it the address of the local variable state_str. visit_type_str() will allocate a new copy of the string; we never free this string, so the result is a memory leak, detected by ASAN during a "make check" run: Direct leak of 5 byte(s) in 1 object(s) allocated from: #0 0x5d605212ede3 in malloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu= /build/arm-asan/qemu-system-arm+0x21f1de3) ( BuildId: 3d5373c89317f58bfcd191a33988c7347714be14) #1 0x7f7edea57b09 in g_malloc (/lib/x86_64-linux-gnu/libglib-2.0.so.0+0= x62b09) (BuildId: 1eb6131419edb83b2178b68282 9a6913cf682d75) #2 0x7f7edea6d4d8 in g_strdup (/lib/x86_64-linux-gnu/libglib-2.0.so.0+0= x784d8) (BuildId: 1eb6131419edb83b2178b68282 9a6913cf682d75) #3 0x5d6055289a91 in g_strdup_inline /usr/include/glib-2.0/glib/gstrfun= cs.h:321:10 #4 0x5d6055289a91 in qobject_input_type_str /mnt/nvmedisk/linaro/qemu-f= rom-laptop/qemu/build/arm-asan/../../qapi/qo bject-input-visitor.c:542:12 #5 0x5d605528479c in visit_type_str /mnt/nvmedisk/linaro/qemu-from-lapt= op/qemu/build/arm-asan/../../qapi/qapi-visit -core.c:349:10 #6 0x5d60528bdd87 in pca9554_set_pin /mnt/nvmedisk/linaro/qemu-from-lap= top/qemu/build/arm-asan/../../hw/gpio/pca9554.c:179:10 #7 0x5d60549bcbbb in object_property_set /mnt/nvmedisk/linaro/qemu-from= -laptop/qemu/build/arm-asan/../../qom/object.c:1450:5 #8 0x5d60549d2055 in object_property_set_qobject /mnt/nvmedisk/linaro/q= emu-from-laptop/qemu/build/arm-asan/../../qom/qom-qobject.c:28:10 #9 0x5d60549bcdf1 in object_property_set_str /mnt/nvmedisk/linaro/qemu-= from-laptop/qemu/build/arm-asan/../../qom/object.c:1458:15 #10 0x5d605439d077 in gb200nvl_bmc_i2c_init /mnt/nvmedisk/linaro/qemu-f= rom-laptop/qemu/build/arm-asan/../../hw/arm/aspeed.c:1267:5 #11 0x5d60543a3bbc in aspeed_machine_init /mnt/nvmedisk/linaro/qemu-fro= m-laptop/qemu/build/arm-asan/../../hw/arm/aspeed.c:493:9 Make the state_str g_autofree, so that we will always free it, on both error-exit and success codepaths. Cc: qemu-stable@nongnu.org Fixes: de0c7d543bca ("misc: Add a pca9554 GPIO device model") Signed-off-by: Peter Maydell Reviewed-by: Glenn Miles Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250821154459.2417976-1-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/gpio/pca9554.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/gpio/pca9554.c b/hw/gpio/pca9554.c index de3f883aee9..eac0d23be34 100644 --- a/hw/gpio/pca9554.c +++ b/hw/gpio/pca9554.c @@ -174,7 +174,7 @@ static void pca9554_set_pin(Object *obj, Visitor *v, co= nst char *name, PCA9554State *s =3D PCA9554(obj); int pin, rc, val; uint8_t state, mask; - char *state_str; + g_autofree char *state_str =3D NULL; =20 if (!visit_type_str(v, name, &state_str, errp)) { return; --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818770; cv=none; d=zohomail.com; s=zohoarc; b=V/zVvmdKm/CqVFza+8MO5h8Hsf55adsMo7Ojnh0kKp4Joc2nr/8c5zo4QjWCgx/w7/U6UQrM4wDYf6+zOURPNk36K3BL0aydZQ2DdEw8mwMaCETuz2+wFlrBbOl5t5by3oDWO7Dl8TnU31j3txil6YiXLZGojTR6VP/36Zrt+5A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818770; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=Td3nvqZKIvcK1wV49niKvXWkSXIsMzUAcPCww/paHbo=; b=nnn15AWbvgWkwL0iZUrVE5pwRvYFTfyELPUo5HgddXA6mxPLC3PxfvZChl5aZf7r7D7ZxncN9n7UDH4YDaL/QFoM29h6YVxzwp+s2KcxnC84J6V0sw7ug03rNxmeojq+2YWkgvTTn/8s+rivpX4G/XsN7JIAe5ygHlnyoaFidmc= 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 17568187700537.464729393753942; Tue, 2 Sep 2025 06:12:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQo9-0004BG-K0; Tue, 02 Sep 2025 09:12:21 -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 1utQo7-00043M-Ev for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:19 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQo0-0004cO-RE for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:18 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-45b873a2092so25194515e9.1 for ; Tue, 02 Sep 2025 06:12:12 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b7e68c83asm212334315e9.20.2025.09.02.06.12.08 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:12:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818729; x=1757423529; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Td3nvqZKIvcK1wV49niKvXWkSXIsMzUAcPCww/paHbo=; b=YpgeN2VVXCQ/f6G2EyLJpU3o8kZnqLq9XfGBPQEDXVTb50aAqIxmXboUONCti/do2J U9s3Gn9F8DksV8gL72cCYlmyAv3mCCvubWsBsLRBUAqtBAF7n8YYcHGn1x3yfPZ8Fnok tI/imIabtGU8vUBQ6kC3p5Xg05ZU7V0xNJ0nUDRn7K27sxpJzjYoYwhMzc7Hwgb7Crzu 07tYjdf6DmRNthz0kz/YMWWrJYYSRgWCJzIR4/XKNeEiv8hZIJeRqVWvjLoSVpO6XIzn TC4u19qE+0aREPSbwe9qxNndrqVF8TAG1osF+4h86dUp8ykiDC+TeESAlR8Hu6EzfPwJ sVGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818729; x=1757423529; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Td3nvqZKIvcK1wV49niKvXWkSXIsMzUAcPCww/paHbo=; b=FaWwTyzdYputKmM+8qv3HAsiwBtr6BzldwUT3eZmQDNUIVMVEStJ6yY1hSJY24zyGh SyNhhxXmCfx5oz3a8wnn2mv1g7Z0tBmVPMdjA/tptWF/iN3wflPAmri6dNLhmOJWyycO HvXVg8IQLjkxF/cht9CqQL45ME1jFAoRN+5JmgiDLiHNGW8KF2f6QLSMSDdN93bwCJij yRqdskKzVm0Rwcnypaa/9xJW2dFBNsC52MGg3GiRd0Z1crzDgMSsYehzGH5SqCx//spW YG3ly3gEisDPNdQIB396ZYlc9g9eK9bmp9rnbZgPeXwarHgXgvQjH2x3iCS6pXpCVV9+ zYzQ== X-Gm-Message-State: AOJu0Yz2y/Zrpxe3FIwj1xnO6fkOiWonduujwLrKNszeWjToV9Suse1X Cu1t1TldIMRk7VvnT9D3I2YxW+jOpvc+qus5t0kqmn7oKlfh5f5Yqyeh1Qb08lBDaxXtUR/Zixi JkEJO X-Gm-Gg: ASbGnctsjbqw7LpQJw7OMJJBLVzN1jbPxlubaGLPsxNlfA6vbj0YEJVf9KYt3sHe9A3 rDFMwlp7mJB68m2jJajFHcLUo9SHO6pGbHpD3sP/itZvIUL3svtRWwASrHx5PIyPISy/AEU7lCU LF8Tgt3t1dwxdtTOVoE4DzqKRL8u0042PKpDBPTuNOusRr48aI2Oh0j++cnYGY7F+SVYHsvASxe /xKvkhLiySmIELS9B0MsXGDtOdzzlx8HDwkeUbgF+MBuNVJgqRvhh2/01bFGbCbvWDr4aQ9EbZT gVOntfaaStRt0nRlgmU4c3+LmdgEnuM5snN2clZ4WB5vu7m3yiuQRXura445weacgZYjeL5lMVJ mKyzOPjINf7U442NTac7nxUl97njpqun0mZsc7jiqIUtAY1s+cO/s9NGcl++LQz43pKlQihKdhR AWyjI4/Vk= X-Google-Smtp-Source: AGHT+IEgmE6dDucwrHlEiyTLqj8rutInoVMgxlC5ubZ5AjJ+oEALsdPKf2VZBtInwe2xxOyTzcqoYQ== X-Received: by 2002:a05:600c:1e8f:b0:45b:83fe:9cf7 with SMTP id 5b1f17b1804b1-45b85525d75mr84750915e9.6.1756818728988; Tue, 02 Sep 2025 06:12:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 24/39] hw/char/max78000_uart: Destroy FIFO on deinit Date: Tue, 2 Sep 2025 15:10:01 +0200 Message-ID: <20250902131016.84968-25-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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 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: 1756818772429124100 From: Peter Maydell In the max78000_uart we create a FIFO in the instance_init function, but we don't destroy it on deinit, so ASAN reports a leak in the device-introspect-test: #0 0x561cc92d5de3 in malloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu= /build/arm-asan/qemu-system-arm+0x21f1de3) (BuildId: 98fdf9fc85c3beaeca8eda= 0be8412f1e11b9c6ad) #1 0x70cbf2afab09 in g_malloc (/lib/x86_64-linux-gnu/libglib-2.0.so.0+0= x62b09) (BuildId: 1eb6131419edb83b2178b682829a6913cf682d75) #2 0x561ccc4c884d in fifo8_create /mnt/nvmedisk/linaro/qemu-from-laptop= /qemu/build/arm-asan/../../util/fifo8.c:27:18 #3 0x561cc9744ec9 in max78000_uart_init /mnt/nvmedisk/linaro/qemu-from-= laptop/qemu/build/arm-asan/../../hw/char/max78000_uart.c:241:5 Add an instance_finalize method to destroy the FIFO. Cc: qemu-stable@nongnu.org Fixes: d447e4b70295 ("MAX78000: UART Implementation") Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250821154358.2417744-1-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/max78000_uart.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/char/max78000_uart.c b/hw/char/max78000_uart.c index 19506d52ef9..c76c0e759b6 100644 --- a/hw/char/max78000_uart.c +++ b/hw/char/max78000_uart.c @@ -247,6 +247,12 @@ static void max78000_uart_init(Object *obj) sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio); } =20 +static void max78000_uart_finalize(Object *obj) +{ + Max78000UartState *s =3D MAX78000_UART(obj); + fifo8_destroy(&s->rx_fifo); +} + static void max78000_uart_realize(DeviceState *dev, Error **errp) { Max78000UartState *s =3D MAX78000_UART(dev); @@ -274,6 +280,7 @@ static const TypeInfo max78000_uart_info =3D { .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(Max78000UartState), .instance_init =3D max78000_uart_init, + .instance_finalize =3D max78000_uart_finalize, .class_init =3D max78000_uart_class_init, }; =20 --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818781; cv=none; d=zohomail.com; s=zohoarc; b=MjPek6BUS2gNit/OL867oisP4uksi+7UUSsT8t6IcyT/xgfFNAUw/dJajranaBWckuNxxCLinoLuSpVR4cpWiwKl79P7DV19UQLX/nXPus4lODro87Jl2IFtggV+fu6RzEQ2WZOcVkLv92Y13k8dqZQCtOFDaaCYRdP/Ll3ggpY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818781; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=Vdp9ZUtiSvenNdC+VKbqDN2o6JPuLdKq8aqZrWQK9yo=; b=fcr/9peIVdKy+45xUJNcEGYO8DZP/xYtZfRCC1g23uX+b2g955f7aCpNM5RMHzeHxTZrCXuABHIj5Gfd1NBbXhq5TkSPXqMtim1BK2jzhp4UngVKHiW6vvRk3Mc4nST3lOL1turo5mfWOepf5oF5j0xLESJMkzeMWxqaMEJuARU= 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 175681878190170.94396758501011; Tue, 2 Sep 2025 06:13:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQoN-0004Qy-98; Tue, 02 Sep 2025 09:12:37 -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 1utQoB-0004G6-OM for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:24 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQo7-0004ck-PR for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:22 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3b9edf4cf6cso4608993f8f.3 for ; Tue, 02 Sep 2025 06:12:18 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b945332adsm44075905e9.4.2025.09.02.06.12.12 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:12:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818734; x=1757423534; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Vdp9ZUtiSvenNdC+VKbqDN2o6JPuLdKq8aqZrWQK9yo=; b=mdpq95TwI/Yd9ohQiBN2vi9RzhPBWyJh5999BOUjIj4K8qp9K8H92miFDnhT734e+I HanBal9FMW9RR9l80o9APLHxk+VZO6ffa/SOh7cLigZO3oAwYJ17PXoMqR+vsqlJwZQ+ za+OiI4Czhv0TINUg/j/hiK84RveNamliRPTCl6fMlofGHBQCGFfxALfv3xcuv1luzlZ Itt1pQ0sRxR4Y2wtXffu2gXg1BFN4E/9Tm6OozQDzgKZzDDgvTk7m534Jelw3t45JHyO y2QLdU1UjC8vqDEaGgncRmukZrq4cckI2YKKJT34aKksUomumDeQm2MAK+8KnmIegxDk CT+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818734; x=1757423534; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Vdp9ZUtiSvenNdC+VKbqDN2o6JPuLdKq8aqZrWQK9yo=; b=SUi7cvIQCQvArSZxPmbgpB1D3NERyaWzUr8sr1YEVU90S6P/Lymr59uvBJFxsid+9+ ecDTIWDmfvNvVh5DahJJAefGgKPjYxS7l8QD+EQ8hTCMRGtlIMz98niHDzQ6blcXzhNA urSnsJCQvXG4JpterxYqcMzdWd56qbFet4guZnWHfPSkoghdxtVwQUeezKbokzj9++fS gIA2GD1O82CBAzONGt8zK/foEYSaUYWb2mnGuLpGIr5xIlSHhYO2Z27m53bWJj5GTy3e ZB7EQ4tw5Ccnbj+8FwGfZTAiKwoKpugX7oU7HuZsbGPrto5X6j37k/NqAbwIOSC3Z/RT Zdzg== X-Gm-Message-State: AOJu0Yyo4C3HNHI74PscdTRseEy3AetUE06cRx4RtIDGcJqiVRmeZ/jS h1MPsGBNw5XpD/VwJ8rGD7S/eO+AZg9oT9yX7RqfJAD8evAv2GqzBAEFfYVhzdapdehBxho9Q6Z BGpps X-Gm-Gg: ASbGncvV0DegsOyRO504k4L8V/x23ygHYU0p1nlEQVWBMdjJ4zx93B0oH/lW1xjx7+Y XQ8suWR/3RmZyfCRVdKVJoht0jlzvNaeaWDq7VQngAmLiIyGLD6Uy5ecXT3b69uioMR2YecxjbT 4oQQ30SKSpNq12Xyx+LnSNsOtloP89ZMArYQeKNUxFqYYoqCfjymR9gX2AQr4r6e4sXN/HTB5/9 yIzzltxutBb4OLdwJPqtaUZ05VUHmSng2dFBAsURsB6XD6ayScXSiq2WLqemot+d80WyIPUFiMw XFGpTQ0SfR/LyzPi5qtyCotNsdxuYIZ/Fge2USGWLJgfC3Hh+hFA2aOyDi+5K2XmLNdxmTru7/g /dGzu6c4ct1r/RXXszoy/jDEBOTebUtD3f30QYuLtrMM5O//nGczusUfygi+EB/SZPVk8fdlb X-Google-Smtp-Source: AGHT+IFs/zZaYW+fGiRdmyDj8DgBgIKeczkDW5jzEfgjbwNqCb1i3OJ7lr7UmuyitmrSIKud6PGzcw== X-Received: by 2002:a05:6000:400d:b0:3d7:94bb:cb9d with SMTP id ffacd0b85a97d-3d794bbceb5mr3411133f8f.3.1756818733579; Tue, 02 Sep 2025 06:12:13 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 25/39] hw/misc/xlnx-versal-cframe-reg: Free FIFO, g_tree on deinit Date: Tue, 2 Sep 2025 15:10:02 +0200 Message-ID: <20250902131016.84968-26-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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 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: 1756818783148116600 From: Peter Maydell In the xlnx-versal-cframe-reg device we create a FIFO in instance_init but don't destroy it on deinit, causing ASAN to report a leak in the device-introspect-test: Direct leak of 400 byte(s) in 1 object(s) allocated from: #0 0x5aded4d54e23 in malloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu= /build/arm-asan/qemu-system-aarch64+0x24ffe23) (BuildId: 9f1e6c53fecd904ba5= fc1f521d7da080a0e4103b) #1 0x71fbfac9bb09 in g_malloc (/lib/x86_64-linux-gnu/libglib-2.0.so.0+0= x62b09) (BuildId: 1eb6131419edb83b2178b682829a6913cf682d75) #2 0x5aded850059d in fifo8_create /mnt/nvmedisk/linaro/qemu-from-laptop= /qemu/build/arm-asan/../../util/fifo8.c:27:18 #3 0x5aded582b9e4 in fifo32_create /mnt/nvmedisk/linaro/qemu-from-lapto= p/qemu/include/qemu/fifo32.h:35:5 #4 0x5aded582b326 in cframe_reg_init /mnt/nvmedisk/linaro/qemu-from-lap= top/qemu/build/arm-asan/../../hw/misc/xlnx-versal-cframe-reg.c:693:5 Similarly, we don't clean up the g_tree we create: Direct leak of 48 byte(s) in 1 object(s) allocated from: #0 0x5aded4d54e23 in malloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu= /build/arm-asan/qemu-system-aarch64+0x24ffe23) (BuildId: 9f1e6c5 3fecd904ba5fc1f521d7da080a0e4103b) #1 0x71fbfac9bb09 in g_malloc (/lib/x86_64-linux-gnu/libglib-2.0.so.0+0= x62b09) (BuildId: 1eb6131419edb83b2178b682829a6913cf682d75) #2 0x71fbfaccc799 in g_tree_new_full (/lib/x86_64-linux-gnu/libglib-2.0= .so.0+0x93799) (BuildId: 1eb6131419edb83b2178b682829a6913cf682d7 5) #3 0x5aded582b21a in cframe_reg_init /mnt/nvmedisk/linaro/qemu-from-lap= top/qemu/build/arm-asan/../../hw/misc/xlnx-versal-cframe-reg.c:691:18 Add an instance_finalize method to clean up what we allocated in instance_init. Signed-off-by: Peter Maydell Reviewed-by: Edgar E. Iglesias Reviewed-by: Manos Pitsidianakis Reviewed-by: Francisco Iglesias Message-ID: <20250826174956.3010274-2-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/xlnx-versal-cframe-reg.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/misc/xlnx-versal-cframe-reg.c b/hw/misc/xlnx-versal-cframe-= reg.c index 1ce083e2409..95e167b9213 100644 --- a/hw/misc/xlnx-versal-cframe-reg.c +++ b/hw/misc/xlnx-versal-cframe-reg.c @@ -693,6 +693,14 @@ static void cframe_reg_init(Object *obj) fifo32_create(&s->new_f_data, FRAME_NUM_WORDS); } =20 +static void cframe_reg_finalize(Object *obj) +{ + XlnxVersalCFrameReg *s =3D XLNX_VERSAL_CFRAME_REG(obj); + + fifo32_destroy(&s->new_f_data); + g_tree_destroy(s->cframes); +} + static const VMStateDescription vmstate_cframe =3D { .name =3D "cframe", .version_id =3D 1, @@ -833,6 +841,7 @@ static const TypeInfo cframe_reg_info =3D { .instance_size =3D sizeof(XlnxVersalCFrameReg), .class_init =3D cframe_reg_class_init, .instance_init =3D cframe_reg_init, + .instance_finalize =3D cframe_reg_finalize, .interfaces =3D (const InterfaceInfo[]) { { TYPE_XLNX_CFI_IF }, { } --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818806; cv=none; d=zohomail.com; s=zohoarc; b=OnIEAmQ6teFHspd9EiWnVtr66JUHRuBjxjQle+2TaAi6l1iibbTz5S8nhG1CTnwulr2U0ty2rx46GnfLENFbXLZ6ecK7/crQO4y8agRMJWUg337RHTLnQv04u6t8IUYPf6+TNphX1/I4hSuaveK44QWq3qdI4Kq+lYKTOhgpA0U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818806; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=HNvR7jwHMpClwLTVx8eKGilXdBxkd6upV9yfio29tNQ=; b=AqXf7NytnlN9aiqfreeIgoKqgntwriqirmOR4D0sAO8Qvf1t0FWFfIuLM1Ps9jZgvMfd5hBnQeUBqwXpjYENh2UGAVZKtvDJ4peAt7Ojwpk09XkZgpXWnYY/W5XxOQQg9Qe+GFoxOEJ5Og0lFn71wMVphCo6pGW2Krr9Jdauwlw= 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 175681880692588.25592646808934; Tue, 2 Sep 2025 06:13:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQoT-0004kh-5X; Tue, 02 Sep 2025 09:12:41 -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 1utQoH-0004Pu-0f for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:30 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQo9-0004d3-VO for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:28 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-45b7ebe667cso34868275e9.3 for ; Tue, 02 Sep 2025 06:12:21 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b8f2d3c88sm65223255e9.19.2025.09.02.06.12.17 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:12:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818738; x=1757423538; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=HNvR7jwHMpClwLTVx8eKGilXdBxkd6upV9yfio29tNQ=; b=Q2kDIoJz9vQrTKOSWWOxdvciTlDIyCxBNNyEfLd6AH4jyPUoXH2WJh+cbxuECcAouj lYXLkQE2FJ1JDBQJvHF6dJG+4RJG4FLVP/N2YFjGNZMzf725gCoFuXHHGUg33zMHH864 /81NqNGcQIwyM+E8Mi4trBJEv7+N9Vy7GLGYs1aWitRHqVki6E2V0zxrcZ+gAA5wafpo iOYHfXh9IzJpmu4L9eRTMMV6sCIl/M7/tToA07fXEylGOp3KrPZyXkyJee+8aQrWAMR2 2OpeVIUORqqbGrhhPQ0KUk9ev5SWxSIUFjnd/j55xtNJ8S8l9jZSDZTxNwO3eYC1XwfS GUmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818738; x=1757423538; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HNvR7jwHMpClwLTVx8eKGilXdBxkd6upV9yfio29tNQ=; b=Ynxq9xN3lASchm8p7yPMmMii9Hv0jLfcNnDZ49NOLniJj46BBoSw2yJK5+9l7N3God Wiue5V5TfvvMndnfNOOwsmIu9Kip+9IFX9hYoxWAPRyElEy1/qU75uLNGfsgLXSWuA2G n9XT2UD7Vfg1C9J8xVvse5igAw5aYaDT+HPiSpvPrszMsqogsUEhDUwAWRPF3goJcYDV FZRp3yARxVVvnnR6y3jOD5OJUsZizv2pSCV/5k5+/LOLbTTF05NygZpBmR8oKdWRteR6 l5mdH/T7L0RFrKbwaF7kW5h+Z+7cgqo+kU4/ddfu4cPm3kbBBuMTkk+2uASRrEbzwyLD USFA== X-Gm-Message-State: AOJu0YyeM48N+Z91lxVD66LLVgIEtBEHSRPG8fvHi3sEWB0AMjb+fHiP i8Ayw5R6HEo2XfFPKVZYRogAgCdKT1xZSSw7tYRiFiZYoxth8mv+mtzexKevOkI2Y93wjw1j9tK +bpqL X-Gm-Gg: ASbGncsWi5fe0yps4vc7Ywlqcoi/pSRpSl1Yel6qBRzvSkdXrOR34y6/CBQI9FeHhZ/ 82nGk9fiwepfzTQWTrbLBP9EnB+Q8/Dprz1bIr2D1L46LmC823Jwn2nhPq3htHtRqvWGsYPcz82 1Aq50rFPzXzQqdynuyiZDJMLLOfZHpvev86x89UWp5Rc8fsOcQGGOj7+jHR1wS+o0MFvlHxwYDm 5ao2l/Hl1sB5EPrVyBXl516q2om6SPBW7EuF69acTYkjgn9F50AI9hXCIzxo1N3DkMaJ8IqAF6l UarwuWq0kS2F5Sr6rKXMI9t4dzlEZKPm0JzkqCeOQKaD7+g8o/reSUhVeAfkbNO0xIHFcOoUegs ruBkYH7FDzuRp+568o//80bQ3N2ZpUi5Ra1JaKmaE0E46gLRys+s9K4FRsjW1qSQP+5uhyPsVp2 el7KctLeVfNHQcjV1Eqg== X-Google-Smtp-Source: AGHT+IF8wMesRKewRxGrR6eb54Mygy8xl0C9O2O/4/+6G0ZCTCCc+mkG8VtitZ0iLT34gqJqzsPZNg== X-Received: by 2002:a05:600c:5486:b0:45b:8d2a:cd09 with SMTP id 5b1f17b1804b1-45b9bd607a7mr10863185e9.13.1756818738225; Tue, 02 Sep 2025 06:12:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 26/39] hw/display/xlnx_dp: Don't leak dpcd and edid objects Date: Tue, 2 Sep 2025 15:10:03 +0200 Message-ID: <20250902131016.84968-27-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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 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: 1756818807384116600 From: Peter Maydell In the xnlx_dp_init() function we create the s->dpcd and s->edid objects with qdev_new(); then in xlnx_dp_realize() we realize the dpcd with qdev_realize() and the edid with qdev_realize_and_unref(). This is inconsistent, and both ways result in a memory leak for the instance_init -> deinit lifecycle tested by device-introspect-test: Indirect leak of 1968 byte(s) in 1 object(s) allocated from: #0 0x5aded4d54e23 in malloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu= /build/arm-asan/qemu-system-aarch64+0x24ffe23) (BuildId: 9f1e6c5 3fecd904ba5fc1f521d7da080a0e4103b) #1 0x71fbfac9bb09 in g_malloc (/lib/x86_64-linux-gnu/libglib-2.0.so.0+0= x62b09) (BuildId: 1eb6131419edb83b2178b682829a6913cf682d75) #2 0x5aded7b9211c in object_new_with_type /mnt/nvmedisk/linaro/qemu-fro= m-laptop/qemu/build/arm-asan/../../qom/object.c:767:15 #3 0x5aded7b92240 in object_new /mnt/nvmedisk/linaro/qemu-from-laptop/q= emu/build/arm-asan/../../qom/object.c:789:12 #4 0x5aded7b773e4 in qdev_new /mnt/nvmedisk/linaro/qemu-from-laptop/qem= u/build/arm-asan/../../hw/core/qdev.c:149:19 #5 0x5aded54458be in xlnx_dp_init /mnt/nvmedisk/linaro/qemu-from-laptop= /qemu/build/arm-asan/../../hw/display/xlnx_dp.c:1272:20 Direct leak of 344 byte(s) in 1 object(s) allocated from: #0 0x5aded4d54e23 in malloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu= /build/arm-asan/qemu-system-aarch64+0x24ffe23) (BuildId: 9f1e6c53fecd904ba5= fc1f521d7da080a0e4103b) #1 0x71fbfac9bb09 in g_malloc (/lib/x86_64-linux-gnu/libglib-2.0.so.0+0= x62b09) (BuildId: 1eb6131419edb83b2178b682829a6913cf682d75) #2 0x5aded7b9211c in object_new_with_type /mnt/nvmedisk/linaro/qemu-fro= m-laptop/qemu/build/arm-asan/../../qom/object.c:767:15 #3 0x5aded7b92240 in object_new /mnt/nvmedisk/linaro/qemu-from-laptop/q= emu/build/arm-asan/../../qom/object.c:789:12 #4 0x5aded7b773e4 in qdev_new /mnt/nvmedisk/linaro/qemu-from-laptop/qem= u/build/arm-asan/../../hw/core/qdev.c:149:19 #5 0x5aded5445a56 in xlnx_dp_init /mnt/nvmedisk/linaro/qemu-from-laptop= /qemu/build/arm-asan/../../hw/display/xlnx_dp.c:1275:22 Instead, explicitly object_unref() after we have added the objects as child properties of the device. This means they will automatically be freed when this device is deinited. When we do this, qdev_realize() is the correct way to realize them in xlnx_dp_realize(). Signed-off-by: Peter Maydell Reviewed-by: Francisco Iglesias Reviewed-by: Manos Pitsidianakis Reviewed-by: Edgar E. Iglesias Message-ID: <20250826174956.3010274-3-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/xlnx_dp.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c index 7c980ee6423..ef73e1815fc 100644 --- a/hw/display/xlnx_dp.c +++ b/hw/display/xlnx_dp.c @@ -1267,14 +1267,18 @@ static void xlnx_dp_init(Object *obj) s->aux_bus =3D aux_bus_init(DEVICE(obj), "aux"); =20 /* - * Initialize DPCD and EDID.. + * Initialize DPCD and EDID. Once we have added the objects as + * child properties of this device, we can drop the reference we + * hold to them, leaving the child-property as the only reference. */ s->dpcd =3D DPCD(qdev_new("dpcd")); object_property_add_child(OBJECT(s), "dpcd", OBJECT(s->dpcd)); + object_unref(s->dpcd); =20 s->edid =3D I2CDDC(qdev_new("i2c-ddc")); i2c_slave_set_address(I2C_SLAVE(s->edid), 0x50); object_property_add_child(OBJECT(s), "edid", OBJECT(s->edid)); + object_unref(s->edid); =20 fifo8_create(&s->rx_fifo, 16); fifo8_create(&s->tx_fifo, 16); @@ -1311,8 +1315,8 @@ static void xlnx_dp_realize(DeviceState *dev, Error *= *errp) qdev_realize(DEVICE(s->dpcd), BUS(s->aux_bus), &error_fatal); aux_map_slave(AUX_SLAVE(s->dpcd), 0x0000); =20 - qdev_realize_and_unref(DEVICE(s->edid), BUS(aux_get_i2c_bus(s->aux_bus= )), - &error_fatal); + qdev_realize(DEVICE(s->edid), BUS(aux_get_i2c_bus(s->aux_bus)), + &error_fatal); =20 s->console =3D graphic_console_init(dev, 0, &xlnx_dp_gfx_ops, s); surface =3D qemu_console_surface(s->console); --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756819112; cv=none; d=zohomail.com; s=zohoarc; b=V4JiNQeTHBMEkZyX1RhuMQYnmIfX8g3RKnjYMxQLU3LSlUxJkWzBQXk3ivSxSu/hIRyTd4EE5dVAoK59k0laiQY20u5TkW5sgzcGqTasuwd6jiUdpbJfgoxed/LExYWwtx1zFQwzFtsCQoinMWGTvXdWRVcARlVmB/2HHy6l9Xc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756819112; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=Z49Tz7P6VsH+8nABXwGo+kVjw04xdCM0IalzzOL0Bow=; b=ZCMaZFtD7TMmJjhSkzgfIoxS77WmUue5CshOt8ORBqD+ppuzit42BLsP03WlW/V8OdZ/cX763uPHbn2SKhrrme7370O7pnyv0xu+vHOhoOy4HLsN4UJlaMuV3U8QnmwYy5WGvQNOKXCU1EvMDZL137a5TWtahhM6eDugyCMAZcc= 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 1756819112301304.92467636778815; Tue, 2 Sep 2025 06:18:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQoU-0004ud-OC; Tue, 02 Sep 2025 09:12:42 -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 1utQoM-0004hh-Kl for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:35 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQoD-0004dX-SO for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:32 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-45b79ec2fbeso36309455e9.3 for ; Tue, 02 Sep 2025 06:12:24 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b93fae643sm44165075e9.3.2025.09.02.06.12.22 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:12:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818743; x=1757423543; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Z49Tz7P6VsH+8nABXwGo+kVjw04xdCM0IalzzOL0Bow=; b=u3QIH/knsi5/BkTfckAM0QK0+uXi7wLfPPSRDwWdY23wIp86VxaAJRKE8XOKFQIEIk HBK0RJR/nAVhDMomibrqn62RWSQT4nucEfhdwHil0NuJFR87bPQXcFy/0CMFPinM6QtV J/MmQq2ZlnR8oCAXJUws0PwgBiqAKnYHe3ehTLmfXtJqKnX0uYdzPWCMlpNDaQgXZLWM iBWPwYhHGN6GLYD7oCWp0WOZUjSbDhuXdrhOZzic4tE4Npm71y0p18KsxVkj8IyZlQ7n YEU4Oz0UMsXYTjPIijrC6LGiU+fzTg65T0dxD2Rid65dcOT1P++PGwz3bTsbq+wckEMu lLPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818743; x=1757423543; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z49Tz7P6VsH+8nABXwGo+kVjw04xdCM0IalzzOL0Bow=; b=WE99MFDiU1Ftdf9fB/B1qimcPnyjwUGcrNU6C+/WpZVWfm+j87eSf9531ndP9ijfb4 NPa+yChhAxinOEgcN1yjzmGeVXnfxbBHfuPcwc1Yqww/sySxwFTPMhwXub+CXGKxhbco c9RP3+3/PXNGsYsNsPZt8iiQqyABulc/JhhRWHa3O1Dn9U6yLTtKdoafXmHsSvzSwQAn Ew4B9Mb+TraBFBrVCwqzFxsVzwGgyuewY5ZmMgw5u/uEEsOjUvo1JpfDdKIm7QR5Tbr9 QNBqVeE24KmSCZULC1oBz5WqIhM6RgtTWNUUdO/yvzOK6c9Fjnp0k/NZPaB+kkzh8WUp LNmw== X-Gm-Message-State: AOJu0YyFWk6Bp60SZ2rsSJR8vAETjFtFCxWH82ElMdXGy0Yh84qfpU1N 9zmD4nR5RmcFOvh+SRIi9Mw6Aw/MDX0Okssj07HihAM87qikssTMC2X1+iS1Z7Rrqi88m3HFwfs cmM9F X-Gm-Gg: ASbGnctnlkY7QoB8ROq07v8FSL074SLByulJWrtTxRLNtIErPEEgxGC5S5blI2sdXYN m4MVV36UY/SXAsgv0u8SozzkLVUDk7KmPiyn1RDk/bVSqAFoouekEj1kOPt9Dm1HPTRnDcr9KvX 9NYeLzd1G26x/9BMQsGBsVDtN2XjlpaiVC9JBifEfoN+UpIkS74yfCAb8OLAN2AbxYt8Tg+8+Qn 7FqpgpllvXUcXE5Q+F/l3eiT37cLWjMVvq9ouS5WFPfWOVGbEWnlYNScDrnSwurpKqeD3QeJU80 hU45Q3OWoZnLgtfA/ckS8fMj/yBPbx170WjY6fW7e6pUuZbH/BGupPLNrwbC5qeb0sQ4Tl4TvXb OUh/oGFh+m8hZRXACZo9YPy+NdmtloQ2IlvQs+kgZUCMkmkISNAA3WlUfwFCogpdofPJ3kflLjz 5V77fBzHo= X-Google-Smtp-Source: AGHT+IHSP+3fjWLi76E1x0dpnlRRq2m6no1oxkMFpAmHrCCRBw+3FH5swBqkU7yPNa1wAkeLptyRlg== X-Received: by 2002:a05:600c:1ca4:b0:43c:ec4c:25b4 with SMTP id 5b1f17b1804b1-45b8554e2ffmr108493355e9.10.1756818742847; Tue, 02 Sep 2025 06:12:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 27/39] hw/mips: Remove mipssim machine Date: Tue, 2 Sep 2025 15:10:04 +0200 Message-ID: <20250902131016.84968-28-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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 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: 1756819114904124100 The "mipssim" machine is deprecated since commit facfc943cb9 ("hw/mips: Mark the "mipssim" machine as deprecated"), released in v10.0; time to remove. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: J=C3=A1n Tomko Reviewed-by: Richard Henderson Reviewed-by: Jiaxun Yang Message-Id: <20250828143800.49842-2-philmd@linaro.org> --- MAINTAINERS | 1 - docs/about/deprecated.rst | 12 -- docs/about/removed-features.rst | 5 + docs/system/target-mips.rst | 11 -- configs/devices/mips-softmmu/common.mak | 1 - hw/mips/mipssim.c | 249 ------------------------ hw/mips/Kconfig | 7 - hw/mips/meson.build | 1 - 8 files changed, 5 insertions(+), 282 deletions(-) delete mode 100644 hw/mips/mipssim.c diff --git a/MAINTAINERS b/MAINTAINERS index 07c9f929d2b..40fc6900829 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1414,7 +1414,6 @@ F: tests/functional/mips*/test_tuxrun.py Mipssim R: Aleksandar Rikalo S: Orphan -F: hw/mips/mipssim.c F: hw/net/mipsnet.c =20 Fuloong 2E diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 6ae69206817..b2420732e1d 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -313,18 +313,6 @@ and serves as the initial engineering sample rather th= an a production version. A newer revision, A1, is now supported, and the ``ast2700a1-evb`` should replace the older A0 version. =20 -Mips ``mipssim`` machine (since 10.0) -''''''''''''''''''''''''''''''''''''' - -Linux dropped support for this virtual machine type in kernel v3.7, and -there does not seem to be anybody around who is still using this board -in QEMU: Most former MIPS-related people are working on other architectures -in their everyday job nowadays, and we are also not aware of anybody still -using old binaries with this board (i.e. there is also no binary available -online to check that this board did not completely bitrot yet). It is -recommended to use another MIPS machine for future MIPS code development -instead. - RISC-V default machine option (since 10.0) '''''''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index 332d07e2b18..dc3d4eaa2d1 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -1107,6 +1107,11 @@ were added for little endian CPUs. Big endian suppor= t was never tested and likely never worked. Starting with QEMU v10.1, the machines are now only available as little-endian machines. =20 +Mips ``mipssim`` machine (removed in 10.2) +'''''''''''''''''''''''''''''''''''''''''' + +Linux dropped support for this virtual machine type in kernel v3.7, and +there was also no binary available online to use with that board. =20 linux-user mode CPUs -------------------- diff --git a/docs/system/target-mips.rst b/docs/system/target-mips.rst index 9028c3b304d..2a152e13380 100644 --- a/docs/system/target-mips.rst +++ b/docs/system/target-mips.rst @@ -12,8 +12,6 @@ machine types are emulated: =20 - An ACER Pica \"pica61\". This machine needs the 64-bit emulator. =20 -- MIPS emulator pseudo board \"mipssim\" - - A MIPS Magnum R4000 machine \"magnum\". This machine needs the 64-bit emulator. =20 @@ -80,15 +78,6 @@ The Loongson-3 virtual platform emulation supports: =20 - Both KVM and TCG supported =20 -The mipssim pseudo board emulation provides an environment similar to -what the proprietary MIPS emulator uses for running Linux. It supports: - -- A range of MIPS CPUs, default is the 24Kf - -- PC style serial port - -- MIPSnet network emulation - .. include:: cpu-models-mips.rst.inc =20 .. _nanoMIPS-System-emulator: diff --git a/configs/devices/mips-softmmu/common.mak b/configs/devices/mips= -softmmu/common.mak index b50107feafe..cdeae7ce450 100644 --- a/configs/devices/mips-softmmu/common.mak +++ b/configs/devices/mips-softmmu/common.mak @@ -6,4 +6,3 @@ =20 # Boards are selected by default, uncomment to keep out of the build. # CONFIG_MALTA=3Dn -# CONFIG_MIPSSIM=3Dn diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c deleted file mode 100644 index e843307b9b6..00000000000 --- a/hw/mips/mipssim.c +++ /dev/null @@ -1,249 +0,0 @@ -/* - * QEMU/mipssim emulation - * - * Emulates a very simple machine model similar to the one used by the - * proprietary MIPS emulator. - * - * Copyright (c) 2007 Thiemo Seufer - * - * Permission is hereby granted, free of charge, to any person obtaining a= copy - * of this software and associated documentation files (the "Software"), t= o deal - * in the Software without restriction, including without limitation the r= ights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included= in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN - * THE SOFTWARE. - */ - -#include "qemu/osdep.h" -#include "qapi/error.h" -#include "qemu/datadir.h" -#include "system/address-spaces.h" -#include "hw/clock.h" -#include "hw/mips/mips.h" -#include "hw/char/serial-mm.h" -#include "net/net.h" -#include "system/system.h" -#include "hw/boards.h" -#include "hw/loader.h" -#include "elf.h" -#include "hw/sysbus.h" -#include "hw/qdev-properties.h" -#include "qemu/error-report.h" -#include "system/qtest.h" -#include "system/reset.h" -#include "cpu.h" - -#define BIOS_SIZE (4 * MiB) - -static struct _loaderparams { - int ram_size; - const char *kernel_filename; - const char *kernel_cmdline; - const char *initrd_filename; -} loaderparams; - -typedef struct ResetData { - MIPSCPU *cpu; - uint64_t vector; -} ResetData; - -static uint64_t load_kernel(void) -{ - uint64_t entry, kernel_high, initrd_size; - long kernel_size; - ram_addr_t initrd_offset; - - kernel_size =3D load_elf(loaderparams.kernel_filename, NULL, - cpu_mips_kseg0_to_phys, NULL, - &entry, NULL, - &kernel_high, NULL, - TARGET_BIG_ENDIAN ? ELFDATA2MSB : ELFDATA2LSB, - EM_MIPS, 1, 0); - if (kernel_size < 0) { - error_report("could not load kernel '%s': %s", - loaderparams.kernel_filename, - load_elf_strerror(kernel_size)); - exit(1); - } - - /* load initrd */ - initrd_size =3D 0; - initrd_offset =3D 0; - if (loaderparams.initrd_filename) { - initrd_size =3D get_image_size(loaderparams.initrd_filename); - if (initrd_size > 0) { - initrd_offset =3D ROUND_UP(kernel_high, INITRD_PAGE_SIZE); - if (initrd_offset + initrd_size > loaderparams.ram_size) { - error_report("memory too small for initial ram disk '%s'", - loaderparams.initrd_filename); - exit(1); - } - initrd_size =3D load_image_targphys(loaderparams.initrd_filena= me, - initrd_offset, loaderparams.ram_size - initrd_offset); - } - if (initrd_size =3D=3D (target_ulong) -1) { - error_report("could not load initial ram disk '%s'", - loaderparams.initrd_filename); - exit(1); - } - } - return entry; -} - -static void main_cpu_reset(void *opaque) -{ - ResetData *s =3D (ResetData *)opaque; - CPUMIPSState *env =3D &s->cpu->env; - - cpu_reset(CPU(s->cpu)); - env->active_tc.PC =3D s->vector & ~(target_ulong)1; - if (s->vector & 1) { - env->hflags |=3D MIPS_HFLAG_M16; - } -} - -static void mipsnet_init(int base, qemu_irq irq) -{ - DeviceState *dev; - SysBusDevice *s; - - dev =3D qemu_create_nic_device("mipsnet", true, NULL); - if (!dev) { - return; - } - - s =3D SYS_BUS_DEVICE(dev); - sysbus_realize_and_unref(s, &error_fatal); - sysbus_connect_irq(s, 0, irq); - memory_region_add_subregion(get_system_io(), - base, - sysbus_mmio_get_region(s, 0)); -} - -static void -mips_mipssim_init(MachineState *machine) -{ - const char *kernel_filename =3D machine->kernel_filename; - const char *kernel_cmdline =3D machine->kernel_cmdline; - const char *initrd_filename =3D machine->initrd_filename; - const char *bios_name =3D TARGET_BIG_ENDIAN ? "mips_bios.bin" - : "mipsel_bios.bin"; - char *filename; - MemoryRegion *address_space_mem =3D get_system_memory(); - MemoryRegion *isa =3D g_new(MemoryRegion, 1); - MemoryRegion *bios =3D g_new(MemoryRegion, 1); - Clock *cpuclk; - MIPSCPU *cpu; - CPUMIPSState *env; - ResetData *reset_info; - int bios_size; - - cpuclk =3D clock_new(OBJECT(machine), "cpu-refclk"); -#ifdef TARGET_MIPS64 - clock_set_hz(cpuclk, 6000000); /* 6 MHz */ -#else - clock_set_hz(cpuclk, 12000000); /* 12 MHz */ -#endif - - /* Init CPUs. */ - cpu =3D mips_cpu_create_with_clock(machine->cpu_type, cpuclk, - TARGET_BIG_ENDIAN); - env =3D &cpu->env; - - reset_info =3D g_new0(ResetData, 1); - reset_info->cpu =3D cpu; - reset_info->vector =3D env->active_tc.PC; - qemu_register_reset(main_cpu_reset, reset_info); - - /* Allocate RAM. */ - memory_region_init_rom(bios, NULL, "mips_mipssim.bios", BIOS_SIZE, - &error_fatal); - - memory_region_add_subregion(address_space_mem, 0, machine->ram); - - /* Map the BIOS / boot exception handler. */ - memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios); - /* Load a BIOS / boot exception handler image. */ - filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, - machine->firmware ?: bios_name); - if (filename) { - bios_size =3D load_image_targphys(filename, 0x1fc00000LL, BIOS_SIZ= E); - g_free(filename); - } else { - bios_size =3D -1; - } - if ((bios_size < 0 || bios_size > BIOS_SIZE) && - machine->firmware && !qtest_enabled()) { - /* Bail out if we have neither a kernel image nor boot vector code= . */ - error_report("Could not load MIPS bios '%s'", machine->firmware); - exit(1); - } else { - /* We have a boot vector start address. */ - env->active_tc.PC =3D (target_long)(int32_t)0xbfc00000; - } - - if (kernel_filename) { - loaderparams.ram_size =3D machine->ram_size; - loaderparams.kernel_filename =3D kernel_filename; - loaderparams.kernel_cmdline =3D kernel_cmdline; - loaderparams.initrd_filename =3D initrd_filename; - reset_info->vector =3D load_kernel(); - } - - /* Init CPU internal devices. */ - cpu_mips_irq_init_cpu(cpu); - cpu_mips_clock_init(cpu); - - /* - * Register 64 KB of ISA IO space at 0x1fd00000. But without interrup= ts - * (except for the hardcoded serial port interrupt) -device cannot wor= k, - * so do not expose the ISA bus to the user. - */ - memory_region_init_alias(isa, NULL, "isa_mmio", - get_system_io(), 0, 0x00010000); - memory_region_add_subregion(get_system_memory(), 0x1fd00000, isa); - - /* - * A single 16450 sits at offset 0x3f8. It is attached to - * MIPS CPU INT2, which is interrupt 4. - */ - if (serial_hd(0)) { - DeviceState *dev =3D qdev_new(TYPE_SERIAL_MM); - - qdev_prop_set_chr(dev, "chardev", serial_hd(0)); - qdev_prop_set_uint8(dev, "regshift", 0); - qdev_prop_set_uint8(dev, "endianness", DEVICE_LITTLE_ENDIAN); - sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); - sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, env->irq[4]); - memory_region_add_subregion(get_system_io(), 0x3f8, - sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0)); - } - - /* MIPSnet uses the MIPS CPU INT0, which is interrupt 2. */ - mipsnet_init(0x4200, env->irq[2]); -} - -static void mips_mipssim_machine_init(MachineClass *mc) -{ - mc->desc =3D "MIPS MIPSsim platform"; - mc->init =3D mips_mipssim_init; -#ifdef TARGET_MIPS64 - mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("5Kf"); -#else - mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("24Kf"); -#endif - mc->default_ram_id =3D "mips_mipssim.ram"; -} - -DEFINE_MACHINE("mipssim", mips_mipssim_machine_init) diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index f84fffcd323..b59cb2f1114 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -13,13 +13,6 @@ config MALTA select SERIAL_MM select SMBUS_EEPROM =20 -config MIPSSIM - bool - default y - depends on MIPS - select SERIAL_MM - select MIPSNET - config JAZZ bool default y diff --git a/hw/mips/meson.build b/hw/mips/meson.build index 31dbd2bf4d9..390f0fd7f9d 100644 --- a/hw/mips/meson.build +++ b/hw/mips/meson.build @@ -8,7 +8,6 @@ mips_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('cps.c'= )) =20 if 'CONFIG_TCG' in config_all_accel mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c')) -mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c')) mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c')) mips_ss.add(when: 'CONFIG_MIPS_BOSTON', if_true: files('boston.c')) endif --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756819125; cv=none; d=zohomail.com; s=zohoarc; b=HFE711sIW4Tz4RfjqiZLQrWH8pUB3XGxjVTdm6Vq1dAi/lNFFs94TrRJrrujk/8jINwsg7tXvCIpR5xCBg7nE6V9DEI4Y2G4fovm/rR86ZArNWKwTvaVVE4swxoNOhBESOGoLPNU+Cru6jyzPq4W/nMlNP1jSe6jN55mDhTAsdw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756819125; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=v7oLK0U7kzqQPlPvNwCsAS4WO8Y8iTsMjuOMv+ikM+4=; b=CNhyU8/kcAfNcKx2mIMzq3vvvKitK2bZaWlgHaaqfowOj7g7CcrvMpDQqHtMUbzI7+A+DhsXLlCakEpkDHJWeS7kCDKw0p3xV6StJr+R4XYhe9Rvz4hvhCMXDA+Loc9+EwUjiLxhzL2WuofDV4q71e1KerCjRCRpFK0ldASueWQ= 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 1756819125340136.873066768115; Tue, 2 Sep 2025 06:18:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQoY-00059M-Rn; Tue, 02 Sep 2025 09:12:47 -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 1utQoS-0004qv-M6 for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:40 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQoM-0004ds-K3 for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:40 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3dad6252eacso266176f8f.1 for ; Tue, 02 Sep 2025 06:12:31 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3d48760d1c9sm12192482f8f.17.2025.09.02.06.12.26 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:12:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818748; x=1757423548; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=v7oLK0U7kzqQPlPvNwCsAS4WO8Y8iTsMjuOMv+ikM+4=; b=uK2Vlw6Hyl6JVZXIt3S54aD5L7r6j6T2TzXL3//gA6vywxBPn0i36UEG7fZ0QuS0bA 3pH3ID2e0zH6NpTJQaisotY5hKqcPBpqBgpA4QJJpkr7mXB0AnCXXTA2vUFeCfh0Xi3m AnocsFf5qP6osF4dsIZQ2l+8wjPuRv5jbkGQzDVFV3p8d2KQuTlOBcw9jj/plwp+t7Fg hGdtoKmoRXJjApgeay49VRpHK2OVY0IwWoorjtbA1z4zenebyEULbZVIUUVXKlEeMkjZ q6rKPlLNt6Ral9fn2TgxPOFi82UAq8Te0y4h/Q7EPQZg9i0Oiby5c0HebR9J7a2C8S10 ksQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818748; x=1757423548; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v7oLK0U7kzqQPlPvNwCsAS4WO8Y8iTsMjuOMv+ikM+4=; b=XoWpwlqSgsdDuEjH/cHgABaN8ALSVbt1g1yajRMOQpCsiunxVlHThT6FNzz3u0dq05 3EZjCgoqe0H15N34LHiqxRShC5WTeCNTAfp3d4nCcFXG5qTMRZ+/+NWLapj6WFOfcaVT VwA/b05krnrSu7ubnDCO3uoD+Mr0zqLf1mTeMGNMEd8xe4wJCawK9lDgzo6fKifNdH+u 3czJG2miTd+eRRKrsLQChZQnxiGz5SeL5udt24i4Vd/eFifmtjtnQFVsqYQugYW7/uKO dfGuzhJ99eRkvFFKSheHJjeYT84tn7DFr3Md3uyxdUseAuayo1dtHEl794cw2tcAWxWs THNQ== X-Gm-Message-State: AOJu0YyQgDKQq5k6r+tPWQlG2zBxCz3q1Nu6QW9SFlYVLZubO9aXqUfr XrsDAriucLAS+yVZYRc8Yjwi8kc7YR+zcsaK1nYxrsr10copjfiBry7w8h8G50/g4F+xyxA+Phr UkOrn X-Gm-Gg: ASbGncvEsEpqZfnTbs8VRH3IquY9E5ps4O6aNHXLUE8/OtSpMj/EujlAVVSK4rKKOxP 2VN+Q+TM9NUy8fFOiSAxlqbO6xIFqAyx0qKW+u0pEU4qtEm/II/qlsBUtbp/WT4woVGTnG1eJre +Ame6uCdXKy/755A8+A8DMnvuLgTPeKm9HM5HGlY1TI8vCNOPkym1TDjDzwyPzgu56q3ZhTh9d1 /O+JptH4ndvByRxU4fWRe3W2TM+s7Da+ExogeJ3prgVw3v+xEHK/8UEYrvGx6PwFykCwUGosRh5 truxQCAqr2CtILketqcomPptWo9d5aKIGSaaEsC8qryTcbX0nS9bI3iUKx6gUYKZn7o/LrPHppV egyzW1YueIXcwulN0TbS/lTPEctoOFyiTbc6GpJ10IwnMzm8mjIWic/irq1EIIC+eoCzWXfPL X-Google-Smtp-Source: AGHT+IFxWDQuINJFH8CQtJbicvo2ar/tdSRhQkhDAThfDWTRLDLnvKG/6tT3fy4eK58/hqu5he4DXA== X-Received: by 2002:a05:6000:3112:b0:3d1:42dc:c710 with SMTP id ffacd0b85a97d-3d1dcb76607mr9225185f8f.16.1756818747460; Tue, 02 Sep 2025 06:12:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 28/39] hw/net: Remove mipsnet device model Date: Tue, 2 Sep 2025 15:10:05 +0200 Message-ID: <20250902131016.84968-29-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.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 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: 1756819127475116600 The mipsnet device model was only used by the mipssim machine, which just got removed. Remove as now dead code. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: J=C3=A1n Tomko Reviewed-by: Richard Henderson Reviewed-by: Jiaxun Yang Message-Id: <20250828143800.49842-3-philmd@linaro.org> --- MAINTAINERS | 5 - hw/net/mipsnet.c | 297 -------------------------------------------- hw/net/Kconfig | 3 - hw/net/meson.build | 1 - hw/net/trace-events | 7 -- 5 files changed, 313 deletions(-) delete mode 100644 hw/net/mipsnet.c diff --git a/MAINTAINERS b/MAINTAINERS index 40fc6900829..fccf53fcaf6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1411,11 +1411,6 @@ F: include/hw/southbridge/piix.h F: tests/functional/mips*/test_malta.py F: tests/functional/mips*/test_tuxrun.py =20 -Mipssim -R: Aleksandar Rikalo -S: Orphan -F: hw/net/mipsnet.c - Fuloong 2E M: Huacai Chen M: Philippe Mathieu-Daud=C3=A9 diff --git a/hw/net/mipsnet.c b/hw/net/mipsnet.c deleted file mode 100644 index 583aa1c7de6..00000000000 --- a/hw/net/mipsnet.c +++ /dev/null @@ -1,297 +0,0 @@ -#include "qemu/osdep.h" -#include "hw/irq.h" -#include "hw/qdev-properties.h" -#include "net/net.h" -#include "qemu/module.h" -#include "trace.h" -#include "hw/sysbus.h" -#include "migration/vmstate.h" -#include "qom/object.h" - -/* MIPSnet register offsets */ - -#define MIPSNET_DEV_ID 0x00 -#define MIPSNET_BUSY 0x08 -#define MIPSNET_RX_DATA_COUNT 0x0c -#define MIPSNET_TX_DATA_COUNT 0x10 -#define MIPSNET_INT_CTL 0x14 -# define MIPSNET_INTCTL_TXDONE 0x00000001 -# define MIPSNET_INTCTL_RXDONE 0x00000002 -# define MIPSNET_INTCTL_TESTBIT 0x80000000 -#define MIPSNET_INTERRUPT_INFO 0x18 -#define MIPSNET_RX_DATA_BUFFER 0x1c -#define MIPSNET_TX_DATA_BUFFER 0x20 - -#define MAX_ETH_FRAME_SIZE 1514 - -#define TYPE_MIPS_NET "mipsnet" -OBJECT_DECLARE_SIMPLE_TYPE(MIPSnetState, MIPS_NET) - -struct MIPSnetState { - SysBusDevice parent_obj; - - uint32_t busy; - uint32_t rx_count; - uint32_t rx_read; - uint32_t tx_count; - uint32_t tx_written; - uint32_t intctl; - uint8_t rx_buffer[MAX_ETH_FRAME_SIZE]; - uint8_t tx_buffer[MAX_ETH_FRAME_SIZE]; - MemoryRegion io; - qemu_irq irq; - NICState *nic; - NICConf conf; -}; - -static void mipsnet_reset(MIPSnetState *s) -{ - s->busy =3D 1; - s->rx_count =3D 0; - s->rx_read =3D 0; - s->tx_count =3D 0; - s->tx_written =3D 0; - s->intctl =3D 0; - memset(s->rx_buffer, 0, MAX_ETH_FRAME_SIZE); - memset(s->tx_buffer, 0, MAX_ETH_FRAME_SIZE); -} - -static void mipsnet_update_irq(MIPSnetState *s) -{ - int isr =3D !!s->intctl; - trace_mipsnet_irq(isr, s->intctl); - qemu_set_irq(s->irq, isr); -} - -static int mipsnet_buffer_full(MIPSnetState *s) -{ - if (s->rx_count >=3D MAX_ETH_FRAME_SIZE) { - return 1; - } - return 0; -} - -static int mipsnet_can_receive(NetClientState *nc) -{ - MIPSnetState *s =3D qemu_get_nic_opaque(nc); - - if (s->busy) { - return 0; - } - return !mipsnet_buffer_full(s); -} - -static ssize_t mipsnet_receive(NetClientState *nc, - const uint8_t *buf, size_t size) -{ - MIPSnetState *s =3D qemu_get_nic_opaque(nc); - - trace_mipsnet_receive(size); - if (!mipsnet_can_receive(nc)) { - return 0; - } - - if (size >=3D sizeof(s->rx_buffer)) { - return 0; - } - s->busy =3D 1; - - /* Just accept everything. */ - - /* Write packet data. */ - memcpy(s->rx_buffer, buf, size); - - s->rx_count =3D size; - s->rx_read =3D 0; - - /* Now we can signal we have received something. */ - s->intctl |=3D MIPSNET_INTCTL_RXDONE; - mipsnet_update_irq(s); - - return size; -} - -static uint64_t mipsnet_ioport_read(void *opaque, hwaddr addr, - unsigned int size) -{ - MIPSnetState *s =3D opaque; - int ret =3D 0; - - addr &=3D 0x3f; - switch (addr) { - case MIPSNET_DEV_ID: - ret =3D be32_to_cpu(0x4d495053); /* MIPS */ - break; - case MIPSNET_DEV_ID + 4: - ret =3D be32_to_cpu(0x4e455430); /* NET0 */ - break; - case MIPSNET_BUSY: - ret =3D s->busy; - break; - case MIPSNET_RX_DATA_COUNT: - ret =3D s->rx_count; - break; - case MIPSNET_TX_DATA_COUNT: - ret =3D s->tx_count; - break; - case MIPSNET_INT_CTL: - ret =3D s->intctl; - s->intctl &=3D ~MIPSNET_INTCTL_TESTBIT; - break; - case MIPSNET_INTERRUPT_INFO: - /* XXX: This seems to be a per-VPE interrupt number. */ - ret =3D 0; - break; - case MIPSNET_RX_DATA_BUFFER: - if (s->rx_count) { - s->rx_count--; - ret =3D s->rx_buffer[s->rx_read++]; - if (mipsnet_can_receive(s->nic->ncs)) { - qemu_flush_queued_packets(qemu_get_queue(s->nic)); - } - } - break; - /* Reads as zero. */ - case MIPSNET_TX_DATA_BUFFER: - default: - break; - } - trace_mipsnet_read(addr, ret); - return ret; -} - -static void mipsnet_ioport_write(void *opaque, hwaddr addr, - uint64_t val, unsigned int size) -{ - MIPSnetState *s =3D opaque; - - addr &=3D 0x3f; - trace_mipsnet_write(addr, val); - switch (addr) { - case MIPSNET_TX_DATA_COUNT: - s->tx_count =3D (val <=3D MAX_ETH_FRAME_SIZE) ? val : 0; - s->tx_written =3D 0; - break; - case MIPSNET_INT_CTL: - if (val & MIPSNET_INTCTL_TXDONE) { - s->intctl &=3D ~MIPSNET_INTCTL_TXDONE; - } else if (val & MIPSNET_INTCTL_RXDONE) { - s->intctl &=3D ~MIPSNET_INTCTL_RXDONE; - } else if (val & MIPSNET_INTCTL_TESTBIT) { - mipsnet_reset(s); - s->intctl |=3D MIPSNET_INTCTL_TESTBIT; - } else if (!val) { - /* ACK testbit interrupt, flag was cleared on read. */ - } - s->busy =3D !!s->intctl; - mipsnet_update_irq(s); - if (mipsnet_can_receive(s->nic->ncs)) { - qemu_flush_queued_packets(qemu_get_queue(s->nic)); - } - break; - case MIPSNET_TX_DATA_BUFFER: - s->tx_buffer[s->tx_written++] =3D val; - if ((s->tx_written >=3D MAX_ETH_FRAME_SIZE) - || (s->tx_written =3D=3D s->tx_count)) { - /* Send buffer. */ - trace_mipsnet_send(s->tx_written); - qemu_send_packet(qemu_get_queue(s->nic), - s->tx_buffer, s->tx_written); - s->tx_count =3D s->tx_written =3D 0; - s->intctl |=3D MIPSNET_INTCTL_TXDONE; - s->busy =3D 1; - mipsnet_update_irq(s); - } - break; - /* Read-only registers */ - case MIPSNET_DEV_ID: - case MIPSNET_BUSY: - case MIPSNET_RX_DATA_COUNT: - case MIPSNET_INTERRUPT_INFO: - case MIPSNET_RX_DATA_BUFFER: - default: - break; - } -} - -static const VMStateDescription vmstate_mipsnet =3D { - .name =3D "mipsnet", - .version_id =3D 0, - .minimum_version_id =3D 0, - .fields =3D (const VMStateField[]) { - VMSTATE_UINT32(busy, MIPSnetState), - VMSTATE_UINT32(rx_count, MIPSnetState), - VMSTATE_UINT32(rx_read, MIPSnetState), - VMSTATE_UINT32(tx_count, MIPSnetState), - VMSTATE_UINT32(tx_written, MIPSnetState), - VMSTATE_UINT32(intctl, MIPSnetState), - VMSTATE_BUFFER(rx_buffer, MIPSnetState), - VMSTATE_BUFFER(tx_buffer, MIPSnetState), - VMSTATE_END_OF_LIST() - } -}; - -static NetClientInfo net_mipsnet_info =3D { - .type =3D NET_CLIENT_DRIVER_NIC, - .size =3D sizeof(NICState), - .receive =3D mipsnet_receive, -}; - -static const MemoryRegionOps mipsnet_ioport_ops =3D { - .read =3D mipsnet_ioport_read, - .write =3D mipsnet_ioport_write, - .impl.min_access_size =3D 1, - .impl.max_access_size =3D 4, -}; - -static void mipsnet_realize(DeviceState *dev, Error **errp) -{ - SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); - MIPSnetState *s =3D MIPS_NET(dev); - - memory_region_init_io(&s->io, OBJECT(dev), &mipsnet_ioport_ops, s, - "mipsnet-io", 36); - sysbus_init_mmio(sbd, &s->io); - sysbus_init_irq(sbd, &s->irq); - - s->nic =3D qemu_new_nic(&net_mipsnet_info, &s->conf, - object_get_typename(OBJECT(dev)), dev->id, - &dev->mem_reentrancy_guard, s); - qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a); -} - -static void mipsnet_sysbus_reset(DeviceState *dev) -{ - MIPSnetState *s =3D MIPS_NET(dev); - mipsnet_reset(s); -} - -static const Property mipsnet_properties[] =3D { - DEFINE_NIC_PROPERTIES(MIPSnetState, conf), -}; - -static void mipsnet_class_init(ObjectClass *klass, const void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(klass); - - dc->realize =3D mipsnet_realize; - set_bit(DEVICE_CATEGORY_NETWORK, dc->categories); - dc->desc =3D "MIPS Simulator network device"; - device_class_set_legacy_reset(dc, mipsnet_sysbus_reset); - dc->vmsd =3D &vmstate_mipsnet; - device_class_set_props(dc, mipsnet_properties); -} - -static const TypeInfo mipsnet_info =3D { - .name =3D TYPE_MIPS_NET, - .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(MIPSnetState), - .class_init =3D mipsnet_class_init, -}; - -static void mipsnet_register_types(void) -{ - type_register_static(&mipsnet_info); -} - -type_init(mipsnet_register_types) diff --git a/hw/net/Kconfig b/hw/net/Kconfig index 7f80218d10f..2b513d68958 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -82,9 +82,6 @@ config OPENCORES_ETH config XGMAC bool =20 -config MIPSNET - bool - config ALLWINNER_EMAC bool =20 diff --git a/hw/net/meson.build b/hw/net/meson.build index e6759e26ca6..913eaedbc52 100644 --- a/hw/net/meson.build +++ b/hw/net/meson.build @@ -23,7 +23,6 @@ system_ss.add(when: 'CONFIG_LAN9118_PHY', if_true: files(= 'lan9118_phy.c')) system_ss.add(when: 'CONFIG_NE2000_ISA', if_true: files('ne2000-isa.c')) system_ss.add(when: 'CONFIG_OPENCORES_ETH', if_true: files('opencores_eth.= c')) system_ss.add(when: 'CONFIG_XGMAC', if_true: files('xgmac.c')) -system_ss.add(when: 'CONFIG_MIPSNET', if_true: files('mipsnet.c')) system_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('xilinx_axienet.c'= )) system_ss.add(when: 'CONFIG_ALLWINNER_EMAC', if_true: files('allwinner_ema= c.c')) system_ss.add(when: 'CONFIG_ALLWINNER_SUN8I_EMAC', if_true: files('allwinn= er-sun8i-emac.c')) diff --git a/hw/net/trace-events b/hw/net/trace-events index 72b69c4a8bb..e82d7490c33 100644 --- a/hw/net/trace-events +++ b/hw/net/trace-events @@ -20,13 +20,6 @@ lan9118_phy_reset(void) "" lance_mem_readw(uint64_t addr, uint32_t ret) "addr=3D0x%"PRIx64"val=3D0x%0= 4x" lance_mem_writew(uint64_t addr, uint32_t val) "addr=3D0x%"PRIx64"val=3D0x%= 04x" =20 -# mipsnet.c -mipsnet_send(uint32_t size) "sending len=3D%u" -mipsnet_receive(uint32_t size) "receiving len=3D%u" -mipsnet_read(uint64_t addr, uint32_t val) "read addr=3D0x%" PRIx64 " val= =3D0x%x" -mipsnet_write(uint64_t addr, uint64_t val) "write addr=3D0x%" PRIx64 " val= =3D0x%" PRIx64 -mipsnet_irq(uint32_t isr, uint32_t intctl) "set irq to %d (0x%02x)" - # ne2000.c ne2000_read(uint64_t addr, uint64_t val) "read addr=3D0x%" PRIx64 " val=3D= 0x%" PRIx64 ne2000_write(uint64_t addr, uint64_t val) "write addr=3D0x%" PRIx64 " val= =3D0x%" PRIx64 --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818880; cv=none; d=zohomail.com; s=zohoarc; b=Tu3WdPobnzeJLgPt00RqNs6auKgDVtMGTSDsRMSrZsqgkjAZPD4jBx6tYQGewjMwdNvR1mSJ05k4vOUbIhFViexdAV6YDpWhqbWv2kO0aOUR2PSADDO/vyOYuGUFdXd52SpBS/3J7PBctrO2/0xx+qNDn1jhtKAySFZ7CosLL+o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818880; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=/tTBgokLUFCA34wn8/8NwWIbze6CCk78qIDAuN+F+4Q=; b=LDsOFDelrEM6bt1KbmUdp+zTAbPq/WHdKnYT0CW/evEPdUAWfVCiPTpaLio/1Tcqccwo6bVb+gSi+eybpXGQ9UDJuO+REW+0Wu3e/0xpziTznL7+vP9sGuZ9zqyc4Z8DX5nBjJ9NEdPj3VySu9YAQgSiM+NoCbpMQyxtAHZE0dA= 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 1756818880411786.0522061241671; Tue, 2 Sep 2025 06:14:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQoa-0005UT-OC; Tue, 02 Sep 2025 09:12: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 1utQoX-00056j-P7 for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:46 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQoP-0004eQ-0c for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:43 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-45b7c56a987so17031615e9.1 for ; Tue, 02 Sep 2025 06:12:35 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3d2250115fdsm14225976f8f.40.2025.09.02.06.12.31 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:12:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818752; x=1757423552; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=/tTBgokLUFCA34wn8/8NwWIbze6CCk78qIDAuN+F+4Q=; b=y+Ge5uqd1YX1VqCpWHkLNqGGLqc3hsyYRgqkJV/jS3Gli/7fyC86ChN2E1vKmFDBPV byGGnxpf9GwZ86mZ9iLxpb0BOc9dx7SPsIvbNRHesQAO0EbpF9gEBNRLUVN1tWU3D8el rXtvDHM2/FlnaJTMwv1uaoLEPshFIA2C8IStL+w5CkLpFhyDSNPC9CchPCKFD9D4QPdz LxAV8Th0zmTKoDIK325XvX05eqtDo8eN1iHE0aCaQ/nEurpNB1j6wspW7naLUhxpMSyt WalCwgxZcvqEP8RAjMv+rzRFllPD8yT9WCqm4snaXIelrlWSyT755V2/tj+wDWc3O4Xr cxkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818752; x=1757423552; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/tTBgokLUFCA34wn8/8NwWIbze6CCk78qIDAuN+F+4Q=; b=HCsNZvPyuwZmTLImYwUez+sGUKQ3vBttEpbfM0Lcoq4XEYRv7/CmwOlSzN6FlMckPW lLJ6yFmibwBZCTv6DY90TXtwzJg6Ne9E/TehlR75AI8A3Ud6BrzxHd6+WsnNg88AvSeg /KCdQZy2H1rO02qekdB7aWM2n+z3WB/SOGPLYMuR4pe4z4cxM+OFIATVR44+y+rOvJjE pYPD923arRtiE+IermDHdxhEBETA9vG1GqxgWX80FAyslUYxogYYZHEIAix1Cv6HBgVX ilnmaDv0raYIize/io4uqRbjzPJrpEWPhwOiIhSQR8w5v2g9lcW6Aewj67kbZ4LdPmkC cGTw== X-Gm-Message-State: AOJu0Yzm3qUO8J3R0k2x0mW3Zd6M0S7VGfK7EpBpcU/SuwVqnDYB24Kx +/aQPfTih30sqGKxKoh5IEy+67xRezMNoBzjLkU79vGpqjysZLkpKv2OxoKQ4VLhyVbUq28i7Bo lF2fD X-Gm-Gg: ASbGncuSYYLLHdjg7rC66HaRjP5pVWXLGG41NZenCRzGpPrt3a5FmPESrpRreYgr/uR rTCoBhvHw8oYv4LvilIxGz9s1xyMsCkxpWl+UyguNE5gyHC2SZ3V4QdPdeHP25y+8bCnBlGJ9ER A/AHdBDRQ8TverAflepRCAtCyd/pKbZnI3jEqKSkSeLlz3HGWVFBGnXSuiyKbPwUJRuHNOM4H0/ K+tPjt6G1gpgrHYHNUec7L8Al2d89746BCIyhTVnjjm6UQrEDxNwkOuSA8qwLEgWvsu1vi6C/OC fT5BcqfAImrOMn9YyhlxmyoNYTifrhClzCKVCqmLQ2FRSK1U5369myhgoiKUx/xnPAchlvJIsOj HaiVvo3L794a/RzN5SpIQ3a/c69PTvCt7Vo/v1PvXU6EFUiUHxn9qz66mdLpYNUUci+DA0CPW X-Google-Smtp-Source: AGHT+IF4szdYYcE7KGURIilZU09UIvFaAXdncnUJP0o6T+7NPGetZbThP9l6y38TU6udFeoufI5bcw== X-Received: by 2002:a05:600c:1f84:b0:45b:7ce0:fb8a with SMTP id 5b1f17b1804b1-45b8559bd2fmr93543915e9.35.1756818752134; Tue, 02 Sep 2025 06:12:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 29/39] hw/sd/sdcard: Fix size check for backing block image Date: Tue, 2 Sep 2025 15:10:06 +0200 Message-ID: <20250902131016.84968-30-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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 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: 1756818881943124100 From: Jan Kiszka The power-of-2 rule applies to the user data area, not the complete block image. The latter can be concatenation of boot partition images and the user data. Signed-off-by: Jan Kiszka Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <0d95cffa6131a06404f3cd6ef5951720ce01c37e.1756019920.git.jan.ki= szka@siemens.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 8b142e4796f..7038a140a28 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -2781,7 +2781,7 @@ static void sd_realize(DeviceState *dev, Error **errp) return; } =20 - blk_size =3D blk_getlength(sd->blk); + blk_size =3D blk_getlength(sd->blk) - sd->boot_part_size * 2; if (blk_size > 0 && !is_power_of_2(blk_size)) { int64_t blk_size_aligned =3D pow2ceil(blk_size); char *blk_size_str; --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756819012; cv=none; d=zohomail.com; s=zohoarc; b=j/2tVQMUdX5T7l2QpTrtuFc0FRu7AOKcJfe0i579Hc4vcPHcF2mnOlOUQWk+tYO7VyxL8oJKn1yoamceUC/PWGFhxBUybCrHcNCQspBLrcpsz3qYVdDuSUl0ijb6oDXif42vYtobTYkFof0OBiMJM/X24Aa+yQ/Mh/5zZdrsENo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756819012; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=BIy84W92EzHeIC7qnOPN1601x114IBfrsYve75Xfez4=; b=YxyyHJj5bLJWfXIuUFekQsBPzurD3qYXFMWaZOYQ+IoLiwIt4ykW3Zq+KPhpXJO2ff3mJPJcJOmge+4YZ/5SyrauG/eFNq+kjpARZ4mz5GRMvP0krLxRck0P9KdcfsHE1lCC2UZxXRc/G1VzkEZvjQjSH4w647v6gAn6rqJNOyo= 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 1756819012069630.0452898338037; Tue, 2 Sep 2025 06:16:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQoh-0005ku-QA; Tue, 02 Sep 2025 09:12: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 1utQoZ-0005Js-53 for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:47 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQoT-0004et-2D for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:45 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-45b82a21e6bso25311605e9.2 for ; Tue, 02 Sep 2025 06:12:39 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b7e8879cesm196780405e9.12.2025.09.02.06.12.35 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:12:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818757; x=1757423557; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=BIy84W92EzHeIC7qnOPN1601x114IBfrsYve75Xfez4=; b=p5CygpRu7zXIhv+wXJfEYEAI/PfRwPktofg9iaQHvq0Y6Lx1Wb4Iha85s8vhIDlYlh Lyz6qdLJPMbyvCnL3/U3kCN76FHnfHJGHuGx8Jly3gku6Buihb8M2hOoHTrYUZa0Enkb CI0IxnMGis2vTnszS49sTw+JB72gQT8bCfg/ezQzvIPr4f1zn0KGQ5YU4kbkXHCfypZo kWhQP1mtY/ebCDk6wjusZd5bHkaxgeoxlMZNox7GHR+j+5HJTX9n7fRvnS1NNVLlxzxf yn8WjTs6gs6rotAZcxtCZBp75inD39iu3hAj3hlS+l7S1VXgHyK+dYKiyh3AEua7XhiC ULgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818757; x=1757423557; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BIy84W92EzHeIC7qnOPN1601x114IBfrsYve75Xfez4=; b=oGCjAJQGiE2uU9Xfj7OSo50EnUY2Xepb2vbdIE1aHllsFBm2y08Gfe8ytg9l80UIBg Fj8BImlSfVvQ9hH+gGltOD1wWqM+CDvZqC4ka4JRtjr3xy9oLPmW3Jj9U5XfydXsOUpb +I1SzWDDxpKpFORmteF3H0Po17d1dKC3Tm38BjQzEkMONQE2U/+4HJTcWvRk2U43E4Hf 8x32wDg/KtVvqeaFyMMppha/xZoZl9Vx7L4GIlqWB8INL7QRuvdHRmgFYwenHqjqmPkV S5O0uyYJYQa52vVPLDpI11UHwbvZP3qJSwBEI5Rg5S0FYaZEjM8Ys5haIeFD7MhkJ0KF VCJQ== X-Gm-Message-State: AOJu0Yz6lzhneI65sQU4wUuR5qCTG20Nj8QxU38uz8cgnHJGi8BfgEEq 2lbfFmwuY2QqvWqjY4EDyqsMDubbvA2qOtFZk/aV9T1oBZGMzjd/9IUHiHSwNm8ISANx4C/6TRi kdxZg X-Gm-Gg: ASbGncuZpkF4ORekLKRYMZORVtOyhyDYvnL4S1icKsJ91LOqxUV6KDvbQoT7RsjCecL XIikNtKd2STdy57NQK8RsnQjYAcoQJ7GJVvfZBH4BPTkJbR4pcplKWJir5S9QwHsG7mIjG9MM5+ 3Asm2WJA8+ElZDbaohGPCkzpmwtg18wCxFD4pE4/WtTQRxJ2xaePLZq4mbzB1NmQ7LFUrFJE9LV Xs1Se6cdCpsNkQuQPpKDddDg/L+9R9Op/9NcUbe/9S4SGWwdXrcxjUySX42YN7jM4eQOxBldR6H O0Co833NnwSqYcEpsIv7XAj2iQwhTweK7PvI8pwjYbjsUt2/eLSnKdC2E5tVOXZ+7QMzaucqpql 1CIkOHzt3yKyru2i+956VeRpeta9WOamfTh9RBamtb1ZGJE9QEF/R+TGRVMfGufdDdPF8ypOC X-Google-Smtp-Source: AGHT+IGVi2sJyRw3VCiBclizvPXsfECsQzWYdK8EyxMLrdpPfcfSZnRRrrJFxw1qnT+6wGnwgitHhw== X-Received: by 2002:a05:600c:8b23:b0:45b:47e1:ef6c with SMTP id 5b1f17b1804b1-45b855b2b0emr89122455e9.35.1756818756687; Tue, 02 Sep 2025 06:12:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 30/39] hw/sd/sdcard: Add validation for boot-partition-size Date: Tue, 2 Sep 2025 15:10:07 +0200 Message-ID: <20250902131016.84968-31-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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 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: 1756819013897116600 From: Jan Kiszka Make sure we are not silently rounding down or even wrapping around, causing inconsistencies with the provided image. Signed-off-by: Jan Kiszka Reviewed-by: Alex Benn=C3=A9e [PMD: Use g_autofree, suggested by Alex] Message-ID: <1fff448da042bdf8cff7733ce67cadff4c540f1d.1756706188.git.jan.ki= szka@siemens.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 7038a140a28..94ec58a83e1 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -2810,6 +2810,15 @@ static void sd_realize(DeviceState *dev, Error **err= p) } blk_set_dev_ops(sd->blk, &sd_block_ops, sd); } + if (sd->boot_part_size % (128 * KiB) || + sd->boot_part_size > 255 * 128 * KiB) { + g_autofree char *size_str =3D size_to_str(sd->boot_part_size); + + error_setg(errp, "Invalid boot partition size: %s", size_str); + error_append_hint(errp, + "The boot partition size must be multiples of 12= 8K" + "and not larger than 32640K.\n"); + } } =20 static void emmc_realize(DeviceState *dev, Error **errp) --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756819207; cv=none; d=zohomail.com; s=zohoarc; b=F9/4/edzfixV10fMnnA3z3YWZRmdZ1xFTyp0PqG8eU8PUOCrIpPu3srPTf6wzOCb/SkosfZO+VUHgF4L8e9mBoMYMzkdWK+Vtuj9W+S/uNrDUBkrlqCeSntKZG9qD+UtMC44NKUKnskE8XMEo4mg7gcRNhO0IOE6IWOcTXfX78U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756819207; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=ydrW5bZ2XLFJIZV0r30kceaHkdWCHYqtutYU/gk76cY=; b=lozKyV0r/iLm+T3ROlgjyh1h8CeefnJu2DXEKrxXH7r6rUyTR0cfPLpeCUwGgXmYoQW+GUunBKrjuuKB+uOygyFFtPV7w+OdKnrvrqIJB3uxW3lOHfJqd0t5sQBxn0KxfKKSyYiWw6mtunIA+AXS3PwUXu/ytppl34zGhra2OpQ= 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 1756819207427860.2610717588034; Tue, 2 Sep 2025 06:20:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQor-0006Ad-Cw; Tue, 02 Sep 2025 09:13:05 -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 1utQob-0005ZW-7L for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:49 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQoW-0004fV-UM for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:48 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-45b7ebe667cso34871755e9.3 for ; Tue, 02 Sep 2025 06:12:43 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b7e7d23b7sm197333265e9.1.2025.09.02.06.12.40 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:12:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818761; x=1757423561; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ydrW5bZ2XLFJIZV0r30kceaHkdWCHYqtutYU/gk76cY=; b=QYZjemtocAUCcE9M0lHCwJ9M7u+kcqgQW3tWLNSXfYnbiGq6/u+Eauq4h0vPOv7Oqo DThQLx0leIUCjB6IvB+uxR4KX6sBMtVNM72lfJad9y9YA9VGnMUZmdK6dImPup1xn9Tx Bs3kElBARr1ZQBk9iBxsnMY896+QZPAWQjIdl90M8hF3cjxQuz6qXgN2xjUZoEv8LRpX YRYRpEO7mnBAs/WBb8IfDtoYw1wz+lK9DaSvGBAbck65Cxl5hw/NBfxklqgGj3MT82tJ rrAwVMiy1jTDntpPeORgHm9LCx6Onl+84P/0EUsfeSSAxYwx4kr6UxByVxN4dlkmc4jc mCrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818761; x=1757423561; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ydrW5bZ2XLFJIZV0r30kceaHkdWCHYqtutYU/gk76cY=; b=JTdgCWMpE6Ix8DIDewvuPfo336+K9i2lCBqp7b5bm5V4WbjoQUezGkTuRdZf7oCxwX RNec5s4/WVpAq1JMigLBQB3gxta9xpAwNjbT+QJG//hfPJ+iTtumkF56HYtjPEr3Fut1 uhDTqj0AV0lQFl/jkqvuafUwOt71E8wMFoSHXkZUdmOyyZEX03yRsOKrp6CWjozuWRYA HfE+DfPiy8yBz+SNGbxrfxvQpBeqQJ/HZ9fIUiCSOftEHcHowpakjGoF9In8tuKxbbRB 748m+a1h5ibsjn//RrICT9kaCC7WXrQ26lqC/HnqixR6RaBz5MwiLRxEvJpFRKP2bbsL j8lQ== X-Gm-Message-State: AOJu0YwBd9Gm4jCMuMJUcjmCYmC73YjuPEfAsGeBSswwSgp4mU/w/w+s 3bgv2eXGx6kyFKoVYXKequDWQuhXlFMy/NVvGyrP4V89mkcRZm7K5mytkc16TcXtlducTBjJJKx bLPjo X-Gm-Gg: ASbGncum0Fku+98UFUBsBk7YzumkW9qYmJkAcdNLUEJyXVq8sdzj4mtedExzTyf/IAG E7LeOK4uXVqCoXOvS6aniO8AOl5hbuDkDJgZg/RABQ941VmykoQFSQCzHB/Dc+V9/iM4ZJJv7Cb 8XJL0fW8kytEaEUKx44U6h/Yt+EytHu4fGAqSUldwtGWY6r6ZhTjgG27+nWlntcQgxS9vSxPUWW /+TNeyKjBeYynkuHaJ3cpFg5XHPpbC8lEdfzyaxm6CRqhoz9BjcbPqIr9GZ0+PdE/8gqJLrEj8W bfVzvvkIDA8oCUwQAUcYwlkjmBpHZ9E/zdAIn+4Jw/GrmiDwAoRsyJyfslWtdOXaBfx3SeHiCdL 7kU0Ub/T+Uqlu3ErWlQWut4vxecLrFs4+yu4ZpCk7b5Q1ch2TDKt96T3YvmKCPRHW9ddYmoEG X-Google-Smtp-Source: AGHT+IFAkFuUCQUquUqLOOGC44BcVdPda73TtvpFPYQRdbMBa2YjF4JG6eH2Y9cW9uTW8dc7DKXF2Q== X-Received: by 2002:a05:600c:a47:b0:450:cabd:b4a9 with SMTP id 5b1f17b1804b1-45b8557ca38mr81715915e9.29.1756818761280; Tue, 02 Sep 2025 06:12:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 31/39] hw/sd/sdcard: Refactor sd_bootpart_offset Date: Tue, 2 Sep 2025 15:10:08 +0200 Message-ID: <20250902131016.84968-32-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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 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: 1756819210035124100 From: Jan Kiszka This function provides the offset for any partition in the block image, not only the boot partitions, therefore rename it. Align the constant names with the numbering scheme in the standard and use constants for both boot partitions for consistency reasons. There is also no reason to return early if boot_part_size is zero because the existing code will provide the right value in that case as well. Signed-off-by: Jan Kiszka Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <66e9b07476aad61820c4f42f4f984cc90752ba5e.1756706188.git.jan.ki= szka@siemens.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sdmmc-internal.h | 3 ++- hw/sd/sd.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/hw/sd/sdmmc-internal.h b/hw/sd/sdmmc-internal.h index 91eb5b6b2fc..ce6bc4e6ec4 100644 --- a/hw/sd/sdmmc-internal.h +++ b/hw/sd/sdmmc-internal.h @@ -116,7 +116,8 @@ DECLARE_OBJ_CHECKERS(SDState, SDCardClass, SDMMC_COMMON= , TYPE_SDMMC_COMMON) =20 #define EXT_CSD_PART_CONFIG_ACC_MASK (0x7) #define EXT_CSD_PART_CONFIG_ACC_DEFAULT (0x0) -#define EXT_CSD_PART_CONFIG_ACC_BOOT0 (0x1) +#define EXT_CSD_PART_CONFIG_ACC_BOOT1 (0x1) +#define EXT_CSD_PART_CONFIG_ACC_BOOT2 (0x2) =20 #define EXT_CSD_PART_CONFIG_EN_MASK (0x7 << 3) #define EXT_CSD_PART_CONFIG_EN_BOOT0 (0x1 << 3) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 94ec58a83e1..2d34781fe47 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -833,14 +833,14 @@ static uint32_t sd_blk_len(SDState *sd) =20 /* * This requires a disk image that has two boot partitions inserted at the - * beginning of it. The size of the boot partitions is the "boot-size" - * property. + * beginning of it, followed by an RPMB partition. The size of the boot + * partitions is the "boot-partition-size" property. */ -static uint32_t sd_bootpart_offset(SDState *sd) +static uint32_t sd_part_offset(SDState *sd) { unsigned partition_access; =20 - if (!sd->boot_part_size || !sd_is_emmc(sd)) { + if (!sd_is_emmc(sd)) { return 0; } =20 @@ -849,9 +849,9 @@ static uint32_t sd_bootpart_offset(SDState *sd) switch (partition_access) { case EXT_CSD_PART_CONFIG_ACC_DEFAULT: return sd->boot_part_size * 2; - case EXT_CSD_PART_CONFIG_ACC_BOOT0: + case EXT_CSD_PART_CONFIG_ACC_BOOT1: return 0; - case EXT_CSD_PART_CONFIG_ACC_BOOT0 + 1: + case EXT_CSD_PART_CONFIG_ACC_BOOT2: return sd->boot_part_size * 1; default: g_assert_not_reached(); @@ -1052,7 +1052,7 @@ static const VMStateDescription sd_vmstate =3D { static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len) { trace_sdcard_read_block(addr, len); - addr +=3D sd_bootpart_offset(sd); + addr +=3D sd_part_offset(sd); if (!sd->blk || blk_pread(sd->blk, addr, len, sd->data, 0) < 0) { fprintf(stderr, "sd_blk_read: read error on host side\n"); } @@ -1061,7 +1061,7 @@ static void sd_blk_read(SDState *sd, uint64_t addr, u= int32_t len) static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len) { trace_sdcard_write_block(addr, len); - addr +=3D sd_bootpart_offset(sd); + addr +=3D sd_part_offset(sd); if (!sd->blk || blk_pwrite(sd->blk, addr, len, sd->data, 0) < 0) { fprintf(stderr, "sd_blk_write: write error on host side\n"); } --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756819217; cv=none; d=zohomail.com; s=zohoarc; b=QjnlqCT6NYi8lXzHismyYZQp1MdJf4FTjOH+LkviuQE8d1agjCYL+ERLbjzQz2StlMU+HI3XpCTShxwrHujL4SASD18kn1GWwYyLBRo9nETXU+5g8nkXDynhWeKd+GpgFHtR5SMkad2gb38P0Dr23NmuSj24p+S8J0fiZ0ubt6w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756819217; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=Cx2Ph72ijoyfFcoxY0iqeqWvvGQ7MDZ9eIBhS9a81eQ=; b=N3Hknu6d3k6GuoUQbh2YBL3rTTAPpdGg6dJ6FwVbDGzdybBUDpUKn93VyLnxgHJSXo96/C7jd4af2v1/9NG61TUof7CoUavuWFkXoqJXuAj/yGm1ItNB1A/DOatHhSrjVKIu7KvtGjLMQyDA7mSw+tH3zlfV0jpUKjp/1up5JSc= 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 1756819217633949.2886962916533; Tue, 2 Sep 2025 06:20:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQoy-0006Wm-5l; Tue, 02 Sep 2025 09:13:12 -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 1utQoj-0005q3-7r for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:57 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQoc-0004gy-Gs for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:12:56 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-45b9c35bc0aso3461185e9.2 for ; Tue, 02 Sep 2025 06:12:48 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3d15f7b012csm16517587f8f.63.2025.09.02.06.12.45 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:12:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818766; x=1757423566; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Cx2Ph72ijoyfFcoxY0iqeqWvvGQ7MDZ9eIBhS9a81eQ=; b=VNZCyNy8aSEcRKK8XMIQUjcok4Q/5tCmYzHAg5VldGn7ztT7PKo6bLRH3Al8nbTAgm EhN0LmeiXeWnanaQ87zubBUy1yqznEigfwlcL0XAo6duCmDbdetro/hT/2cocjDjspSQ gKnwf/STwcjfVRDcIBXUXp/SWRYQoEbhukRHydyellkHnNYL/aDt1AdBAuAodaeqECLU lso4sy5SrWYhjEWa0Cf0yl5K5y+HEPEpoiR6o5XYx24tt8JuOsIxeiPLeRD0BGF1ZHn5 sD51nwuTwbZ17JiDH1tfcsU4w8+W5B+/vu6cQPfO2whRe7FA0aOQkaeXUK2McMPuB/oM IRUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818766; x=1757423566; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Cx2Ph72ijoyfFcoxY0iqeqWvvGQ7MDZ9eIBhS9a81eQ=; b=oiq/bm9MchJL8BxiZTIztCOV35bFxQgc62D3J+ziRBSKc8hj9IX7S7nRAOtJLtTRu1 xlFru+y+i/1xGgDZI0tatUAYqn8nb6q7ZcKLqHW0J0ogR+t+YdDVm2uGpGYzxl41gsaY gX/r1fUol7JFONMCe+9SfNMhngp/7sxz/6vMYDUPz59zP6uRfG+PcjclVwWdiGEYRXNz Y9Syf0JLkfeYG4JKqxLH7trQ0H1oL1w3rROd3Tflwr6zt/OiTvWxcsaiI1TKqQP6MGxJ VIwldf7mSSR4n5yK7NO3j9xpYvi3DNTpQusGqZdmt2IXMElkyGJwWVOX8Yn6Qlc1CT7C XaXA== X-Gm-Message-State: AOJu0Yxn+1H2JY+36SZ+Nm1c/7L4fik45/1s34lnLxAjzeOx216DOPwO 9nhbMUQ02OcjwerIBAWP0dQjtnNeYhhCGGyh4ghCsWBEgBRedFL2nWTxYgRkHSia86m5rOHCsOF kESyB X-Gm-Gg: ASbGncu6c3MazNfYsDt2auMGpG5Y7kg2Fm1guYsN2tiy5FrRQqWVpQNu/9fWC1X3xAh GIXIaiZDhylHl+XZy5MCrpM099pL//dGHf7r3m1eD8vsVxB4fwhLwUoIYm7h0QMFkpe9QydjPnp BWBXOqzV/KdZZW9nRRxmDuw9kXbcCHjusEIpmtx/i+BYYOLnp83WF7LtvonI1UAiFfmxCkMF8EY Mim0dqkZ39hSOrhm8kHYhk8USXG9+F4QJRfPv1lIqILHZzAflxi4Lmhww/vZHEzUvLTutGU+5nF vJMxjf4V5HmyF7c4TGBJ0zaXBUoTINDdwK5FT3KLh39on1B9iYXKBMzFPbTi4yVCntbYmGhDuVK aDs4rDB6yTFoK5kLs61Uy0ID7A7BJ3z3PgcMmlN6TsjH53g7g6nJ54+nJeRzd6vLwSdEmgfDL X-Google-Smtp-Source: AGHT+IE2z8thm6jZHM1jkGiZEJ3FTu7Euh3vcRzAJyo7mVyC4xSI9to9YOIlTyqCaZolByE9OGsptg== X-Received: by 2002:a05:6000:2384:b0:3ce:d43c:673f with SMTP id ffacd0b85a97d-3d1dc5a2399mr7850647f8f.4.1756818765935; Tue, 02 Sep 2025 06:12:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 32/39] crypto/hmac: Allow to build hmac over multiple qcrypto_gnutls_hmac_bytes[v] calls Date: Tue, 2 Sep 2025 15:10:09 +0200 Message-ID: <20250902131016.84968-33-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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, T_SPF_TEMPERROR=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: 1756819220095124100 From: Jan Kiszka If the buffers that should be considered for building the hmac are not available at the same time, the current API is unsuitable. Extend it so that passing a NULL pointer as result_len is used as indicator that further buffers will be passed in succeeding calls to qcrypto_gnutls_hmac_bytes[v]. Signed-off-by: Jan Kiszka Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <2d3539c247a6c323491a3821f0e5b6fc382a4686.1756706188.git.jan.ki= szka@siemens.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/crypto/hmac.h | 12 ++++++++++++ crypto/hmac-gcrypt.c | 4 +++- crypto/hmac-glib.c | 4 +++- crypto/hmac-gnutls.c | 4 +++- crypto/hmac-nettle.c | 4 +++- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/include/crypto/hmac.h b/include/crypto/hmac.h index da8a1e3ceb9..af3d5f8feb2 100644 --- a/include/crypto/hmac.h +++ b/include/crypto/hmac.h @@ -90,6 +90,12 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(QCryptoHmac, qcrypto_hmac_= free) * The memory referenced in @result must be released with a call * to g_free() when no longer required by the caller. * + * If @result_len is set to a NULL pointer, no result will be returned, and + * the hmac object can be used for further invocations of qcrypto_hmac_byt= es() + * or qcrypto_hmac_bytesv() until a non-NULL pointer is provided. This all= ows + * to build the hmac across memory regions that are not available at the s= ame + * time. + * * Returns: * 0 on success, -1 on error */ @@ -123,6 +129,12 @@ int qcrypto_hmac_bytesv(QCryptoHmac *hmac, * The memory referenced in @result must be released with a call * to g_free() when no longer required by the caller. * + * If @result_len is set to a NULL pointer, no result will be returned, and + * the hmac object can be used for further invocations of qcrypto_hmac_byt= es() + * or qcrypto_hmac_bytesv() until a non-NULL pointer is provided. This all= ows + * to build the hmac across memory regions that are not available at the s= ame + * time. + * * Returns: * 0 on success, -1 on error */ diff --git a/crypto/hmac-gcrypt.c b/crypto/hmac-gcrypt.c index 5273086eb9a..e428d174798 100644 --- a/crypto/hmac-gcrypt.c +++ b/crypto/hmac-gcrypt.c @@ -121,7 +121,9 @@ qcrypto_gcrypt_hmac_bytesv(QCryptoHmac *hmac, return -1; } =20 - if (*resultlen =3D=3D 0) { + if (resultlen =3D=3D NULL) { + return 0; + } else if (*resultlen =3D=3D 0) { *resultlen =3D ret; *result =3D g_new0(uint8_t, *resultlen); } else if (*resultlen !=3D ret) { diff --git a/crypto/hmac-glib.c b/crypto/hmac-glib.c index ea80c8d1b23..b845133a058 100644 --- a/crypto/hmac-glib.c +++ b/crypto/hmac-glib.c @@ -104,7 +104,9 @@ qcrypto_glib_hmac_bytesv(QCryptoHmac *hmac, return -1; } =20 - if (*resultlen =3D=3D 0) { + if (resultlen =3D=3D NULL) { + return 0; + } else if (*resultlen =3D=3D 0) { *resultlen =3D ret; *result =3D g_new0(uint8_t, *resultlen); } else if (*resultlen !=3D ret) { diff --git a/crypto/hmac-gnutls.c b/crypto/hmac-gnutls.c index 822995505cd..3c5bcbe80be 100644 --- a/crypto/hmac-gnutls.c +++ b/crypto/hmac-gnutls.c @@ -119,7 +119,9 @@ qcrypto_gnutls_hmac_bytesv(QCryptoHmac *hmac, return -1; } =20 - if (*resultlen =3D=3D 0) { + if (resultlen =3D=3D NULL) { + return 0; + } else if (*resultlen =3D=3D 0) { *resultlen =3D ret; *result =3D g_new0(uint8_t, *resultlen); } else if (*resultlen !=3D ret) { diff --git a/crypto/hmac-nettle.c b/crypto/hmac-nettle.c index dd5b2ab7a19..2cff7931e12 100644 --- a/crypto/hmac-nettle.c +++ b/crypto/hmac-nettle.c @@ -164,7 +164,9 @@ qcrypto_nettle_hmac_bytesv(QCryptoHmac *hmac, } } =20 - if (*resultlen =3D=3D 0) { + if (resultlen =3D=3D NULL) { + return 0; + } else if (*resultlen =3D=3D 0) { *resultlen =3D qcrypto_hmac_alg_map[hmac->alg].len; *result =3D g_new0(uint8_t, *resultlen); } else if (*resultlen !=3D qcrypto_hmac_alg_map[hmac->alg].len) { --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756819114; cv=none; d=zohomail.com; s=zohoarc; b=mLRN/4qW04xWsHPjVAtdiQ2jAiAW0w8s3qClOHKthUNJwkmZI0v+sLwOJXzw+dvZo0mcnQfsmizN6EmCNg+iJPwETE+CV+6iTvCdrVEH2G/Ge7aVUseBm9efLddppDo6mDtYaBN6vevFfBn+z1p3hVW6lUSlmpktBRSyFNFzA9I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756819114; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=O0cgRxzdDVR3zXfTQqZdmJksGVdhvkEH1rphhF5Ksx4=; b=g8epAiXH1w3LafCjn4DzxVnlaiHdjB+4BNjW/jhXH5E8uPgvB9fTSNsJltuegA2fdXu6Vav/oe0tB1mYTkYh0oV/UOP7aJ4zbVd9SckjUkUrCHG9TNUHvVCTkNs/KNnroSqNvyLsjWhLrDwWHVaQh1jS7wYs5Jl3YpRIkxZs1rA= 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 1756819114296604.7737578666181; Tue, 2 Sep 2025 06:18:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQp0-0006h9-6O; Tue, 02 Sep 2025 09:13:14 -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 1utQon-00061w-Ek for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:13:02 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQoh-0004he-FR for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:13:00 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3ceb9c3d98cso2366672f8f.0 for ; Tue, 02 Sep 2025 06:12:54 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3cf270fc3fasm19387060f8f.5.2025.09.02.06.12.49 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:12:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818771; x=1757423571; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=O0cgRxzdDVR3zXfTQqZdmJksGVdhvkEH1rphhF5Ksx4=; b=IDSb6cnIB4fxQ3lEwYl5ptutAkLQC2FpXINXYsc+1j3gfOCx8v7NDYfx4zF3tbf0Lj VRBy+tZF4tc62ag1Uk1zl9a5daGRfCBVx1pmQNXu98tm/lpaD2UaQtwylHqwK1vQWvjn W33VZ1EqpZ3yyW7dJGEAwIMgkZsVXXnlpA6UF6X+VqjCyEmOmendrLDrsfgLPNMwSpix Qky8CylnDX01ov0ICi0/G6B4/96JRfCIiGW0qKi5dHKO8wSdLdjqCoOVNJIA8zVrEDYX 9HSaYD0xzHxLThKng8SuURIn0W6ZYnHZ0Op8mIMuCZ2zUSN0ip6a577l4wo4frpr4eRG Xerg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818771; x=1757423571; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O0cgRxzdDVR3zXfTQqZdmJksGVdhvkEH1rphhF5Ksx4=; b=E9gn9v98qB78yuOLolOcSSsrO4E4+CSjtr21nD5v40m/j2+DO0A92g329neSa9ZS+b O/GOTOgy0KGtyxGbi+cV0d4cf5L8mbHQ/meJ/bQydakPbF9jHTbnMX+19usStKNcdfhH CgHlkN5eR0GfRw3wteYqXSIQr7FQoUbTg+2BGKUV2uwd+/rHRouNVEdQnAMOUPtJOjWZ AnTW1by4IBvc49Kj8WKKvS5rvmcOADCKzarMgDIiMCFN3SM5eckUqSQpznPU6c/SKDiR HSmW+GQuMl0FHPQXvOePlTjrxT7NXSzG03L1ymtlgq1uPgSATad3jEs4AdePR/EcUkaz JIZg== X-Gm-Message-State: AOJu0YzCQTo/pqrxztRChbl0gxf9WfrVTpNFvkVkpK21zmCnZUxft5fD GdkdvGN2UNWSoHBwsUKlXgvHEpPKLIAgs/coFjATKbU8Fkcl00Lz8yRPpjBAJaPGpuUt8CqF+lH jFEZW X-Gm-Gg: ASbGncvn04Xstj8v2Zd8KdPW6ajXv4v6nm2b04hd/sAURV7G0pj753m6fw4yYjMdS3H +FAN/GbU6URVRK1+dtvLJuhJ+L9ALQDhMVKfofrH7ImHToftxQS6V/3uoZ9241LOTDy//xDJzFo hoH8jDRZI3A7sDSdu0nQNdkK/aQdiV785Mpc+CXkrY7ReD19VlWsdZDLqNRDb6l5wRgw9sm1lNk nvQo2BQ71qPl/D9lcnlqJx9DujcMnqXHdvXtE0K9D12hvGWDilc6DDiqP+xvFAudJz6xYfaiGg3 27+QgMKEaBNQPfKq8a4Q3K2JTK8EVdDShN35Iqy7e/WT8dRHTQYgZYPr+thaGrUWhWQkNZJcUWg YMPiQZugY6q+VuZSvrelonGsuvJ6tw+fKl/PaV8ti3uTJKIHq8keeUUXGhgGZK4Xr1Mh6cmI/0X wyOMvdls660lJ9dBG/rg== X-Google-Smtp-Source: AGHT+IGjSqVpRr9cgIrdKLG1o60VgwbQir5TgdJSFZnZdDPragq9wy5UxSBZhHjrvIv4dQh+N/Iqgg== X-Received: by 2002:a05:6000:24c3:b0:3ca:8031:4b38 with SMTP id ffacd0b85a97d-3d1d99cbafcmr8816551f8f.0.1756818770547; Tue, 02 Sep 2025 06:12:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 33/39] hw/arm/virt: Include 'system/system.h' Date: Tue, 2 Sep 2025 15:10:10 +0200 Message-ID: <20250902131016.84968-34-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.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 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: 1756819115119116600 From: C=C3=A9dric Le Goater hw/arm/virt.c should include 'system/system.h' for : serial_hd() qemu_add_machine_init_done_notifier() Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Link: https://lore.kernel.org/qemu-devel/20250731144019.1403591-1-clg@redha= t.com Signed-off-by: C=C3=A9dric Le Goater Message-ID: <20250901064631.530723-2-clg@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/virt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 1e63f40fbec..e5c4142e822 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -50,6 +50,7 @@ #include "system/kvm.h" #include "system/hvf.h" #include "system/qtest.h" +#include "system/system.h" #include "hw/loader.h" #include "qapi/error.h" #include "qemu/bitops.h" --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756819010; cv=none; d=zohomail.com; s=zohoarc; b=MWeLEOQpP9OT3MMhPpfx311h3Gmkmd8X0GcwRY66jDTlYH6ELeMp08xGmgUEx+LdxcgwrViQBspw2jt4D9zqvQoUTOljqhHP2M5bo446+aZ0Sbk38jK1I7B7ioPMFcBtUHLWjPZEAJqLertChoNrQCPV2TNklndhx24c+T4K6Iw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756819010; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=CSauTEkJuBQj4RaZCh61biRbjc/d+KfBt7h34CfebkE=; b=R7vExTF1Zl/cnk3TDCas9sT638NynJmj7kBd1+kK1ISGeE2sKCQItfhSHo9PVmXwdf5LVUdHb/NXC/x9mnUO785s0vpq7qIM/Uf6CwTLpoVgsWGGMV1dZvIpd+VlyG3O3uFwo9YUVmCPPQpRaZuUnXQYfWYc3KZVQe3hJMcSuxM= 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 1756819010470569.1899554617299; Tue, 2 Sep 2025 06:16:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQoz-0006XE-0u; Tue, 02 Sep 2025 09:13:13 -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 1utQou-0006Ll-Kx for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:13:09 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQom-0004iE-8u for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:13:07 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3cdfb1ff7aeso2654366f8f.2 for ; Tue, 02 Sep 2025 06:12:58 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b85090262sm148145725e9.17.2025.09.02.06.12.54 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:12:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818775; x=1757423575; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=CSauTEkJuBQj4RaZCh61biRbjc/d+KfBt7h34CfebkE=; b=mw7u2XmWs3VZ/Xyscan6AaKTPUGPF0W9+Mc4BaDW/CG3Cuw+rqmVPNdJWA0ePt4pBq AKpmMgdJjo4NKX08l/1bme8Dk/+P3rBCSH+LnEH4KupTQIkKL+M9JALNArG/k8paXjHM HPuPDMNpT6qu4TwfGGYUdq21GRsYrtob8cjFhLE5SUKQIA9IEBgd4U5+Ad7Z6GFACkag gFe4mVbCimsM/Tkabfr3Yska84XWi486qPU5Axs04EhpLlPnfbh07HMsKiYVfDURNMhS E5V+0GTRf2GP2+wxbxKOySgchjz3KL1R+raFx1MXRNSh8LmSFym4Nizk15QXv5aNt/XU nb2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818775; x=1757423575; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CSauTEkJuBQj4RaZCh61biRbjc/d+KfBt7h34CfebkE=; b=KxlRDlz9od8MwscLCiGb2HMZd2DxtQkhOxajSAz1Xt7j/LWTkOqvSDnQY/5YU62sIP +BOMKJ3XxtvNlrgB2WW49H1ah6LW3l8netlFj+EV3W0iHsLc7hzVlLLRLe2eKZBjfaqP JdAoe6JUIE3i2F9NPL6t3hIcHXssstCaIYSkQkDMaaF6jmnDZNhDdYPMUAgCtE1kkDU4 cry1M7g3cVkLEMj3jB/FRcijCqsz+efcb/1SduR9G6hTXk1gSTNyhmjWmuJwqmIi41r2 B700nAic1J0JHj+QuWELCv3ClfxTxCmBAK1zF9Om6KTAPeRA6LaSkz2LO/Jd5XOktd0N oaKg== X-Gm-Message-State: AOJu0YxM3ATkwye7N4wtMFAJEnPS+DYbW5HUZC+kqugYeOXRVi9GP3VB 55UMMo//cO2A/F2eh1hFudzZSktZm6AG/vzhpAylNteaZpxhrmvR/Hlxl6SvtRWRTFON07+q/U5 TA0h3 X-Gm-Gg: ASbGncufUlG+EfwRyQYZAAzqoi24bXaaF/RYbb3Ib2yjeE/dLIuXbR+k0nkTLIXCmIR M8yG7hDJp7xBq52b56tTP+e60WJPoLkU/XKpURb5kHVgaDqV1X4anG2SE1l7HIo8K5Vk5g3oCfm nz+Oqwg6+ySi7xSpCaOkmeXAA20NV4VSRk3pIZ6YFFQYkyE87iLH/OHM2gDXNO62MktYmZ9jXcy aNfbYV3iYWTBT6CXKCWvqmq7zWv/oyUBstXyd26mFYKU5/O7kEbk7UTI+W//ApD2KWcYX+2HXmL uSAapGikMVDpkSZOmyy0NbDdiFTW0WiLDhJV3zAomdNVsfs7uC79JMC3M012m29SOZ+jN1XiQM8 KZEzNYw23Kd22OF5s1lbEF/x7aEzUtwHGEmgVKJpL5eBnKkJ6+A/LET020TAyhNZM9nWc3fgNqy 82NTNHMFo= X-Google-Smtp-Source: AGHT+IEvwSCvG86AgZ7MCOhkyVCPJ1/Fv3FaTB1LBBmy4D+fzt6U/X5Xz0og05khw27aTIMDYEZA9A== X-Received: by 2002:a05:6000:18ab:b0:3d6:a2d1:8ea4 with SMTP id ffacd0b85a97d-3d6a2d192c0mr4697000f8f.18.1756818775130; Tue, 02 Sep 2025 06:12:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 34/39] hw/isa/superio: Include 'system/system.h' Date: Tue, 2 Sep 2025 15:10:11 +0200 Message-ID: <20250902131016.84968-35-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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 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: 1756819013368124100 From: C=C3=A9dric Le Goater Files using serial_hd() should include 'system/system.h'. Fix that. Cc: Michael S. Tsirkin Cc: Paolo Bonzini Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250901064631.530723-3-clg@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/isa-superio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c index 2853485977c..941b0f91d75 100644 --- a/hw/isa/isa-superio.c +++ b/hw/isa/isa-superio.c @@ -15,6 +15,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "system/blockdev.h" +#include "system/system.h" #include "chardev/char.h" #include "hw/char/parallel.h" #include "hw/block/fdc.h" --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818955; cv=none; d=zohomail.com; s=zohoarc; b=JVhOu/UWYcaB/x6VB9gwpIorYLNlIAD962cHfXcKLYGFYi6k35e4evbpd+t3qKpNhIS0YsU0I12M5w8AB/Zr0xxMThWdi7pJd8fxwV1VME/tCG1VzS+Obb9Db5bsgWbQ2lmRciAmgRbtaVbno+2ZsScItff1fB0YDwg+r5KFl3g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818955; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=hjwcUJJSQtOz70iFspOPdXzaMy4QJRp2F0LsGT4wN/o=; b=CYpKhdz7O5V0TogeylCaJ0XnsOqlvCbPEruGGk85UZ+qL/TC7K+3Dkaq3PsejXIRRNy21M4hJm8kmW2HtF7dbJ+WCuU7D/1FO2VkWDGcsU1llxreXzMUUdLeSO5+X5iqPB2ivjkcq3NeZe03fFC+IiPNR+lqf27j5BZmjChqq5o= 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 17568189559571000.392530555823; Tue, 2 Sep 2025 06:15:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQpB-00071F-Ar; Tue, 02 Sep 2025 09:13:29 -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 1utQow-0006Rs-8W for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:13:10 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQop-0004iq-Fk for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:13:09 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3d1bf79d75aso1081484f8f.0 for ; Tue, 02 Sep 2025 06:13:01 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3d66b013b7dsm8869318f8f.28.2025.09.02.06.12.58 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:12:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818780; x=1757423580; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=hjwcUJJSQtOz70iFspOPdXzaMy4QJRp2F0LsGT4wN/o=; b=ZteowRP+xVco5sMfKwFUWVn0dj8ZvucPiNS4DApHWAFJF5jyPv08dKX0JDLM3BXdfb 8gItc4z76H34gLWLWqy1w17FMC7NTrK59ErQCftCrBDdOycUedv2oLn/hm5jYLRmsp/U ih7OLnWavIFA9uWB3znRkfxBM/tVmfcMrmyaT+OnKpfxRxC37sPmSiIsa4KE4zo1hF7s hzOEP8Gb7dtq3ZJp2yEDzXnCrWv1iz+ri4aCa5gw8lBAS8BI6A4J2ypvUjNw/EDnggZZ uT9Eh3iibEtpnl/LWKePxL8e+kZr/d6cCxho9njdgCg37yJX5p18o7AY67zwb1m9pe+y JL6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818780; x=1757423580; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hjwcUJJSQtOz70iFspOPdXzaMy4QJRp2F0LsGT4wN/o=; b=fwToschVrXvudID5fLUnWjkq0WTjDQb3vf4cXD92Pj2zQsI0bK1ATI1xJ+zs8BeJvQ 5sptCD477NNtrbA3PTy2XZwbIXRenRJx01zv1tpPC/ECBhh1/ecOk0aiHqAxLusmOckf SyCTPdwn9Fd0Bn8tVdjAwSNkOIHTnixFam6p4vPIDACveNnPPh86RNY7b776cxnDiwV+ TfQnRBj4WL9dT/ukspmlP9AT3kC27mhtUXwKzvRNHONFGoa9pVvuHDWio+sFrsq9JWIn BRiJnkrNxnLdEeS5TWhaDdLtjGMdSvZLY4tflaBZXhIutWY1NjcDP5MxpcCZna9u/J8e yvgw== X-Gm-Message-State: AOJu0Yzp5Y7L9QAOhcw3hsVic5JevfrlJoO8cCTSJxgoShXppMCE15oQ hLYvdsFgD5HdpG1dI+NHfQzOLXoHDbydzaaXkSxz9xPvzrbScVPIq7TQ9WOHuf1W/Zpo5tDS/Gw 48Kqm X-Gm-Gg: ASbGncup523e+F8imz7vhr2gQtnIAnThXo6OfsVlCysmM+HwtsZQn0LEajQFd3JM3gp XwYwyi4/T9kcczUlfNzn4S/JmcXP2L1boRpnAC+zmxv4C/aIOvXKO2tSWEd+Fwg9dmq0LMKtr5Q VqUpJNXB+YLv0ySK7ht+ThREREG7xdYYoK1Qsvq+rIp5RK2r7KNVfzqQlkCaBkXCbhojJm5Dv6b LIwFDk2lB38chVnmdx8Cac56F6SuP50CtFfLXW5xLsKVOWTea+im334vMYfa7aLzeqtv0wPYIzE xKzKAyw38DF5kTyBCSG3R3iVHZMRC9MHn+4NJFNTFshdeoHuTY4gKW+cRZCdSOrxCZv/o09hvq0 j+ZeicQdtOERitzArQk2hV51FZp/KW2TaL50agrwnF1ndr2MG4taXTg5mtbRW5SaML5cD4IY7 X-Google-Smtp-Source: AGHT+IEWSZZBSg5pdiHeBdLAVFpObgfQwoGLF+6h6hXg8I3pakn+V4Bb/2G0IHMVTLRMbQQYDP+JFw== X-Received: by 2002:a05:6000:3110:b0:3cf:ef30:c819 with SMTP id ffacd0b85a97d-3d1dc699e64mr8347574f8f.4.1756818779794; Tue, 02 Sep 2025 06:12:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 35/39] hw/mips/loongson3_virt: Include 'system/system.h' Date: Tue, 2 Sep 2025 15:10:12 +0200 Message-ID: <20250902131016.84968-36-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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 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: 1756818957529116600 From: C=C3=A9dric Le Goater Files using serial_hd() should include 'system/system.h'. Fix that. Cc: Philippe Mathieu-Daud=C3=A9 Cc: Huacai Chen Cc: Jiaxun Yang Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250901064631.530723-4-clg@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/loongson3_virt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c index de6fbcc0cb4..672083dec98 100644 --- a/hw/mips/loongson3_virt.c +++ b/hw/mips/loongson3_virt.c @@ -49,6 +49,7 @@ #include "system/qtest.h" #include "system/reset.h" #include "system/runstate.h" +#include "system/system.h" #include "qemu/error-report.h" =20 #define PM_CNTL_MODE 0x10 --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818868; cv=none; d=zohomail.com; s=zohoarc; b=f1L/VPbYV70u9Q2kdR7NhYA4dCbDAcjq2q8IhhZdFRffuypT2L1QaTTG+/eWECG3O40sVjcjNg4b6CznjNsdof9VmkkIaZrRn+4tkjOJsCQORfqC83rCEZ+nxuEFruNGvDVnbhvP2rMYRj7HK5ERN/Sc17NpDXPn0OSyEquUtig= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818868; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=NGqxHDZXqk8C+oMKaLUoVk4ghBJAywHOZPex4RT6YEI=; b=WPHL9kWLpAJI5BqrGUjkW9ccSuziG6F49/c4Yd8CdQQE4kEDgpQwNBl6eOAUE/hURjQGM664CsqJND2F2h7lfDTas8GTT+Bq5xqje74jsFA9rvMOTQf9uqnx9xtMbQ+uoLADtwTPYbW2jMKvq5I97ChbiRo6sspPatNJsvVHF/0= 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 175681886875824.659263737126935; Tue, 2 Sep 2025 06:14:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQpO-0007Q2-61; Tue, 02 Sep 2025 09:13:38 -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 1utQp5-0006x7-Km for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:13:21 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQoy-0004jq-Gz for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:13:19 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-45b7d485173so33677295e9.0 for ; Tue, 02 Sep 2025 06:13:08 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b7e8ab14esm214282885e9.21.2025.09.02.06.13.03 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:13:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818784; x=1757423584; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=NGqxHDZXqk8C+oMKaLUoVk4ghBJAywHOZPex4RT6YEI=; b=QEpcjAxst5cIS5OCN+0FbJdpTmlJjOk7VJryCxkbJgR0SkDxWc+aFM4YQhIXEW4i+X IGKUJbe5gQavQ5vNSG89siQFPWfj89oc5kfsW5V6jeinNY471XypH2HeHoRJzWKMDWo3 jBD5ScmFiKHECe77fvOcDAcgkBZSUyHE2dKuJ084ncS/vETzIn93xXUhrKJeVUsGUdo/ yaDo3p9UEXUmQD7dN0fc03D27wz1foOO/Hweo1PQRRy2F/XzuiP0FgQUi6UaJgO6XOKF Xr6Ny0m4Jsd7UgP0xoDAl94iTW3VSwijIx16tiVT21/uLbXfLTgVDmqxBHsXK6tjQ/gb lM7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818784; x=1757423584; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NGqxHDZXqk8C+oMKaLUoVk4ghBJAywHOZPex4RT6YEI=; b=NxrlZ20kCZd0PEQnmK3yDcz/UFj1inVk3Xd227/UYjlXYujCp+F5wU+F8giNUVOxun zcdOY78heRdOEgQd+eZ8c26NOZmZAQ3VF8pbPi8PckodHatWvt7ejU+S9DVyeat94tSA zZ7G6OSblt/0osmAr3yorhXgg+romh2CBQEwKc+ug9N2axu2zp0LhI5edLe7VS9ubWKe YPR7AqusCDxUsij9aVduURCui324wc9/nj3X4O16CgRqOlEC3gA39jSN4dUkUa5gwBQr M3o5jF0ZuSMPneOCUTAbVOYXQvCxe5QGKvutnA1BtoHhFZNbf/LhFs/XNnAzTfRXKMrS uCkQ== X-Gm-Message-State: AOJu0Yz+KB9wm04USqbNQIaCD/aUSxs1yj271bPx7D4Xdl4DV7IRMgrO QbqVMIEpczfOUFWD7NPAiFu/UNApe4sDw10LeyP34AMaCLwkv4KDb48ztqrnwo7qt2j2XPSAGZu oMVuV X-Gm-Gg: ASbGnctptE3LpaBu9NjcltSxc39fXv8lTRc7tCxN14y1mtlcGaPRwNWgUQ0yso9bnah 976JdKp5VSlre93voA/QLuEI8rieCyYEl90rCJXVX1VcuUW3AE4IJv9/91Z/QJLZ9JUEun6CjJu 9Wj6U4inCzZuTid/xHctC10avVz4cFDAjBtDgf0jA1RyjTA6bxdtQiTcpqZM0lf49hNc861bsdN MjI3SDDtijGk8UuYr/DTxCJJRLnj6pvEcRl/gJNeb2tNhva8pHSLS0k0u/jWafg1Y+1uaYrhlTy mx7d57Y/JjGlRiaey8OsSoYwE+Eo0NsnU/jiuscghQ6qm2EnWGfesFjYkechsFvYcdluDeSQmjn o/EnvQA0AELuiyroe3Xny2Y0nCjLXzQUc57YSOm2zHCxBL6bZa3Q/Fvw95n1TlsntVM50VbZD X-Google-Smtp-Source: AGHT+IFhs4prCBDZxeoCadH1HaPY0Cfw/VTV2zYfVHZ2g2jqdJJDu8Q0Q0DRRW1fhU2K7Va2cDAojA== X-Received: by 2002:a05:600c:474f:b0:459:ea5d:418b with SMTP id 5b1f17b1804b1-45b85532b10mr94140325e9.9.1756818784349; Tue, 02 Sep 2025 06:13:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 36/39] hw/mips/malta: Include 'system/system.h' Date: Tue, 2 Sep 2025 15:10:13 +0200 Message-ID: <20250902131016.84968-37-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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, T_SPF_TEMPERROR=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: 1756818870189116600 From: C=C3=A9dric Le Goater Files using serial_hd() should include 'system/system.h'. Fix that. Cc: Philippe Mathieu-Daud=C3=A9 Cc: Aurelien Jarno Cc: Jiaxun Yang Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250901064631.530723-5-clg@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/malta.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index cbdbb210568..344dc8ca766 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -52,6 +52,7 @@ #include "system/qtest.h" #include "system/reset.h" #include "system/runstate.h" +#include "system/system.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "system/kvm.h" --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818956; cv=none; d=zohomail.com; s=zohoarc; b=lQ1zFe42smwXKLaZnhOND8aOOUY/vjlk/dJ0nbMLC5BCHoC6tM2U+Eeg33MFPs/VSt7RMfqsgrSMEvL8ziZCC4e1rr0dL0RSyHHGZGDiZFXZgwJWlTIWSAD7tkucfKRyDOBkTQUQ8TVav0kGoES2JCA9qx1IQ1gUJ3eKVo+B28M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818956; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=xaWoWdLQrpe0mniNwXuP/Tmf92jerlSeexVJq+GCDFA=; b=RvRdSxjsKdH4Tts++rZd6i/aYarvbIiMJQv7ODPr70LonR3z1rqGgfZd9GXjkVqTVU7qkcShUsyuiKj6ogRxxk7zn1crrengBSw8pN4QY4Vf+FPHH/rRaqA5qk3Z5Z7Xl6Vzn0ykYtG0f38s+kQZuPLbkWgHf966Q4V6la8IfkE= 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 1756818955998494.1755595827908; Tue, 2 Sep 2025 06:15:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQph-0007dC-SN; Tue, 02 Sep 2025 09:14:01 -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 1utQp4-0006qi-5W for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:13:18 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQp0-0004lA-Lb for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:13:17 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3d48b45f9deso1588398f8f.1 for ; Tue, 02 Sep 2025 06:13:13 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b98e77231sm26125375e9.12.2025.09.02.06.13.08 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:13:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818789; x=1757423589; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xaWoWdLQrpe0mniNwXuP/Tmf92jerlSeexVJq+GCDFA=; b=Ol4FU8LNdixk0MyEr3Dmm/Tmr1DSFugVN93Sm4mS2Ap3cZUNcHnV91qs5wog0jbap/ SA3ple5a+r0t9zNyeZ5alRYCDIZOsrr+q2OLZhoJ2JNApeiTEM2UWZnK1xGId+I3YhqP 0Ov5hgOykEANXxNHAqQjkEA19OcbwmhHJNo19OR07yepgNQ1NWtFTnaPzvQAOT1LRqdG REtssLNkRkjs0D4GXrfKjo5rlSF9roYeXn/SNQYu5w9wYnQ4EdRsEKBpkeAqWKSFDSlV GN4tsy0BPe3Ayz4kTg/E3kp7A1KxZe3doLsyNcJ3/8hU3w99W+u2BEIP2hefGmYZ7T99 z9Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818789; x=1757423589; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xaWoWdLQrpe0mniNwXuP/Tmf92jerlSeexVJq+GCDFA=; b=k5NPKAgKIMBKA/Ug5gCLO+AdPqtt7ENyvo49jMg/pzcoFx1qPc9R4CZ87rP6wCx0pf /UEnTBjRJgSUktQJDl1JlmE9EnxhMNtQIc7lB89EdmLH/8TPukbcgiBUtq3xdlIWH5IS xRr8VG6rT84jJSH7tdCL+4GutgPw0ZnRT9xtDhqhAQJX37DuDxdyeisFvoFyslHEDkEO XxBl5x/Oy/6Xjk8KMcRP1I1A1AfJ6sO5SEr+FKTknofPv44qd4yw03rCSqG+954Tznx5 NPSyl4QiFnizdfmRuFxvwQo9OhhvoeoD6thDS9OPRHjyMnbNL7Z7mLBQEolDq69jAi2/ Rv6A== X-Gm-Message-State: AOJu0YyvsDOncEDRRin2y5rxIj23rXoWYii/ynLiGjBi3VOJDqL7tGQE 5IIjJPirAamKAh+m1+ojm2DUBkxGba+kSIRJWs9D2oHLb4zbQ94QBzrpNeAzk28tlWs+3k7lolP l1tEk X-Gm-Gg: ASbGncuW6mIL5WU+czw1hLX1MVlaUdPzDeeF3CrtARscgT1rKsWhS3f8Cwqw41WPgWR tmaLYfN4nY8v9EXH8su22cV5x0ti4B7tBg2w1l4yYzorGNDC9CuHi/4guZoomHt/hLePOV73Z9k IUZfsXPnWK1pAUVLZztlOOvQqP7B70Z69ppsUamOgVA7EgfSnGSo+5ScLcMl7Jm78WrgwCMVp/B powlkVRaU/32bWZu/jXSwtt1qImzGYLLsiANfwyWl8oiPeowQMDRKTfILJR5sVZUY+EK9nKG6Et JiA4tce4Y3dWO9vCQjP29QG4GRoDxQ7CpU2stfaYcOBrC7qT+CNAs+fwy9wun2nmAB5YF/Pat3e 6rSlh22PEb0XgtVtYBfWlbKKRjhpD2pC3tRoSqjVgaBWaSApjOxylC8oAMcUaFMpEELDkcbf68G tm3I5+lPg= X-Google-Smtp-Source: AGHT+IHI1EHQZcEe0Ms+4p+t4sstp7z4I1YT7wqq2a70iGy1ex83HqNaubJrzfoldATNh7zkuojQ4Q== X-Received: by 2002:a5d:588d:0:b0:3c6:97ae:a574 with SMTP id ffacd0b85a97d-3d1dcf57b65mr10208453f8f.24.1756818788955; Tue, 02 Sep 2025 06:13:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 37/39] docs/about/removed-features: Clarify 'device_add' is removed Date: Tue, 2 Sep 2025 15:10:14 +0200 Message-ID: <20250902131016.84968-38-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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 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: 1756818960771124100 All other titles in removed-features.rst mention when the feature was removed using "removed in". Use that instead of "since" which we use for when a feature is deprecated. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Markus Armbruster Message-Id: <20250901113957.17113-1-philmd@linaro.org> --- docs/about/removed-features.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index dc3d4eaa2d1..fff781d6b7c 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -730,8 +730,8 @@ Use ``multifd-channels`` instead. =20 Use ``multifd-compression`` instead. =20 -Incorrectly typed ``device_add`` arguments (since 9.2) -'''''''''''''''''''''''''''''''''''''''''''''''''''''' +Incorrectly typed ``device_add`` arguments (removed in 9.2) +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' =20 Due to shortcomings in the internal implementation of ``device_add``, QEMU used to incorrectly accept certain invalid arguments. Any object --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756818976; cv=none; d=zohomail.com; s=zohoarc; b=P8Xx5v4cRMyyWDxXmR2okzXnHHVTVZeC4XT+ICnForGEl1fBgvsOKzgVUB93J9afuAjCGNpXiFMno4qunbVk+WlRYuNicZITlOJjQK7hCEIEys4B+WN13jd/YCThDMJBT2m3yOHXONXODh27qw2oWSlSrnKLd5h8ATUJBoHW8VY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756818976; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=JgIF6lWD9SRkfbI3l9bP2fZjIYaJ7QJ0dnxofnv7srk=; b=aJsHZE6qhReriXakmnrzqlKBd0npcJGj8NKItS1g0vFCSnxm3rG5JoUNjHAqlGBPaiXONJHDvsHE7JwhAtn/oxU2iiw4ebnjKOhjqIymmewpyI43I8Pjr+MGB3nJnFRcRPntaw3ZAut+njlQYe9Z56qSFiEcMweOLHI0OmuTIEg= 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 1756818976618200.4526322239858; Tue, 2 Sep 2025 06:16:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQpl-0007g0-7y; Tue, 02 Sep 2025 09:14:03 -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 1utQpC-0007IW-NJ for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:13:29 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQp7-0004mW-EK for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:13:25 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-45b9a856dc2so3420885e9.0 for ; Tue, 02 Sep 2025 06:13:15 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3d60cf93cb2sm10701682f8f.12.2025.09.02.06.13.12 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:13:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818794; x=1757423594; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=JgIF6lWD9SRkfbI3l9bP2fZjIYaJ7QJ0dnxofnv7srk=; b=eey1Bxzx4c12DhxcqYUm8caRF7qmGM/qcI+bF+NWczk0W5fFeTCLXFHmAi5sY33/TI 9uQdwE3aDVr4mmH8nDWvfCTqnYYGMWS4NHJ1xPScIljRb27NA/pDwPwqHiuvF7E3Zsv1 v1scJqJw8rMQ8i1FVi1JxUlt23gumAWTfPH+VvBTdbzBowqTpWtmVXDu3mFxBjFtey52 JFBbRGGv7L16mYzbXSCmtuSYyl6ZYOr4JITLgFQfZfq3bvk0jaz/yQ/ga2Mimtyi7jjw Zc9X+28JXfnJAtZ1hTGo7+28qf8izG1ud0Oz9W3Hf0RCWVjwX4GYx5d3fuGo06ndTqCX Poxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818794; x=1757423594; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JgIF6lWD9SRkfbI3l9bP2fZjIYaJ7QJ0dnxofnv7srk=; b=c+YHgdzvwPh3HFxnCq2x2KZ/WPLHAbclgGfc5Z5fEC3V3vXamkGxlnlA8IVjiF9GE/ J57kUJZEMfdVmvH1i2+mYD6ZU3X5nZRcUSwOQU8j+p0h2qYACe+UUMY0HlkJXkRt1lvs 2pu2mYDofFSxxHqIEwrp/k//VQz19egNIhU8PVAgGKkMMC4njUafsP4X+DtWLsMR/hMC WFU0Q5ZiqQm+3YtiQ+9pOyxxWGrWVZLFpNJCfgqJE6eY1i1yxUKrfFy+8oRVXQ3eHnHr 4FhraMCTNhx7WA9KkudgDBYIaeNcxXCpTLZnkp4yBFglP/vYNn0eD+t2DatcaH97FTwO 1W1g== X-Gm-Message-State: AOJu0YyUuXoRp+ssohU5IcbldY5DCZPgYpA6tV+y9nat92yNXnRvewuL raomZ40cKZcMZqSji7D+qBTcczQw773n7FpiPxbqNiwdh+ZEIYRI6x8br0gCICVo7hirb0yQU2s qFnC6 X-Gm-Gg: ASbGncuzSN9VEn08MtJG8j1AtHC1DNTp+pbDXEhoD3rjSDU/IsEumCnyCN0Nti5wsp1 dVyAwTDNiy8CecZpmYKVKFTBiLG2F/1ruwddl0OLpSzh2TG46noMIfKx3fu35vto3FwoB3q1vbG bR34wJ+yncWOUAR1IeYbYGhBPqDDm/vYm4VygHTmURA1Wda3x1lNCOV9wuif2WF5aG2JE21VAyG 9yXFJLYxDor8YjqBLaVG94X287iNsLkZrbxeYjclqGyVP6T60S6ilMlz1pmjur2cqijSJSLvDXf zeS+RfQ2W7E94Vi744lDUnSfYwwy/eSqEOMUuzYNg9ZVarfaN9ObaEUacYHEfHHZ4etdovavBqj TleBL0THEQUgOstDddy0FEaUGzMVzQP0gl2WiKQFxAZZVMnsLZ5LuTN4irED3LIyCL+F+rmYq X-Google-Smtp-Source: AGHT+IEKcsERGuHhYgXzaMD6vVpzEucACECBhl8bu0ckF9aGvTBIpvjxzRe/4tV7DLd2iiH6vvJSLA== X-Received: by 2002:a05:600c:4fcd:b0:459:e025:8c40 with SMTP id 5b1f17b1804b1-45b85533712mr103587935e9.10.1756818793570; Tue, 02 Sep 2025 06:13:13 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 38/39] hw/arm/boot: Correctly free the MemoryDeviceInfoList Date: Tue, 2 Sep 2025 15:10:15 +0200 Message-ID: <20250902131016.84968-39-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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 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: 1756818981015124100 From: Peter Maydell When running the bios-tables-test under ASAN we see leaks like this: Direct leak of 16 byte(s) in 1 object(s) allocated from: #0 0x5bc58579b00d in calloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu= /build/arm-asan/qemu-system-aarch64+0x250400d) (BuildId: 2e27b63dc9ac45f522= ced40a17c2a60cc32f1d38) #1 0x7b4ad90337b1 in g_malloc0 (/lib/x86_64-linux-gnu/libglib-2.0.so.0+= 0x637b1) (BuildId: 1eb6131419edb83b2178b682829a6913cf682d75) #2 0x5bc5861826db in qmp_memory_device_list /mnt/nvmedisk/linaro/qemu-f= rom-laptop/qemu/build/arm-asan/../../hw/mem/memory-device.c:307:34 #3 0x5bc587a9edb6 in arm_load_dtb /mnt/nvmedisk/linaro/qemu-from-laptop= /qemu/build/arm-asan/../../hw/arm/boot.c:656:15 Indirect leak of 28 byte(s) in 2 object(s) allocated from: #0 0x5bc58579ae23 in malloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu= /build/arm-asan/qemu-system-aarch64+0x2503e23) (BuildId: 2e27b63dc9ac45f522= ced40a17c2a60cc32f1d38) #1 0x7b4ad6c8f947 in __vasprintf_internal libio/vasprintf.c:116:16 #2 0x7b4ad9080a52 in g_vasprintf (/lib/x86_64-linux-gnu/libglib-2.0.so.= 0+0xb0a52) (BuildId: 1eb6131419edb83b2178b682829a6913cf682d75) #3 0x7b4ad90515e4 in g_strdup_vprintf (/lib/x86_64-linux-gnu/libglib-2.= 0.so.0+0x815e4) (BuildId: 1eb6131419edb83b2178b682829a6913cf682d75) #4 0x7b4ad9051940 in g_strdup_printf (/lib/x86_64-linux-gnu/libglib-2.0= .so.0+0x81940) (BuildId: 1eb6131419edb83b2178b682829a6913cf682d75) #5 0x5bc5885eb739 in object_get_canonical_path /mnt/nvmedisk/linaro/qem= u-from-laptop/qemu/build/arm-asan/../../qom/object.c:2123:19 #6 0x5bc58618dca8 in pc_dimm_md_fill_device_info /mnt/nvmedisk/linaro/q= emu-from-laptop/qemu/build/arm-asan/../../hw/mem/pc-dimm.c:268:18 #7 0x5bc586182792 in qmp_memory_device_list /mnt/nvmedisk/linaro/qemu-f= rom-laptop/qemu/build/arm-asan/../../hw/mem/memory-device.c:310:9 This happens because we declared the MemoryDeviceInfoList *md_list with g_autofree, which will free the direct memory with g_free() but doesn't free all the other data structures referenced by it. Instead what we want is to declare the pointer with g_autoptr(), which will automatically call the qapi_free_MemoryDeviceInfoList() cleanup function when the variable goes out of scope. Fixes: 36bc78aca83cfd ("hw/arm: add static NVDIMMs in device tree") Signed-off-by: Peter Maydell Reviewed-by: Manos Pitsidianakis Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250901102214.3748011-1-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 1e57c4ab9ee..d0840308f5a 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -549,7 +549,7 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_inf= o *binfo, unsigned int i; hwaddr mem_base, mem_len; char **node_path; - g_autofree MemoryDeviceInfoList *md_list =3D NULL; + g_autoptr(MemoryDeviceInfoList) md_list =3D NULL; Error *err =3D NULL; =20 if (binfo->dtb_filename) { --=20 2.51.0 From nobody Sun Sep 28 16:32:32 2025 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=1756819257; cv=none; d=zohomail.com; s=zohoarc; b=a5wmLWmg2Q620Ri0mKcl8DHi1yoR9p5kodA3YWOJy1TPa4DO2iJpsmkklsuFa5ibgA4SXnSmyKvPl6FgZyfUkHl+ybP8Nwu4t/lzkRAVYvA69qVvehd8tCIfViqUenVOIFgG+H6pinfn/6DDQ9eiWOYvnWHtY3YCidHnaFP/v2Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756819257; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=IiaqMhKzb+hmnzQCD7wPPRZkhh4jutFo9MeWh47ViIw=; b=XU8rdSx1/15xksC0p8Yl85yTwAyQQUO8BkcXjUUI4mj8RY4pIqRdZoAfpkNmqGp4m0jEvVY8CGxEtY8R6i+tJKpA4o897Y43IfZlwvsHXN3S1MUoeo4ub1e404U5Fz5jPm/cPDGSZAWcEpsxTn3UYsGOy4LVXldwMy4o7byrnGw= 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 1756819257134739.7866007994121; Tue, 2 Sep 2025 06:20:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQps-0007yR-FZ; Tue, 02 Sep 2025 09:14:10 -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 1utQpC-0007IV-NB for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:13:29 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQp7-0004nO-Vs for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:13:25 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-45b8b8d45b3so20465855e9.1 for ; Tue, 02 Sep 2025 06:13:21 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b732671b7sm138309095e9.3.2025.09.02.06.13.17 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:13:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818798; x=1757423598; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=IiaqMhKzb+hmnzQCD7wPPRZkhh4jutFo9MeWh47ViIw=; b=T04mcPkO2zL7IqMK/1Wru2Oo8UKe8xsXkOQjbsGS9nVbmuTvJwpgJPOXf96gJBD3ym tkyeWgwqM6attKcel0rtxPlQPSQR4nFVgcqvDFvDMl8UVvVgtVCvaDjBf/djXEseAR57 QeZxIikQMhldsMWWV3Ukv+X6wDvY3UIeCFn8nbSXe22I4hYetOdHc8MWyO1R5r8nXfQJ lxGvd9/vpGmM7uX7R3mP9R+Sv9CD07bIcxS1ckSUWNp8zJmvQjkJlWqZwf8VHz1bOYQY frlKWP5gsJVaCz6omXwkJ9gEisXsJmWswv3jZod2U1KXewehgssn6DeQnpWJ+/ys40Bc GtwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818798; x=1757423598; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IiaqMhKzb+hmnzQCD7wPPRZkhh4jutFo9MeWh47ViIw=; b=KxWCAuKy2p5gxks3p2OQAdR6Q3y1S+fy92scX9+t6asWLTGuJ1fageMVw21VZpf72s fjVeIOpNq19hMa6+LrFh0Rq2sbebZxBIivG0UGK3QQfbPbMpOrBO/oMvP3tzOSvsGgw0 xv+Mz8GVNNxz46VXjzXeU25WFWIDkIBP4JFtNuF5BBdvKimKKhaKtZNWwzSbo78yw84n vh69sHJpFFsLdgPlCBCnXtI+83qN7jhpLdwTWW9PZl3tq+RgItsOPKEpF8zcJaXyEYkp I4UEPnpcb/bYJRnBA0JtMLST+G8rH9aJcXCW9VH2E/CV3yVFpghuQjpIl+rGf5fW+QOH OOkw== X-Gm-Message-State: AOJu0YxGkRDBJntoOWP0OuUwUdpQbaDP+CymfrMWiE9Iy+z8xE5izDbx rq45OF4cB4E28FeA8RYt63MTM7xqYP2FX83Wjsy5Y68TzfgASPz1FdjiE8z23pqSCbXW7VXbNPi jkzMI X-Gm-Gg: ASbGncu4tRhnH7a7drWzjstWI/v6Dv03sAeOfAcPH9TOSsdzgZyoWto3VKH3lu12HVA KtB9dRuM3ujT2jJIVNE6HH0fy/wPAT0ARYj1+BkL8r2bb0RKWmIwjTckxDkJuUa4vXggcFHU/+h vTpb9/RQTi0BGPyFh2c5w5KtcM23BVUL5GeOr8JEVkg7xCpcE6UfiYhUP2qyYjnIWnspPCrKt/w 6qTzpcL5S4HaOwmgJR9NPf4G/PuoklBz7gsKC9RUNSiIqeUWw6pAGZ44oJciNosJInWpzU4yWEp hzzu27NQwGupNAc3R9FjmNToX0P5fOOD0lt9Y0Ntxdhwnsl6W+2JYPx2LroeiTJZ3L2Krmi1OSD y4TTZGmsXSkSjQS5V6tZPD1LVn1c36sWmfkB7nQUhTzdKn06aj81r5KBFSa4CSwjMe5NrifkL0d AwMG4s8cU= X-Google-Smtp-Source: AGHT+IHuKyd7Gr32qW6rTX74DYVdWJ4mz5v3D3N6BiYWZ7vIQkHvuGZDBDaOM6KaDdDfe0KYsWUJew== X-Received: by 2002:a05:600c:1ca8:b0:45b:90fc:1ede with SMTP id 5b1f17b1804b1-45b90fc20bemr36418755e9.6.1756818798253; Tue, 02 Sep 2025 06:13:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 39/39] hw/i386/pc_piix.c: remove unnecessary if() from pc_init1() Date: Tue, 2 Sep 2025 15:10:16 +0200 Message-ID: <20250902131016.84968-40-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-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::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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 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: 1756819258552124100 From: Mark Cave-Ayland Now that the isapc logic has been split out of pc_piix.c, the PCI Host Brid= ge (phb) object is now always set in pc_init1(). Since phb is now guaranteed not to be NULL, Coverity reports that the if() statement surrounding ioapic_init_gsi() is now unnecessary and can be remov= ed along with the phb NULL initialiser. Coverity: CID 1620557 Signed-off-by: Mark Cave-Ayland Fixes: 99d0630a45 ("hw/i386/pc_piix.c: assume pcmc->pci_enabled is always t= rue in pc_init1()") Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250901203409.1196620-1-mark.caveayland@nutanix.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 7e78b6daa6d..caf8bab68e2 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -106,7 +106,7 @@ static void pc_init1(MachineState *machine, const char = *pci_type) X86MachineState *x86ms =3D X86_MACHINE(machine); MemoryRegion *system_memory =3D get_system_memory(); MemoryRegion *system_io =3D get_system_io(); - Object *phb =3D NULL; + Object *phb; ISABus *isa_bus; Object *piix4_pm =3D NULL; qemu_irq smi_irq; @@ -284,9 +284,7 @@ static void pc_init1(MachineState *machine, const char = *pci_type) pc_i8259_create(isa_bus, gsi_state->i8259_irq); } =20 - if (phb) { - ioapic_init_gsi(gsi_state, phb); - } + ioapic_init_gsi(gsi_state, phb); =20 if (tcg_enabled()) { x86_register_ferr_irq(x86ms->gsi[13]); --=20 2.51.0