From nobody Sat Sep 26 21:35:42 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=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1789470649; cv=none; d=zohomail.com; s=zohoarc; b=RrYihXkS7VZo+5nP5eWtlGjTSkhjoWsfAHCoj1sTend1qbgT2o1KivALKdOZIzwV7JHQBUnzJ2PJHvn4jarf9J9+/UEyYREwGoe8UtUE7VrDDqzebrPlAKn8wIhVzh2LbSu1fblVa+o94yDDS5epAdIwkqGad6heDDjiVCTQQe8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789470649; h=Content-Type: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=s5qEgI6mDVcaUUMc5bIxwrKT/oYGMP9lJk6hmh8jY7c=; b=bVi2rJ0F6B9IHpsUqg4hk7dNexWkEJXZmSgA2aMrDNhea1mjGPo3FLgezuwp5CuWa2+ZoRsu3xvFWgDGpSGSo6HhwxbgPFiLT3Wcib1Py9g3ZHR28rJvNB7Pwbjg1lzFeHnFfgQQeUJ5/85iBZorQnG8TroVaj+PdURWeYdcsdY= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 178947064974582.25999597361499; Tue, 15 Sep 2026 04:10:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6R3Z-0004Bf-Uz; Tue, 15 Sep 2026 07:10:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x6R3I-00046J-9P; Tue, 15 Sep 2026 07:10:17 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x6R3G-00079R-7f; Tue, 15 Sep 2026 07:10:16 -0400 Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68FA1PjZ2831987; Tue, 15 Sep 2026 11:10:09 GMT Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4gmxdq6nan-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 15 Sep 2026 11:10:09 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.11/8.18.1.11) with ESMTP id 68F9oEhV3815490; Tue, 15 Sep 2026 11:10:08 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4gq03v919d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Sep 2026 11:10:08 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68FBA5bs38732036 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Sep 2026 11:10:05 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E66162004B; Tue, 15 Sep 2026 11:10:04 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 92A7C2004F; Tue, 15 Sep 2026 11:10:04 +0000 (GMT) Received: from li-d2cd37cc-2ca3-11b2-a85c-84ed3706e5a0.ibm.com (unknown [9.111.56.140]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 15 Sep 2026 11:10:04 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=pp1; bh=s5qEgI6mDVcaUUMc5bIxwrKT/oYG MP9lJk6hmh8jY7c=; b=GSOzPb3jdDGPstTUrc3A5ESWhViJ9WjATEq5guUPrEel BKH1Pb142XNjf+gYAoxmeMhgUxoQdOSb8/R9J+TB7IMi0egSm1anrWy8jjKmQm7D VMSRsuyKqV0g4ZpAowlGLYKWM+cziMoctGjw0lcch+xDcC7wSR/XURnEsug0G0Lt G9brUgykkeEeR7Z8279j9UiFxqkUc2Mb1m8R9vJQv0EmvZlKNA9TMAmqDQ3w+B8B EztdwpI+CJR1reGS1zWOPUkVAjE7Xms6J6E25yhgU0f2Qxszcysws5RNwNTCDgbR dGEoj2PUmrLnmauzENTPfu4xgHp3H93s+poa/bGmcw== From: Ilya Leoshkevich To: Richard Henderson , David Hildenbrand , Cornelia Huck , Eric Farman , Matthew Rosato Cc: qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Pierrick Bouvier , Ilya Leoshkevich , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v2] tests/tcg/s390x: Provide the libc bits needed by the system tests Date: Tue, 15 Sep 2026 13:09:08 +0200 Message-ID: <20260915110959.492195-1-iii@linux.ibm.com> X-Mailer: git-send-email 2.55.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTE1MDE1OSBTYWx0ZWRfX+2NofexqQbI+ Ufr1MjxW2LXa1IO4thw2vG8Jq62R7jeU61e1wNLonRx2a2MCE2vtY3v+tGOT4widIF6qHZ0kJBG IGP3eSP54W5beiTbw+VzIigMKkN3i6Va3GGpOmCsWHdNrDf2elmGqE0Xp7RYKG0WYDwoO1AaooD hiiVFMXg96l5bvAgWi1Xk+BoS1u/MOp35MWpGRzQBNoOLrVF6YASc8K/hnRx0t2Zjmx85L9CR5k Ripyp2oaysnXdnAot6L9EyKhqkufpyFaWm+3x8jAbO9NRw27PnOAPbGhpQdZwtLxL/rZaFC/wQY qUlMW/m5hrZlpCluA/3nJHZFLtbeWz0L7YyItMh2Bc7ZqSo77Yd+b66afaMSRytQGtti0Zbc4wg 28IA/sKFePPc0X0Vkcy/PVEbBLen7cX/EYXk3hgLsg8X8wturVMrtVM8j1XA5svDsDyiLoxt/xS tir0e0N7E2M0mT70dLw== X-Proofpoint-GUID: 7Vc4qP9jqFAh9SVTPwGMvDCpZekYoSp4 X-Authority-Analysis: v=2.4 cv=DobDa2/+ c=1 sm=1 tr=0 ts=6aa92791 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=GaQpPoNlAAAA:8 a=20KFwNOVAAAA:8 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=urEhAfzsXeLjHp5DDVoA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=xF5q_uoM5gZT5J3czcBi:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: 7Vc4qP9jqFAh9SVTPwGMvDCpZekYoSp4 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTE1MDE1OSBTYWx0ZWRfXx5XMVssH7oYo TFZlyB5+e8rZDKLavu7MaBwSSzUovIALNuRZ+JvZ6Rywk34osoEAQs2HM5WRqiEi6Naua/Lx/I8 g5BJPSlEhWneKck15YkNvAodInGxJco= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-15_03,2026-09-14_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 malwarescore=0 priorityscore=1501 suspectscore=0 impostorscore=0 spamscore=0 clxscore=1015 adultscore=0 bulkscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609150159 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=lists1p.gnu.org; Received-SPF: pass client-ip=148.163.156.1; envelope-from=iii@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: 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 @ibm.com) X-ZM-MESSAGEID: 1789470650971158500 The meson conversion dropped the SLOF libc include path that commit 3fa010d5317 ("tests/tcg/s390x: Use the SLOF libc headers for the multiarch tests") had added, breaking the build on systems without a cross-libc, such as Fedora. Rather than reintroducing a dependency on the SLOF submodule, which no other tcg test has, declare the three functions that the reused pc-bios code actually needs: memcpy(), memset(), and printf(). Reported-by: Daniel P. Berrang=C3=A9 Reported-by: Alex Benn=C3=A9e Closes: https://patchew.org/QEMU/20260910100120.2076092-1-berrange@redhat.c= om/ Suggested-by: Pierrick Bouvier Fixes: cd81cf86834 ("tests/tcg/s390x: system tests") Signed-off-by: Ilya Leoshkevich Reviewed-by: Pierrick Bouvier --- v1: https://lore.kernel.org/qemu-devel/20260914235113.272992-1-iii@linux.ib= m.com/ v1 -> v2: Drop the SLOF dependency (Pierrick) tests/tcg/s390x/libc/stdio.h | 11 +++++++++++ tests/tcg/s390x/libc/string.h | 12 ++++++++++++ tests/tcg/s390x/system/meson.build | 2 ++ 3 files changed, 25 insertions(+) create mode 100644 tests/tcg/s390x/libc/stdio.h create mode 100644 tests/tcg/s390x/libc/string.h diff --git a/tests/tcg/s390x/libc/stdio.h b/tests/tcg/s390x/libc/stdio.h new file mode 100644 index 00000000000..c3e45995f65 --- /dev/null +++ b/tests/tcg/s390x/libc/stdio.h @@ -0,0 +1,11 @@ +/* + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#ifndef QEMU_TESTS_S390X_STDIO_H +#define QEMU_TESTS_S390X_STDIO_H + +#include + +#define printf ml_printf + +#endif diff --git a/tests/tcg/s390x/libc/string.h b/tests/tcg/s390x/libc/string.h new file mode 100644 index 00000000000..1cabeb90adf --- /dev/null +++ b/tests/tcg/s390x/libc/string.h @@ -0,0 +1,12 @@ +/* + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#ifndef QEMU_TESTS_S390X_STRING_H +#define QEMU_TESTS_S390X_STRING_H + +#include + +void *memcpy(void *dest, const void *src, size_t n); +void *memset(void *dest, int c, size_t size); + +#endif diff --git a/tests/tcg/s390x/system/meson.build b/tests/tcg/s390x/system/me= son.build index ca07f503058..1e360e70821 100644 --- a/tests/tcg/s390x/system/meson.build +++ b/tests/tcg/s390x/system/meson.build @@ -6,11 +6,13 @@ link_script =3D files('../softmmu.ld')[0] head64 =3D files('../head64.S')[0] console =3D files('../console.c')[0] ipl_inc =3D meson.project_source_root()/'include'/'hw'/'s390x'/'ipl' +libc_inc =3D meson.current_source_dir()/'..'/'libc' cflags =3D ['-nostdlib', '-ffreestanding', '-Wa,--noexecstack', '-I', minilib_dir, minilib_printf, '-I', ipl_inc, + '-I', libc_inc, '-march=3Dz13', head64, console] asmflags =3D ['-nostdlib', --=20 2.55.0