From nobody Sun Jan 25 10:00:16 2026 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1769193927; cv=none; d=zohomail.com; s=zohoarc; b=NXxGGGWePHZf2+fAI5HBotg9wgxjvXN7pr7NyooHn9rNnsGRS+8fu8nix3TNF6xDxcpxZYtrOh1y/rBMfR81ihtKgAiDY/gkB/6XaTiNiNi2hYkTfUoqN+PGxCI2vFZ6aPyH/4/dxkVCgIjqDfCYnxpSPNo27mj0NSrgqffqLhA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769193927; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=M5qvspvGpqArNdGdvsDr4MxSxK/KhdRiStszzeno6DI=; b=GHXIiLnIVToZWhUSlbDDxetvlP0YDLl3Ny0ZS6A8YCL0AOBkAkSJLhrasgjnBaQedtg5dSt6VcGuAvnOJ9I1KxTPlJuJkJByRXNWbF5iYhAemJxVbTUGYQmKjtZWv50IBpJ58lABq8LRfv3Y88z4U3I8S4GygYPJWLzqP803Sx8= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1769193927080932.7602820539845; Fri, 23 Jan 2026 10:45:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vjM9S-0005yO-92; Fri, 23 Jan 2026 13:44:59 -0500 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 1vjM9K-0005rZ-QK for qemu-devel@nongnu.org; Fri, 23 Jan 2026 13:44:52 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vjM9G-00051q-Ow for qemu-devel@nongnu.org; Fri, 23 Jan 2026 13:44:49 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-626-N8T84F2hMYmMnDV7s-oQYw-1; Fri, 23 Jan 2026 13:44:35 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C4AD51956094; Fri, 23 Jan 2026 18:44:33 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.22]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1D0091958DC4; Fri, 23 Jan 2026 18:44:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1769193881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=M5qvspvGpqArNdGdvsDr4MxSxK/KhdRiStszzeno6DI=; b=SngUfJ5ge8y9ovIGpvs2GbRNvjlWv0lw4sbZKcLGZV3r/o05rE05WSpDkzUfys03IMDjVV 4XZTbK686NmssXY9ZMjUXXP0OtKreL4mXSjYGIpn0m6tJbZMLJCifIE3N4UQuW0d89Sn7A +0qgBzTtNzLOpbjzYOTZ3JTLJdIMFZ4= X-MC-Unique: N8T84F2hMYmMnDV7s-oQYw-1 X-Mimecast-MFC-AGG-ID: N8T84F2hMYmMnDV7s-oQYw_1769193874 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , kallisti5@unixzen.com, Prasad Pandit Subject: [PATCH v2] tests/vm: Make the haiku VM usable again Date: Fri, 23 Jan 2026 19:44:29 +0100 Message-ID: <20260123184429.5278-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.079, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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: qemu development 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 @redhat.com) X-ZM-MESSAGEID: 1769193930178154100 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The haiku VM bitrotted in the course of time. Make sure to use the latest version of the repositories here and install missing pieces like "pip" and "tomli" now. Since we nowadays also install our own version of meson in our venv, this also requires a change to our configure script: On Haiku, the meson binary shows up as pyvenv/non-packaged/bin/meson here, and not in the expected location pyvenv/bin/meson. Adjust the "meson" variable to point to that Haiku-specific location to fix this issue. See also: https://github.com/haiku/haiku/blob/r1beta5/docs/user/storage/storageintro.= dox And finally, with the new toolchain from the beta 5, we also have to compile with "-pie", otherwise the linker complains about bad relocations in the object files, so allow compiling with PIE in the configure script now. Reviewed-by: Prasad Pandit Signed-off-by: Thomas Huth --- v2: Reword the sentences about "non-packaged" location, and change the meson variable instead of using a symlink. Prasad, I kept your Reviewed-by, if it's not ok, please complain! configure | 8 +++++++- tests/vm/haiku.x86_64 | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 9d7fd13a98b..78cae5513ad 100755 --- a/configure +++ b/configure @@ -986,6 +986,12 @@ if [ -f "$meson$EXESUF" ]; then meson=3D"$meson$EXESUF" fi =20 +# On Haiku, meson might show up in a "non-packaged" subfolder instead, see +# https://github.com/haiku/haiku/blob/r1beta5/docs/user/storage/storageint= ro.dox +if test "$host_os" =3D "haiku" && test ! -e "$meson" ; then + meson=3D"$(cd pyvenv/non-packaged/bin; get_pwd)/meson" +fi + # Conditionally ensure Sphinx is installed. =20 mkvenv_online_flag=3D"" @@ -1068,7 +1074,7 @@ static THREAD int tls_var; int main(void) { return tls_var; } EOF =20 -if test "$host_os" =3D windows || test "$host_os" =3D haiku; then +if test "$host_os" =3D windows ; then if test "$pie" =3D "yes"; then error_exit "PIE not available due to missing OS support" fi diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64 index 71cf75a9a3e..529283c39f6 100755 --- a/tests/vm/haiku.x86_64 +++ b/tests/vm/haiku.x86_64 @@ -78,6 +78,8 @@ class HaikuVM(basevm.BaseVM): "devel:libusb_1.0", "devel:libz", "ninja", + "pip", + "tomli_python310", ] =20 BUILD_SCRIPT =3D """ @@ -109,6 +111,8 @@ class HaikuVM(basevm.BaseVM): self.wait_ssh(wait_root=3DTrue, cmd=3D"exit 0") =20 # Install packages + self.ssh_root("echo yes | pkgman add-repo https://eu.hpkg.haiku-os= .org/haiku/r1beta5/$(getarch)/current") + self.ssh_root("echo yes | pkgman add-repo https://eu.hpkg.haiku-os= .org/haikuports/r1beta5/$(getarch)/current") self.ssh_root("pkgman install -y %s" % " ".join(self.requirements)) self.graceful_shutdown() =20 --=20 2.52.0