From patchwork Sat Dec 17 15:37:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1716897 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NZ98R4yTnz2405 for ; Sun, 18 Dec 2022 02:37:43 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id A0A0B81C20; Sat, 17 Dec 2022 15:37:40 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org A0A0B81C20 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HSMf4FjAt8MC; Sat, 17 Dec 2022 15:37:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id EAAF181902; Sat, 17 Dec 2022 15:37:38 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org EAAF181902 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 98B221BF2FC for ; Sat, 17 Dec 2022 15:37:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 6E074818D7 for ; Sat, 17 Dec 2022 15:37:37 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 6E074818D7 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EHDOH5eGAYXi for ; Sat, 17 Dec 2022 15:37:36 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 5711381902 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by smtp1.osuosl.org (Postfix) with ESMTPS id 5711381902 for ; Sat, 17 Dec 2022 15:37:36 +0000 (UTC) Received: by mail-wm1-x330.google.com with SMTP id o5-20020a05600c510500b003d21f02fbaaso6001673wms.4 for ; Sat, 17 Dec 2022 07:37:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=P8Q+igVPhbj3kDyyMWpcdtcUAg/P1fZGJdMHN9CdfcU=; b=0jXzkupNz+1FPdrREFrbHQr5Hg5Rqw3kPEdcWYDqi0YdLB4ETxpobjcyEPsEBmERM/ mEVDeFtkuB7LmTDBa8/ZxORCofLwYe+QapB2X10LZHv/9TU3BMqCEzilxSmHVPTtyZ1L qbGEfL5W9WwT2yd5MiQNaoZtyGPd2fpNEpDxb2niwCBrTmZwV5ASLhEmRlSDoeOqvsMU JMFHzmxwNb6D7EpXWXgwn13x+2PEJt0OLmdhLOdPCttfJUNTzxaSKSZHGHnkn3T2ypbi xn3idvJPzhLjxzCk9bTmQiCLdRhRLej+J3+1Z3TlUU5W/c+wP+vr4vKQ9HEwC0QM/BdB MSAQ== X-Gm-Message-State: ANoB5pnxC98AcivLHh165vjVly0ujNpfUsbrWJWJ0Ju2tCXEgWIWQVq8 QGyE7yv5V+OO8IPaEgM7AEoF/p7HvB4= X-Google-Smtp-Source: AA0mqf7AVyB//fQ0HefvoCdAd4eT6el6rtfidDEYq+xg5KJ9pPtmX8ZhOxRlAAoWuz+5D9BR65rsnA== X-Received: by 2002:a05:600c:540c:b0:3d0:57ea:319c with SMTP id he12-20020a05600c540c00b003d057ea319cmr29680740wmb.13.1671291454306; Sat, 17 Dec 2022 07:37:34 -0800 (PST) Received: from atlas.home (2a01cb058f8a18003dbee9eed79eb521.ipv6.abo.wanadoo.fr. [2a01:cb05:8f8a:1800:3dbe:e9ee:d79e:b521]) by smtp.gmail.com with ESMTPSA id 1-20020a05600c228100b003d23928b654sm12933957wmf.11.2022.12.17.07.37.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Dec 2022 07:37:33 -0800 (PST) From: Romain Naour To: buildroot@buildroot.org Date: Sat, 17 Dec 2022 16:37:26 +0100 Message-Id: <20221217153729.545952-1-romain.naour@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=P8Q+igVPhbj3kDyyMWpcdtcUAg/P1fZGJdMHN9CdfcU=; b=LQtb99UFzS1Vv+K7m1I/V49ze7Rzip9rBEs1YFUnYhZwi6FaH6BneqiLJK5vnY7GL3 9DhyQyNtTmIcSjKYFRdNhfcKkQGjSKA0LAmPdlSgXkJDabmRnvUtIiH1lf1LpAhksD1g aYghZhki44xtrKUf82XNM8BZeJeHalqclmQh03+mfEU+gokMZZK5BRvhHyPwBg/O+1jD w9Gtg09e+sS0VP3L9yPpz6spe1+wdq6M7YdXo8Nkg6LD6ptH6pB7UCWsXkK+oYUwtrw0 gWJH8pR0c5iw60xK4Y5bu+bPpMb6V2oDmP/YNgimz8Qo6YXCMPJK/5OQZJDatIyOsxhI xrPw== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=LQtb99UF Subject: [Buildroot] [PATCH 1/4] package/slirp: add host variant for host-qemu X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Qemu 7.2 removed the slirp submodule from their sources [1] so we have to provide slirp library as host package for host-qemu. [1] https://wiki.qemu.org/ChangeLog/7.2#GIT_submodules Signed-off-by: Romain Naour --- package/slirp/slirp.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk index 10d367587d..2ad71f13d9 100644 --- a/package/slirp/slirp.mk +++ b/package/slirp/slirp.mk @@ -14,4 +14,7 @@ SLIRP_CPE_ID_PRODUCT = libslirp SLIRP_INSTALL_STAGING = YES SLIRP_DEPENDENCIES = libglib2 +HOST_SLIRP_DEPENDENCIES = host-libglib2 + $(eval $(meson-package)) +$(eval $(host-meson-package)) From patchwork Sat Dec 17 15:37:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1716898 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NZ98g280xz2405 for ; Sun, 18 Dec 2022 02:37:55 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 094274055D; Sat, 17 Dec 2022 15:37:53 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 094274055D X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id i5jKz9Md_XRa; Sat, 17 Dec 2022 15:37:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 4B6C24055A; Sat, 17 Dec 2022 15:37:51 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 4B6C24055A X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 2B1EF1BF2FC for ; Sat, 17 Dec 2022 15:37:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 05EF360DB2 for ; Sat, 17 Dec 2022 15:37:38 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 05EF360DB2 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Q8z2eIPtafO6 for ; Sat, 17 Dec 2022 15:37:37 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 28D3960D95 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by smtp3.osuosl.org (Postfix) with ESMTPS id 28D3960D95 for ; Sat, 17 Dec 2022 15:37:37 +0000 (UTC) Received: by mail-wm1-x32b.google.com with SMTP id bi26-20020a05600c3d9a00b003d3404a89faso2721574wmb.1 for ; Sat, 17 Dec 2022 07:37:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xEAe1KnEKjo3LjUlL5wpj5uXhXmZ4tpV9SloXZhyZ5A=; b=Qq+DH7bGIl3Ow+C3766xBvR76Sd2013d5KBqMl3nbuQrkE9pyDcWnRUNbX2/v+WRWj bgERfuOOMaMUILATKleRX4IRCfS0j6B/qw0C41y8a3SQJDlhvhyU3+IuD+J7ll47xxsT QHSwYvSEUYJbyx4HMq6NpbB3jT/wbk/A28/A64vPg9uCOdKbaSn7rqWLf5I7vUlqNrDv t7kgTgs8OAWyi2a7Gn5GcitdiXT/KqcoJLd5L36S/tNNCu9MZE4m/CV/cLkgZR7pYH6l fPdivViVmsghNGtdxdXABIWu223twV0+TvQe8jAKUkohiP4hcMqtm/tGGwI1efwu9xDm 5umg== X-Gm-Message-State: AFqh2kpoY8jNiRI0Zl2gQbgf94jgJVvwFQWUdKUmikcsOHUJjxkXRPam uEXDVwIkFfQd1JrqEkbHuOfhiLAX5hk= X-Google-Smtp-Source: AMrXdXt4cSzs+EHH2hwJyVXkWFbMcPJS8E8enIQebWqKRT4GiAabQA6HoE/fFQz5vK8Xpx0+8inEPg== X-Received: by 2002:a05:600c:a13:b0:3d3:4ead:bb07 with SMTP id z19-20020a05600c0a1300b003d34eadbb07mr1243501wmp.5.1671291455218; Sat, 17 Dec 2022 07:37:35 -0800 (PST) Received: from atlas.home (2a01cb058f8a18003dbee9eed79eb521.ipv6.abo.wanadoo.fr. [2a01:cb05:8f8a:1800:3dbe:e9ee:d79e:b521]) by smtp.gmail.com with ESMTPSA id 1-20020a05600c228100b003d23928b654sm12933957wmf.11.2022.12.17.07.37.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Dec 2022 07:37:34 -0800 (PST) From: Romain Naour To: buildroot@buildroot.org Date: Sat, 17 Dec 2022 16:37:27 +0100 Message-Id: <20221217153729.545952-2-romain.naour@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221217153729.545952-1-romain.naour@gmail.com> References: <20221217153729.545952-1-romain.naour@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xEAe1KnEKjo3LjUlL5wpj5uXhXmZ4tpV9SloXZhyZ5A=; b=ehZY1sbaKDo1m+beW3R/TpY+SAw7LXl8tCatGFacaAf5J11iS1RVL7umTqTh1kZalI rKAavS7ov6k4OlIAwSGE9itRAkDm+Dob2lmyGUzJYEl72IlXaXcWvxSIxGTpRmdV/eoj u+JQPH8piLG7NRcWdXOTdpXMekqmLkFIhfZHLtcJAjZ2wZK4DieOo/lHTeLyRoPTZRAg q1z0M/8JvBFTnkZPIvlclWomyaaLQGedKrrLSze5m2qmMDbbw1/ZpD/mx8F+Yxv3b8Er OcoeRFERi/l2SRelJ/dUmEkCXcTk1hEBlObCrPgXGF/pR4QAiQRwwstRasHVfu9fD+cq /fDA== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=ehZY1sba Subject: [Buildroot] [PATCH 2/4] package/qemu: split long lines X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Split the list of dependencies to ease further addition. Signed-off-by: Romain Naour --- package/qemu/qemu.mk | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index a991d49993..e800f31e7e 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -20,7 +20,12 @@ QEMU_CPE_ID_VENDOR = qemu # However, building is still done with configure and make as in previous versions of QEMU. # Target-qemu -QEMU_DEPENDENCIES = host-meson host-pkgconf libglib2 zlib pixman host-python3 +QEMU_DEPENDENCIES = host-meson \ + host-pkgconf \ + libglib2 \ + zlib \ + pixman \ + host-python3 # Need the LIBS variable because librt and libm are # not automatically pulled. :-( @@ -246,7 +251,12 @@ $(eval $(generic-package)) #------------------------------------------------------------- # Host-qemu -HOST_QEMU_DEPENDENCIES = host-meson host-pkgconf host-zlib host-libglib2 host-pixman host-python3 +HOST_QEMU_DEPENDENCIES = host-meson \ + host-pkgconf \ + host-zlib \ + host-libglib2 \ + host-pixman \ + host-python3 # BR ARCH qemu # ------- ---- From patchwork Sat Dec 17 15:37:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1716899 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NZ98y5kq4z2405 for ; Sun, 18 Dec 2022 02:38:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 7859960DCA; Sat, 17 Dec 2022 15:38:05 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 7859960DCA X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9v8h5_w_Iw69; Sat, 17 Dec 2022 15:38:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id B0E1960DB2; Sat, 17 Dec 2022 15:38:03 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org B0E1960DB2 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 022EA1BF2FC for ; Sat, 17 Dec 2022 15:37:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id DD24460D95 for ; Sat, 17 Dec 2022 15:37:38 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org DD24460D95 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WbEx3Cq1nSKe for ; Sat, 17 Dec 2022 15:37:38 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 1BB9960DC2 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by smtp3.osuosl.org (Postfix) with ESMTPS id 1BB9960DC2 for ; Sat, 17 Dec 2022 15:37:38 +0000 (UTC) Received: by mail-wm1-x333.google.com with SMTP id o15so3708426wmr.4 for ; Sat, 17 Dec 2022 07:37:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BYplv5TtosMp+AAwi1KnGNc5O2+G7a/MVAX2+JplT98=; b=yvT0UTUiJlekJdLIPaYjoQ21CPX9nB2ZlKdwR++A8Ws44QIdbaufGM/xkpLADYYeiG IdccoKP8qmv5Oz05lPlJNFwoSwILXuxz1rBN5oAoIBHPRmYiGK+gqQi3mrXSUSFaeLhZ mDZtrwRp7dRXPHmeMa4Ynw2W+Bn0/O4eykq9JrCGVAQmyrLNO1XU1lEmlYalCIfRXPhS 0wvRjWoo+3JkO+LV1JiMMdkKYQEiTzM17rAO+PVCDARYXJPBSv1Y/FlE00YH2mPBjO64 +r6gk+6o9fJ7l16N7oqeJ8xNjhkVIQBWHsS/4HO0Jo3eN/5srZHfPgu94zXrZf7b/+GP bqFQ== X-Gm-Message-State: ANoB5pnTwgltaBV2GD65UjEdLojYSkRtU154c3IrkgX2dc3rPEhWEhAv F60pOoO3hEM/aiSEGYqQoDZrs14RkCE= X-Google-Smtp-Source: AA0mqf4Ymc9vCRyUsMun/ezpZuQwFq4ez9Mlw0Mb7g+2VrQMTVBPWqUTLTi6u+qvH/hCAczwEjhBdQ== X-Received: by 2002:a05:600c:4f05:b0:3cf:85af:6a4a with SMTP id l5-20020a05600c4f0500b003cf85af6a4amr38945399wmq.25.1671291456137; Sat, 17 Dec 2022 07:37:36 -0800 (PST) Received: from atlas.home (2a01cb058f8a18003dbee9eed79eb521.ipv6.abo.wanadoo.fr. [2a01:cb05:8f8a:1800:3dbe:e9ee:d79e:b521]) by smtp.gmail.com with ESMTPSA id 1-20020a05600c228100b003d23928b654sm12933957wmf.11.2022.12.17.07.37.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Dec 2022 07:37:35 -0800 (PST) From: Romain Naour To: buildroot@buildroot.org Date: Sat, 17 Dec 2022 16:37:28 +0100 Message-Id: <20221217153729.545952-3-romain.naour@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221217153729.545952-1-romain.naour@gmail.com> References: <20221217153729.545952-1-romain.naour@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BYplv5TtosMp+AAwi1KnGNc5O2+G7a/MVAX2+JplT98=; b=JYzuVIXg3dUhuPo5WtIdTZQ8GEkKEF2t/KV+ifMXium9VuJLtfaFMYMiScl6PnvcoC rHpG3E6RQ5klCA9Km+ALe9kwUdJ+aAnD1k7M1BYaY9WBS9GujhepYp6FyMBVPXtfhNU+ nrpY8lvZzyAdBq/U8mMoaIIzywCg1NTqOXWLc0oCK+HPhgqr5QUjdp6ie1roLiEHbvNh oLTPrMkbuLJVrUw/8Q4jDaiyx/YWp7ibhqoVS+HcxQtkEDumoBEXeJ5lD08V+3V0szoG JNHEaoQHVe3tSCDKU7sGhd/gRsewAbw7ifrYH+tCeLx52oNL9aYf59SxSMhJFAzs9YSq Eawg== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=JYzuVIXg Subject: [Buildroot] [PATCH 3/4] package/qemu: reorder dependencies alphabetically X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: Romain Naour --- package/qemu/qemu.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index e800f31e7e..d42a16ec3e 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -22,10 +22,10 @@ QEMU_CPE_ID_VENDOR = qemu # Target-qemu QEMU_DEPENDENCIES = host-meson \ host-pkgconf \ + host-python3 \ libglib2 \ - zlib \ pixman \ - host-python3 + zlib # Need the LIBS variable because librt and libm are # not automatically pulled. :-( @@ -251,12 +251,12 @@ $(eval $(generic-package)) #------------------------------------------------------------- # Host-qemu -HOST_QEMU_DEPENDENCIES = host-meson \ - host-pkgconf \ - host-zlib \ - host-libglib2 \ +HOST_QEMU_DEPENDENCIES = host-libglib2 \ + host-meson \ host-pixman \ - host-python3 + host-pkgconf \ + host-python3 \ + host-zlib # BR ARCH qemu # ------- ---- From patchwork Sat Dec 17 15:37:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1716900 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NZ99B2fPVz2405 for ; Sun, 18 Dec 2022 02:38:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id C268981902; Sat, 17 Dec 2022 15:38:18 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org C268981902 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id a_58IPCuKvK5; Sat, 17 Dec 2022 15:38:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 2888F81C20; Sat, 17 Dec 2022 15:38:16 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 2888F81C20 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id DF0541BF2FC for ; Sat, 17 Dec 2022 15:37:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B8FF241973 for ; Sat, 17 Dec 2022 15:37:41 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org B8FF241973 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id A9ItK6RkopBB for ; Sat, 17 Dec 2022 15:37:39 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 602C041972 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by smtp4.osuosl.org (Postfix) with ESMTPS id 602C041972 for ; Sat, 17 Dec 2022 15:37:39 +0000 (UTC) Received: by mail-wm1-x334.google.com with SMTP id k22-20020a05600c1c9600b003d1ee3a6289so3652471wms.2 for ; Sat, 17 Dec 2022 07:37:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kE3jk88cxUsuVWrcaePUkjjrn+3dKa7huO2wobaWCaQ=; b=vK7SZYNQUtEJyLeyESXEknUseDjhq118M74iNbeZBIVC6MI8h1s5Ig6516GBAMVJ9t VeXgBiRftjmZKpttFxJavm9c1qZeRC2D4AQxINcAzPcCm5F05UJsEr0nbc7yI9TRPV+K MAWaS6R+HVsNO+gP6M/dwtWIy0o+lnzbpj0GSyaKo8RjH66IYLxH12Kgw5JpXQvWeasx J9ENdPPJ/yDEWXUZyPS+9mbpEg/V4i3EHekX5H314liids00Pityte39wgqfbageEFbH xOcrQX/z9pryLTcrJlyCw3tV9hhkohWHJKuXTuC3O4N6EaENkjjwBexy4b6GupFSDg55 Kf2A== X-Gm-Message-State: ANoB5pkxiblSp3K3jPvHECtqyUv5ePaMPH/4/qbP2d7q6TDwvdBa+PE8 LJ23kXl7JAg1aWAuHmSkoEdEVDXuo5o= X-Google-Smtp-Source: AA0mqf6UUGlHlZvBtyg29pacs3t5U45gKoE/YY0ElGsoO18EQBdGEP19AIUEmebmDmOlfr1rPXdSPA== X-Received: by 2002:a05:600c:4451:b0:3cf:894d:1d06 with SMTP id v17-20020a05600c445100b003cf894d1d06mr29658126wmn.30.1671291457356; Sat, 17 Dec 2022 07:37:37 -0800 (PST) Received: from atlas.home (2a01cb058f8a18003dbee9eed79eb521.ipv6.abo.wanadoo.fr. [2a01:cb05:8f8a:1800:3dbe:e9ee:d79e:b521]) by smtp.gmail.com with ESMTPSA id 1-20020a05600c228100b003d23928b654sm12933957wmf.11.2022.12.17.07.37.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Dec 2022 07:37:36 -0800 (PST) From: Romain Naour To: buildroot@buildroot.org Date: Sat, 17 Dec 2022 16:37:29 +0100 Message-Id: <20221217153729.545952-4-romain.naour@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221217153729.545952-1-romain.naour@gmail.com> References: <20221217153729.545952-1-romain.naour@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kE3jk88cxUsuVWrcaePUkjjrn+3dKa7huO2wobaWCaQ=; b=niHVMg/Re/AfFH+dpcu8lKK2YCdgBNpyarLY7q4hZqFmfhw3nL+EdaQubl5I+1qrcd kKUEjiOoT21LEIcM1WVTc/VQCg+KeNGihNjEzCNHjmIR/DJXHyUMO84HuzyqbRp1KNy4 LQBICXHVIZFOFCZH3OjHNV/L57mxPDcXDK0VG3NAYHKO4heZ1Rz4rosvS1GjLeigUbP2 On1Um76rcQzMnH2gBtCGt6FotNsVlNpfIronFLdv3o/QvzZxbX/kJK3YsYSAzTaObN95 LZXyMkqtP9fy2t7bio67tRPAupeSoOnQviT8maU2AwEdJDQxePbRgutQmrYZftfU5rwz CjIw== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=niHVMg/R Subject: [Buildroot] [PATCH 4/4] package/qemu: bump to version 7.2.0 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Changes log: https://wiki.qemu.org/ChangeLog/7.2 Add host-slirp dependency to provide the network backend 'user' that was included in previous Qemu release by a submodule in Qemu sources [1]. This network backend is currently used by several defconfig that would fail to boot with: "-net user: network backend 'user' is not compiled into this binary" board/mender/x86_64/readme.txt board/pc/readme.txt board/pc/readme.txt board/qemu/arm-versatile/readme.txt board/qemu/arm-vexpress/readme.txt board/qemu/mips32r2-malta/readme.txt board/qemu/mips32r2el-malta/readme.txt board/qemu/mips32r6el-malta/readme.txt board/qemu/ppc-bamboo/readme.txt board/qemu/ppc-e500mc/readme.txt board/qemu/ppc-g3beige/readme.txt board/qemu/ppc-mac99/readme.txt board/qemu/ppc-mpc8544ds/readme.txt board/qemu/ppc64-e5500/readme.txt board/qemu/s390x/readme.txt board/qemu/sh4-r2d/readme.txt board/qemu/sh4eb-r2d/readme.txt board/qemu/sparc-ss10/readme.txt board/qemu/sparc64-sun4u/readme.txt board/qemu/x86/readme.txt board/qemu/x86_64/readme.txt Update the slirp configure option following the slirp submodule removal [2]. Runtime tested in gitlab: https://gitlab.com/kubu93/buildroot/-/pipelines/725509959 Revert a commit for sh4 since it introduce a regression that appear randomly when booting the kernel or running userspace application. [1] https://wiki.qemu.org/ChangeLog/7.2#Removal_of_the_.22slirp.22_submodule_.28affects_.22-netdev_user.22.29 [2] https://gitlab.com/qemu-project/qemu/-/commit/5890258aeeba303704ec1adca415e46067800777 [3] https://gitlab.com/kubu93/buildroot/-/jobs/3490258272 Signed-off-by: Romain Naour --- ...evert-target-sh4-Fix-TB_FLAG_UNALIGN.patch | 500 ++++++++++++++++++ package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 6 +- 3 files changed, 505 insertions(+), 3 deletions(-) create mode 100644 package/qemu/0003-Revert-target-sh4-Fix-TB_FLAG_UNALIGN.patch diff --git a/package/qemu/0003-Revert-target-sh4-Fix-TB_FLAG_UNALIGN.patch b/package/qemu/0003-Revert-target-sh4-Fix-TB_FLAG_UNALIGN.patch new file mode 100644 index 0000000000..8eab49d26f --- /dev/null +++ b/package/qemu/0003-Revert-target-sh4-Fix-TB_FLAG_UNALIGN.patch @@ -0,0 +1,500 @@ +From ecc76769c9a885fd65bff4e4d291928da1416f58 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 17 Dec 2022 16:19:53 +0100 +Subject: [PATCH] Revert "target/sh4: Fix TB_FLAG_UNALIGN" + +This reverts commit ab419fd8a035a65942de4e63effcd55ccbf1a9fe. + +With this patch applied Qemu for sh4 is unstable and may randomly +crash: + +kernel: +Run /sbin/init as init process +Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b + +udhcp: +Segmentation fault +/usr/share/udhcpc/default.script: line 95: can't create : nonexistent directory + +Fixes: +https://gitlab.com/kubu93/buildroot/-/jobs/3490258272 + +Signed-off-by: Romain Naour +--- + linux-user/sh4/signal.c | 6 +-- + target/sh4/cpu.c | 6 +-- + target/sh4/cpu.h | 58 ++++++++++++-------------- + target/sh4/helper.c | 6 +-- + target/sh4/translate.c | 90 +++++++++++++++++++---------------------- + 5 files changed, 77 insertions(+), 89 deletions(-) + +diff --git a/linux-user/sh4/signal.c b/linux-user/sh4/signal.c +index c4ba962708..f6a18bc6b5 100644 +--- a/linux-user/sh4/signal.c ++++ b/linux-user/sh4/signal.c +@@ -161,7 +161,7 @@ static void restore_sigcontext(CPUSH4State *regs, struct target_sigcontext *sc) + __get_user(regs->fpul, &sc->sc_fpul); + + regs->tra = -1; /* disable syscall checks */ +- regs->flags = 0; ++ regs->flags &= ~(DELAY_SLOT_MASK | GUSA_MASK); + } + + void setup_frame(int sig, struct target_sigaction *ka, +@@ -199,7 +199,7 @@ void setup_frame(int sig, struct target_sigaction *ka, + regs->gregs[5] = 0; + regs->gregs[6] = frame_addr += offsetof(typeof(*frame), sc); + regs->pc = (unsigned long) ka->_sa_handler; +- regs->flags &= ~(TB_FLAG_DELAY_SLOT_MASK | TB_FLAG_GUSA_MASK); ++ regs->flags &= ~(DELAY_SLOT_MASK | GUSA_MASK); + + unlock_user_struct(frame, frame_addr, 1); + return; +@@ -251,7 +251,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, + regs->gregs[5] = frame_addr + offsetof(typeof(*frame), info); + regs->gregs[6] = frame_addr + offsetof(typeof(*frame), uc); + regs->pc = (unsigned long) ka->_sa_handler; +- regs->flags &= ~(TB_FLAG_DELAY_SLOT_MASK | TB_FLAG_GUSA_MASK); ++ regs->flags &= ~(DELAY_SLOT_MASK | GUSA_MASK); + + unlock_user_struct(frame, frame_addr, 1); + return; +diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c +index 453268392b..bc75333916 100644 +--- a/target/sh4/cpu.c ++++ b/target/sh4/cpu.c +@@ -47,7 +47,7 @@ static void superh_cpu_synchronize_from_tb(CPUState *cs, + SuperHCPU *cpu = SUPERH_CPU(cs); + + cpu->env.pc = tb_pc(tb); +- cpu->env.flags = tb->flags; ++ cpu->env.flags = tb->flags & TB_FLAG_ENVFLAGS_MASK; + } + + static void superh_restore_state_to_opc(CPUState *cs, +@@ -72,10 +72,10 @@ static bool superh_io_recompile_replay_branch(CPUState *cs, + SuperHCPU *cpu = SUPERH_CPU(cs); + CPUSH4State *env = &cpu->env; + +- if ((env->flags & (TB_FLAG_DELAY_SLOT | TB_FLAG_DELAY_SLOT_COND)) ++ if ((env->flags & ((DELAY_SLOT | DELAY_SLOT_CONDITIONAL))) != 0 + && env->pc != tb_pc(tb)) { + env->pc -= 2; +- env->flags &= ~(TB_FLAG_DELAY_SLOT | TB_FLAG_DELAY_SLOT_COND); ++ env->flags &= ~(DELAY_SLOT | DELAY_SLOT_CONDITIONAL); + return true; + } + return false; +diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h +index 727b829598..9f15ef913c 100644 +--- a/target/sh4/cpu.h ++++ b/target/sh4/cpu.h +@@ -78,33 +78,26 @@ + #define FPSCR_RM_NEAREST (0 << 0) + #define FPSCR_RM_ZERO (1 << 0) + +-#define TB_FLAG_DELAY_SLOT (1 << 0) +-#define TB_FLAG_DELAY_SLOT_COND (1 << 1) +-#define TB_FLAG_DELAY_SLOT_RTE (1 << 2) +-#define TB_FLAG_PENDING_MOVCA (1 << 3) +-#define TB_FLAG_GUSA_SHIFT 4 /* [11:4] */ +-#define TB_FLAG_GUSA_EXCLUSIVE (1 << 12) +-#define TB_FLAG_UNALIGN (1 << 13) +-#define TB_FLAG_SR_FD (1 << SR_FD) /* 15 */ +-#define TB_FLAG_FPSCR_PR FPSCR_PR /* 19 */ +-#define TB_FLAG_FPSCR_SZ FPSCR_SZ /* 20 */ +-#define TB_FLAG_FPSCR_FR FPSCR_FR /* 21 */ +-#define TB_FLAG_SR_RB (1 << SR_RB) /* 29 */ +-#define TB_FLAG_SR_MD (1 << SR_MD) /* 30 */ +- +-#define TB_FLAG_DELAY_SLOT_MASK (TB_FLAG_DELAY_SLOT | \ +- TB_FLAG_DELAY_SLOT_COND | \ +- TB_FLAG_DELAY_SLOT_RTE) +-#define TB_FLAG_GUSA_MASK ((0xff << TB_FLAG_GUSA_SHIFT) | \ +- TB_FLAG_GUSA_EXCLUSIVE) +-#define TB_FLAG_FPSCR_MASK (TB_FLAG_FPSCR_PR | \ +- TB_FLAG_FPSCR_SZ | \ +- TB_FLAG_FPSCR_FR) +-#define TB_FLAG_SR_MASK (TB_FLAG_SR_FD | \ +- TB_FLAG_SR_RB | \ +- TB_FLAG_SR_MD) +-#define TB_FLAG_ENVFLAGS_MASK (TB_FLAG_DELAY_SLOT_MASK | \ +- TB_FLAG_GUSA_MASK) ++#define DELAY_SLOT_MASK 0x7 ++#define DELAY_SLOT (1 << 0) ++#define DELAY_SLOT_CONDITIONAL (1 << 1) ++#define DELAY_SLOT_RTE (1 << 2) ++ ++#define TB_FLAG_PENDING_MOVCA (1 << 3) ++#define TB_FLAG_UNALIGN (1 << 4) ++ ++#define GUSA_SHIFT 4 ++#ifdef CONFIG_USER_ONLY ++#define GUSA_EXCLUSIVE (1 << 12) ++#define GUSA_MASK ((0xff << GUSA_SHIFT) | GUSA_EXCLUSIVE) ++#else ++/* Provide dummy versions of the above to allow tests against tbflags ++ to be elided while avoiding ifdefs. */ ++#define GUSA_EXCLUSIVE 0 ++#define GUSA_MASK 0 ++#endif ++ ++#define TB_FLAG_ENVFLAGS_MASK (DELAY_SLOT_MASK | GUSA_MASK) + + typedef struct tlb_t { + uint32_t vpn; /* virtual page number */ +@@ -265,7 +258,7 @@ static inline int cpu_mmu_index (CPUSH4State *env, bool ifetch) + { + /* The instruction in a RTE delay slot is fetched in privileged + mode, but executed in user mode. */ +- if (ifetch && (env->flags & TB_FLAG_DELAY_SLOT_RTE)) { ++ if (ifetch && (env->flags & DELAY_SLOT_RTE)) { + return 0; + } else { + return (env->sr & (1u << SR_MD)) == 0 ? 1 : 0; +@@ -373,10 +366,11 @@ static inline void cpu_get_tb_cpu_state(CPUSH4State *env, target_ulong *pc, + { + *pc = env->pc; + /* For a gUSA region, notice the end of the region. */ +- *cs_base = env->flags & TB_FLAG_GUSA_MASK ? env->gregs[0] : 0; +- *flags = env->flags +- | (env->fpscr & TB_FLAG_FPSCR_MASK) +- | (env->sr & TB_FLAG_SR_MASK) ++ *cs_base = env->flags & GUSA_MASK ? env->gregs[0] : 0; ++ *flags = env->flags /* TB_FLAG_ENVFLAGS_MASK: bits 0-2, 4-12 */ ++ | (env->fpscr & (FPSCR_FR | FPSCR_SZ | FPSCR_PR)) /* Bits 19-21 */ ++ | (env->sr & ((1u << SR_MD) | (1u << SR_RB))) /* Bits 29-30 */ ++ | (env->sr & (1u << SR_FD)) /* Bit 15 */ + | (env->movcal_backup ? TB_FLAG_PENDING_MOVCA : 0); /* Bit 3 */ + #ifdef CONFIG_USER_ONLY + *flags |= TB_FLAG_UNALIGN * !env_cpu(env)->prctl_unalign_sigbus; +diff --git a/target/sh4/helper.c b/target/sh4/helper.c +index e02e7af607..6a620e36fc 100644 +--- a/target/sh4/helper.c ++++ b/target/sh4/helper.c +@@ -147,11 +147,11 @@ void superh_cpu_do_interrupt(CPUState *cs) + env->sr |= (1u << SR_BL) | (1u << SR_MD) | (1u << SR_RB); + env->lock_addr = -1; + +- if (env->flags & TB_FLAG_DELAY_SLOT_MASK) { ++ if (env->flags & DELAY_SLOT_MASK) { + /* Branch instruction should be executed again before delay slot. */ + env->spc -= 2; + /* Clear flags for exception/interrupt routine. */ +- env->flags &= ~TB_FLAG_DELAY_SLOT_MASK; ++ env->flags &= ~DELAY_SLOT_MASK; + } + + if (do_exp) { +@@ -786,7 +786,7 @@ bool superh_cpu_exec_interrupt(CPUState *cs, int interrupt_request) + CPUSH4State *env = &cpu->env; + + /* Delay slots are indivisible, ignore interrupts */ +- if (env->flags & TB_FLAG_DELAY_SLOT_MASK) { ++ if (env->flags & DELAY_SLOT_MASK) { + return false; + } else { + superh_cpu_do_interrupt(cs); +diff --git a/target/sh4/translate.c b/target/sh4/translate.c +index 7db3468b01..eee0ca5484 100644 +--- a/target/sh4/translate.c ++++ b/target/sh4/translate.c +@@ -175,13 +175,13 @@ void superh_cpu_dump_state(CPUState *cs, FILE *f, int flags) + i, env->gregs[i], i + 1, env->gregs[i + 1], + i + 2, env->gregs[i + 2], i + 3, env->gregs[i + 3]); + } +- if (env->flags & TB_FLAG_DELAY_SLOT) { ++ if (env->flags & DELAY_SLOT) { + qemu_printf("in delay slot (delayed_pc=0x%08x)\n", + env->delayed_pc); +- } else if (env->flags & TB_FLAG_DELAY_SLOT_COND) { ++ } else if (env->flags & DELAY_SLOT_CONDITIONAL) { + qemu_printf("in conditional delay slot (delayed_pc=0x%08x)\n", + env->delayed_pc); +- } else if (env->flags & TB_FLAG_DELAY_SLOT_RTE) { ++ } else if (env->flags & DELAY_SLOT_RTE) { + qemu_fprintf(f, "in rte delay slot (delayed_pc=0x%08x)\n", + env->delayed_pc); + } +@@ -223,7 +223,7 @@ static inline void gen_save_cpu_state(DisasContext *ctx, bool save_pc) + + static inline bool use_exit_tb(DisasContext *ctx) + { +- return (ctx->tbflags & TB_FLAG_GUSA_EXCLUSIVE) != 0; ++ return (ctx->tbflags & GUSA_EXCLUSIVE) != 0; + } + + static bool use_goto_tb(DisasContext *ctx, target_ulong dest) +@@ -276,12 +276,12 @@ static void gen_conditional_jump(DisasContext *ctx, target_ulong dest, + TCGLabel *l1 = gen_new_label(); + TCGCond cond_not_taken = jump_if_true ? TCG_COND_EQ : TCG_COND_NE; + +- if (ctx->tbflags & TB_FLAG_GUSA_EXCLUSIVE) { ++ if (ctx->tbflags & GUSA_EXCLUSIVE) { + /* When in an exclusive region, we must continue to the end. + Therefore, exit the region on a taken branch, but otherwise + fall through to the next instruction. */ + tcg_gen_brcondi_i32(cond_not_taken, cpu_sr_t, 0, l1); +- tcg_gen_movi_i32(cpu_flags, ctx->envflags & ~TB_FLAG_GUSA_MASK); ++ tcg_gen_movi_i32(cpu_flags, ctx->envflags & ~GUSA_MASK); + /* Note that this won't actually use a goto_tb opcode because we + disallow it in use_goto_tb, but it handles exit + singlestep. */ + gen_goto_tb(ctx, 0, dest); +@@ -307,14 +307,14 @@ static void gen_delayed_conditional_jump(DisasContext * ctx) + tcg_gen_mov_i32(ds, cpu_delayed_cond); + tcg_gen_discard_i32(cpu_delayed_cond); + +- if (ctx->tbflags & TB_FLAG_GUSA_EXCLUSIVE) { ++ if (ctx->tbflags & GUSA_EXCLUSIVE) { + /* When in an exclusive region, we must continue to the end. + Therefore, exit the region on a taken branch, but otherwise + fall through to the next instruction. */ + tcg_gen_brcondi_i32(TCG_COND_EQ, ds, 0, l1); + + /* Leave the gUSA region. */ +- tcg_gen_movi_i32(cpu_flags, ctx->envflags & ~TB_FLAG_GUSA_MASK); ++ tcg_gen_movi_i32(cpu_flags, ctx->envflags & ~GUSA_MASK); + gen_jump(ctx); + + gen_set_label(l1); +@@ -361,8 +361,8 @@ static inline void gen_store_fpr64(DisasContext *ctx, TCGv_i64 t, int reg) + #define XHACK(x) ((((x) & 1 ) << 4) | ((x) & 0xe)) + + #define CHECK_NOT_DELAY_SLOT \ +- if (ctx->envflags & TB_FLAG_DELAY_SLOT_MASK) { \ +- goto do_illegal_slot; \ ++ if (ctx->envflags & DELAY_SLOT_MASK) { \ ++ goto do_illegal_slot; \ + } + + #define CHECK_PRIVILEGED \ +@@ -436,7 +436,7 @@ static void _decode_opc(DisasContext * ctx) + case 0x000b: /* rts */ + CHECK_NOT_DELAY_SLOT + tcg_gen_mov_i32(cpu_delayed_pc, cpu_pr); +- ctx->envflags |= TB_FLAG_DELAY_SLOT; ++ ctx->envflags |= DELAY_SLOT; + ctx->delayed_pc = (uint32_t) - 1; + return; + case 0x0028: /* clrmac */ +@@ -458,7 +458,7 @@ static void _decode_opc(DisasContext * ctx) + CHECK_NOT_DELAY_SLOT + gen_write_sr(cpu_ssr); + tcg_gen_mov_i32(cpu_delayed_pc, cpu_spc); +- ctx->envflags |= TB_FLAG_DELAY_SLOT_RTE; ++ ctx->envflags |= DELAY_SLOT_RTE; + ctx->delayed_pc = (uint32_t) - 1; + ctx->base.is_jmp = DISAS_STOP; + return; +@@ -513,15 +513,12 @@ static void _decode_opc(DisasContext * ctx) + return; + case 0xe000: /* mov #imm,Rn */ + #ifdef CONFIG_USER_ONLY +- /* +- * Detect the start of a gUSA region (mov #-n, r15). +- * If so, update envflags and end the TB. This will allow us +- * to see the end of the region (stored in R0) in the next TB. +- */ ++ /* Detect the start of a gUSA region. If so, update envflags ++ and end the TB. This will allow us to see the end of the ++ region (stored in R0) in the next TB. */ + if (B11_8 == 15 && B7_0s < 0 && + (tb_cflags(ctx->base.tb) & CF_PARALLEL)) { +- ctx->envflags = +- deposit32(ctx->envflags, TB_FLAG_GUSA_SHIFT, 8, B7_0s); ++ ctx->envflags = deposit32(ctx->envflags, GUSA_SHIFT, 8, B7_0s); + ctx->base.is_jmp = DISAS_STOP; + } + #endif +@@ -547,13 +544,13 @@ static void _decode_opc(DisasContext * ctx) + case 0xa000: /* bra disp */ + CHECK_NOT_DELAY_SLOT + ctx->delayed_pc = ctx->base.pc_next + 4 + B11_0s * 2; +- ctx->envflags |= TB_FLAG_DELAY_SLOT; ++ ctx->envflags |= DELAY_SLOT; + return; + case 0xb000: /* bsr disp */ + CHECK_NOT_DELAY_SLOT + tcg_gen_movi_i32(cpu_pr, ctx->base.pc_next + 4); + ctx->delayed_pc = ctx->base.pc_next + 4 + B11_0s * 2; +- ctx->envflags |= TB_FLAG_DELAY_SLOT; ++ ctx->envflags |= DELAY_SLOT; + return; + } + +@@ -1197,7 +1194,7 @@ static void _decode_opc(DisasContext * ctx) + CHECK_NOT_DELAY_SLOT + tcg_gen_xori_i32(cpu_delayed_cond, cpu_sr_t, 1); + ctx->delayed_pc = ctx->base.pc_next + 4 + B7_0s * 2; +- ctx->envflags |= TB_FLAG_DELAY_SLOT_COND; ++ ctx->envflags |= DELAY_SLOT_CONDITIONAL; + return; + case 0x8900: /* bt label */ + CHECK_NOT_DELAY_SLOT +@@ -1207,7 +1204,7 @@ static void _decode_opc(DisasContext * ctx) + CHECK_NOT_DELAY_SLOT + tcg_gen_mov_i32(cpu_delayed_cond, cpu_sr_t); + ctx->delayed_pc = ctx->base.pc_next + 4 + B7_0s * 2; +- ctx->envflags |= TB_FLAG_DELAY_SLOT_COND; ++ ctx->envflags |= DELAY_SLOT_CONDITIONAL; + return; + case 0x8800: /* cmp/eq #imm,R0 */ + tcg_gen_setcondi_i32(TCG_COND_EQ, cpu_sr_t, REG(0), B7_0s); +@@ -1391,14 +1388,14 @@ static void _decode_opc(DisasContext * ctx) + case 0x0023: /* braf Rn */ + CHECK_NOT_DELAY_SLOT + tcg_gen_addi_i32(cpu_delayed_pc, REG(B11_8), ctx->base.pc_next + 4); +- ctx->envflags |= TB_FLAG_DELAY_SLOT; ++ ctx->envflags |= DELAY_SLOT; + ctx->delayed_pc = (uint32_t) - 1; + return; + case 0x0003: /* bsrf Rn */ + CHECK_NOT_DELAY_SLOT + tcg_gen_movi_i32(cpu_pr, ctx->base.pc_next + 4); + tcg_gen_add_i32(cpu_delayed_pc, REG(B11_8), cpu_pr); +- ctx->envflags |= TB_FLAG_DELAY_SLOT; ++ ctx->envflags |= DELAY_SLOT; + ctx->delayed_pc = (uint32_t) - 1; + return; + case 0x4015: /* cmp/pl Rn */ +@@ -1414,14 +1411,14 @@ static void _decode_opc(DisasContext * ctx) + case 0x402b: /* jmp @Rn */ + CHECK_NOT_DELAY_SLOT + tcg_gen_mov_i32(cpu_delayed_pc, REG(B11_8)); +- ctx->envflags |= TB_FLAG_DELAY_SLOT; ++ ctx->envflags |= DELAY_SLOT; + ctx->delayed_pc = (uint32_t) - 1; + return; + case 0x400b: /* jsr @Rn */ + CHECK_NOT_DELAY_SLOT + tcg_gen_movi_i32(cpu_pr, ctx->base.pc_next + 4); + tcg_gen_mov_i32(cpu_delayed_pc, REG(B11_8)); +- ctx->envflags |= TB_FLAG_DELAY_SLOT; ++ ctx->envflags |= DELAY_SLOT; + ctx->delayed_pc = (uint32_t) - 1; + return; + case 0x400e: /* ldc Rm,SR */ +@@ -1842,7 +1839,7 @@ static void _decode_opc(DisasContext * ctx) + fflush(stderr); + #endif + do_illegal: +- if (ctx->envflags & TB_FLAG_DELAY_SLOT_MASK) { ++ if (ctx->envflags & DELAY_SLOT_MASK) { + do_illegal_slot: + gen_save_cpu_state(ctx, true); + gen_helper_raise_slot_illegal_instruction(cpu_env); +@@ -1855,7 +1852,7 @@ static void _decode_opc(DisasContext * ctx) + + do_fpu_disabled: + gen_save_cpu_state(ctx, true); +- if (ctx->envflags & TB_FLAG_DELAY_SLOT_MASK) { ++ if (ctx->envflags & DELAY_SLOT_MASK) { + gen_helper_raise_slot_fpu_disable(cpu_env); + } else { + gen_helper_raise_fpu_disable(cpu_env); +@@ -1870,23 +1867,23 @@ static void decode_opc(DisasContext * ctx) + + _decode_opc(ctx); + +- if (old_flags & TB_FLAG_DELAY_SLOT_MASK) { ++ if (old_flags & DELAY_SLOT_MASK) { + /* go out of the delay slot */ +- ctx->envflags &= ~TB_FLAG_DELAY_SLOT_MASK; ++ ctx->envflags &= ~DELAY_SLOT_MASK; + + /* When in an exclusive region, we must continue to the end + for conditional branches. */ +- if (ctx->tbflags & TB_FLAG_GUSA_EXCLUSIVE +- && old_flags & TB_FLAG_DELAY_SLOT_COND) { ++ if (ctx->tbflags & GUSA_EXCLUSIVE ++ && old_flags & DELAY_SLOT_CONDITIONAL) { + gen_delayed_conditional_jump(ctx); + return; + } + /* Otherwise this is probably an invalid gUSA region. + Drop the GUSA bits so the next TB doesn't see them. */ +- ctx->envflags &= ~TB_FLAG_GUSA_MASK; ++ ctx->envflags &= ~GUSA_MASK; + + tcg_gen_movi_i32(cpu_flags, ctx->envflags); +- if (old_flags & TB_FLAG_DELAY_SLOT_COND) { ++ if (old_flags & DELAY_SLOT_CONDITIONAL) { + gen_delayed_conditional_jump(ctx); + } else { + gen_jump(ctx); +@@ -2226,7 +2223,7 @@ static void decode_gusa(DisasContext *ctx, CPUSH4State *env) + } + + /* The entire region has been translated. */ +- ctx->envflags &= ~TB_FLAG_GUSA_MASK; ++ ctx->envflags &= ~GUSA_MASK; + ctx->base.pc_next = pc_end; + ctx->base.num_insns += max_insns - 1; + return; +@@ -2237,7 +2234,7 @@ static void decode_gusa(DisasContext *ctx, CPUSH4State *env) + + /* Restart with the EXCLUSIVE bit set, within a TB run via + cpu_exec_step_atomic holding the exclusive lock. */ +- ctx->envflags |= TB_FLAG_GUSA_EXCLUSIVE; ++ ctx->envflags |= GUSA_EXCLUSIVE; + gen_save_cpu_state(ctx, false); + gen_helper_exclusive(cpu_env); + ctx->base.is_jmp = DISAS_NORETURN; +@@ -2270,19 +2267,17 @@ static void sh4_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) + (tbflags & (1 << SR_RB))) * 0x10; + ctx->fbank = tbflags & FPSCR_FR ? 0x10 : 0; + +-#ifdef CONFIG_USER_ONLY +- if (tbflags & TB_FLAG_GUSA_MASK) { +- /* In gUSA exclusive region. */ ++ if (tbflags & GUSA_MASK) { + uint32_t pc = ctx->base.pc_next; + uint32_t pc_end = ctx->base.tb->cs_base; +- int backup = sextract32(ctx->tbflags, TB_FLAG_GUSA_SHIFT, 8); ++ int backup = sextract32(ctx->tbflags, GUSA_SHIFT, 8); + int max_insns = (pc_end - pc) / 2; + + if (pc != pc_end + backup || max_insns < 2) { + /* This is a malformed gUSA region. Don't do anything special, + since the interpreter is likely to get confused. */ +- ctx->envflags &= ~TB_FLAG_GUSA_MASK; +- } else if (tbflags & TB_FLAG_GUSA_EXCLUSIVE) { ++ ctx->envflags &= ~GUSA_MASK; ++ } else if (tbflags & GUSA_EXCLUSIVE) { + /* Regardless of single-stepping or the end of the page, + we must complete execution of the gUSA region while + holding the exclusive lock. */ +@@ -2290,7 +2285,6 @@ static void sh4_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) + return; + } + } +-#endif + + /* Since the ISA is fixed-width, we can bound by the number + of instructions remaining on the page. */ +@@ -2315,8 +2309,8 @@ static void sh4_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) + DisasContext *ctx = container_of(dcbase, DisasContext, base); + + #ifdef CONFIG_USER_ONLY +- if (unlikely(ctx->envflags & TB_FLAG_GUSA_MASK) +- && !(ctx->envflags & TB_FLAG_GUSA_EXCLUSIVE)) { ++ if (unlikely(ctx->envflags & GUSA_MASK) ++ && !(ctx->envflags & GUSA_EXCLUSIVE)) { + /* We're in an gUSA region, and we have not already fallen + back on using an exclusive region. Attempt to parse the + region into a single supported atomic operation. Failure +@@ -2336,9 +2330,9 @@ static void sh4_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) + { + DisasContext *ctx = container_of(dcbase, DisasContext, base); + +- if (ctx->tbflags & TB_FLAG_GUSA_EXCLUSIVE) { ++ if (ctx->tbflags & GUSA_EXCLUSIVE) { + /* Ending the region of exclusivity. Clear the bits. */ +- ctx->envflags &= ~TB_FLAG_GUSA_MASK; ++ ctx->envflags &= ~GUSA_MASK; + } + + switch (ctx->base.is_jmp) { +-- +2.38.1 + diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 06d090bd1d..e671e1d184 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 a0634e536bded57cf38ec8a751adb124b89c776fe0846f21ab6c6728f1cbbbe6 qemu-7.1.0.tar.xz +sha256 5b49ce2687744dad494ae90a898c52204a3406e84d072482a1e1be854eeb2157 qemu-7.2.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index d42a16ec3e..05e1cef1d8 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -QEMU_VERSION = 7.1.0 +QEMU_VERSION = 7.2.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c @@ -68,7 +68,7 @@ QEMU_OPTS += --enable-vhost-user endif ifeq ($(BR2_PACKAGE_QEMU_SLIRP),y) -QEMU_OPTS += --enable-slirp=system +QEMU_OPTS += --enable-slirp QEMU_DEPENDENCIES += slirp else QEMU_OPTS += --disable-slirp @@ -256,6 +256,7 @@ HOST_QEMU_DEPENDENCIES = host-libglib2 \ host-pixman \ host-pkgconf \ host-python3 \ + host-slirp \ host-zlib # BR ARCH qemu @@ -400,6 +401,7 @@ define HOST_QEMU_CONFIGURE_CMDS --disable-vnc-jpeg \ --disable-png \ --disable-vnc-sasl \ + --enable-slirp \ --enable-tools \ $(HOST_QEMU_OPTS) endef