From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ACAAA158095 for ; Tue, 27 Sep 2022 03:27:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BEF51E0BC4; Tue, 27 Sep 2022 03:27:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A8663E0BC2 for ; Tue, 27 Sep 2022 03:27:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5C55E3412AB for ; Tue, 27 Sep 2022 03:27:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9039F5E8 for ; Tue, 27 Sep 2022 03:27:20 +0000 (UTC) From: "John Helmert III" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "John Helmert III" Message-ID: <1664249182.d1ccaba75b064ef53978062df4edd341cb752405.ajak@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/qemu/qemu-7.1.0.ebuild X-VCS-Directories: app-emulation/qemu/ X-VCS-Committer: ajak X-VCS-Committer-Name: John Helmert III X-VCS-Revision: d1ccaba75b064ef53978062df4edd341cb752405 X-VCS-Branch: master Date: Tue, 27 Sep 2022 03:27:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 85606383-93b8-4178-8c50-7bf164575987 X-Archives-Hash: 0a4dcfba17b3ee027613f6d0d43efedb commit: d1ccaba75b064ef53978062df4edd341cb752405 Author: John Helmert III gentoo org> AuthorDate: Mon Sep 26 22:35:12 2022 +0000 Commit: John Helmert III gentoo org> CommitDate: Tue Sep 27 03:26:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ccaba7 app-emulation/qemu: --disable-blobs for user builds, not for softmmu Also add a comment explaining new vhost-user-fs logic while here, and clean up dead and commented configure arguments. Signed-off-by: John Helmert III gentoo.org> app-emulation/qemu/qemu-7.1.0.ebuild | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app-emulation/qemu/qemu-7.1.0.ebuild b/app-emulation/qemu/qemu-7.1.0.ebuild index 0fd301c4946b..c60658cd3590 100644 --- a/app-emulation/qemu/qemu-7.1.0.ebuild +++ b/app-emulation/qemu/qemu-7.1.0.ebuild @@ -590,8 +590,6 @@ qemu_src_configure() { $(conf_notuser usbredir usb-redir) $(conf_notuser vde) $(conf_notuser vhost-net) - # $(conf_notuser vhost-user-fs) - # $(conf_tools vhost-user-fs virtiofsd) $(conf_notuser virgl virglrenderer) $(conf_softmmu virtfs) $(conf_notuser vnc) @@ -624,6 +622,7 @@ qemu_src_configure() { conf_opts+=( --enable-linux-user --disable-system + --disable-blobs --disable-tools ) local static_flag="static-user" @@ -632,7 +631,6 @@ qemu_src_configure() { conf_opts+=( --disable-linux-user --enable-system - --disable-blobs --disable-tools ) local static_flag="static" @@ -698,6 +696,11 @@ src_configure() { softmmu_targets+=",${target}-softmmu" softmmu_bins+=( "qemu-system-${target}" ) + # Needed to rework vhost-user-fs handling thanks to https://gitlab.com/qemu-project/qemu/-/commit/5166dab + # The option was converted into being configurable by + # Kconfig's. So, to enable it, we insert the necessary + # options into each arch's softmmu target gentoo.mak file, + # then configure with --with-devices-${target}=gentoo. if use vhost-user-fs; then echo "CONFIG_VHOST_USER_FS=y for ${target}-softmmu" || die echo "CONFIG_VIRTIO=y" >> "configs/devices/${target}-softmmu/gentoo.mak" || die