From nobody Mon Feb 9 20:34:40 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597396498; cv=none; d=zohomail.com; s=zohoarc; b=SroUF1E9ply89BRcaWoL65Xd1MEIdabqSG8qoe+duiAHKvYc2BhEWijK6yE7BxX14+yfh5yYPTWIwC908JRUc+EIleEHXiyQTG3t/+KUMYCIXbIEq36gYihYBtyXxjh+hj9NuY4R2OOpqakr5Hp6ox4TPEmz4Ttn6POnnoljIRs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597396498; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=I9hKuV+4GxIHdg4f78rZx+b5318hCEMxJMS+IR9ty5w=; b=SvRfPsOWpnWnZoLLsdnxHa3H+gygiecvcAT9zTq1pWXFo/tB9+JAlinKsornFeuLYVRKhg3bAPpLG9d5QbBu/IJhZ+LznHu1LbI3140xjl+UktztGnhK6MrjkfOs9EQzix/bci5GBITA/GVEoEixIXcvdKwlLXXDkLfDFhaO+iw= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597396498338632.569646189683; Fri, 14 Aug 2020 02:14:58 -0700 (PDT) Received: from localhost ([::1]:33876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6Vnc-0006kO-Rl for importer@patchew.org; Fri, 14 Aug 2020 05:14:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42378) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6VmL-0004rC-SE for qemu-devel@nongnu.org; Fri, 14 Aug 2020 05:13:37 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:44473 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k6VmH-0002mJ-KF for qemu-devel@nongnu.org; Fri, 14 Aug 2020 05:13:37 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-399-a2GsKZXHOr6b34OgQBbfFQ-1; Fri, 14 Aug 2020 05:13:28 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8A83159 for ; Fri, 14 Aug 2020 09:13:27 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5774F6198E for ; Fri, 14 Aug 2020 09:13:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597396410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I9hKuV+4GxIHdg4f78rZx+b5318hCEMxJMS+IR9ty5w=; b=EOF5Mz86FiAu1REp7GLJ+2SRbd+qPpy6lrtzebRaXZGB4btFix528sBrjQ65dmigyWPUR4 hEi8foI443AlB4Ncp4Rzpw0Xzj6Un3mgd2qterXza2ls6qb2E1E32YEhk5jXs8L5Ipmooc 6Tzvgg/7vyF5Zf/6BaFU2QaTwL1dZvQ= X-MC-Unique: a2GsKZXHOr6b34OgQBbfFQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 001/150] oss-fuzz/build: remove LIB_FUZZING_ENGINE Date: Fri, 14 Aug 2020 05:10:57 -0400 Message-Id: <20200814091326.16173-2-pbonzini@redhat.com> In-Reply-To: <20200814091326.16173-1-pbonzini@redhat.com> References: <20200814091326.16173-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com 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=207.211.31.81; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/14 05:13:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Meson build scripts will only include qemu-fuzz-TARGET rules if configured with --enable-fuzzing, and that takes care of adding -fsanitize=3Dfuzzer. Therefore we can just specify the configure option and stop modifying the CFLAGS and CONFIG_FUZZ options in the "make" invocation. Signed-off-by: Paolo Bonzini --- scripts/oss-fuzz/build.sh | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/scripts/oss-fuzz/build.sh b/scripts/oss-fuzz/build.sh index a07b3022e8..52430cb620 100755 --- a/scripts/oss-fuzz/build.sh +++ b/scripts/oss-fuzz/build.sh @@ -20,7 +20,7 @@ # e.g. # $CXX $CXXFLAGS -std=3Dc++11 -Iinclude \ # /path/to/name_of_fuzzer.cc -o $OUT/name_of_fuzzer \ -# $LIB_FUZZING_ENGINE /path/to/library.a +# -fsanitize=3Dfuzzer /path/to/library.a =20 fatal () { echo "Error : ${*}, exiting." @@ -54,10 +54,6 @@ mkdir -p $OSS_FUZZ_BUILD_DIR || fatal "mkdir $OSS_FUZZ_B= UILD_DIR failed" cd $OSS_FUZZ_BUILD_DIR || fatal "cd $OSS_FUZZ_BUILD_DIR failed" =20 =20 -if [ -z ${LIB_FUZZING_ENGINE+x} ]; then - LIB_FUZZING_ENGINE=3D"-fsanitize=3Dfuzzer" -fi - if [ -z ${OUT+x} ]; then DEST_DIR=3D$(realpath "./DEST_DIR") else @@ -67,14 +63,12 @@ fi mkdir -p "$DEST_DIR/lib/" # Copy the shared libraries here =20 # Build once to get the list of dynamic lib paths, and copy them over -../configure --disable-werror --cc=3D"$CC" --cxx=3D"$CXX" \ +../configure --disable-werror --cc=3D"$CC" --cxx=3D"$CXX" --enable-fuzzing= \ --extra-cflags=3D"$EXTRA_CFLAGS" --target-list=3D"i386-softmmu" =20 -if ! make CONFIG_FUZZ=3Dy CFLAGS=3D"$LIB_FUZZING_ENGINE" "-j$(nproc)" \ - i386-softmmu/fuzz; then +if ! make "-j$(nproc)" i386-softmmu/fuzz; then fatal "Build failed. Please specify a compiler with fuzzing support"\ - "using the \$CC and \$CXX environemnt variables, or specify a"\ - "\$LIB_FUZZING_ENGINE compatible with your compiler"\ + "using the \$CC and \$CXX environemnt variables"\ "\nFor example: CC=3Dclang CXX=3Dclang++ $0" fi =20 @@ -87,7 +81,7 @@ rm ./i386-softmmu/qemu-fuzz-i386 ../configure --bindir=3D"$DEST_DIR" --datadir=3D"$DEST_DIR/data/" --disabl= e-werror \ --cc=3D"$CC" --cxx=3D"$CXX" --extra-cflags=3D"$EXTRA_CFLAGS" \ --extra-ldflags=3D"-Wl,-rpath,'\$\$ORIGIN/lib'" -make CONFIG_FUZZ=3Dy CFLAGS=3D"$LIB_FUZZING_ENGINE" "-j$(nproc)" i386-soft= mmu/fuzz +make "-j$(nproc)" i386-softmmu/fuzz =20 # Copy over the datadir cp -r ../pc-bios/ "$DEST_DIR/pc-bios" --=20 2.26.2