From nobody Tue Dec 16 08:32:06 2025 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=1597079934; cv=none; d=zohomail.com; s=zohoarc; b=bLuJVE6/IHf7qMMq7+qsHWaNYsSDkYc9uzViRtz5xUacGEm/VA8uU9p4OTpvAE3bmpjLrGZk59xhEhtDKg4M0d9JQoT1rRK7RY7ZM8U4/X3MlaFFqjAORUPtwTnXpKpDGyifzAp5TodE/kzlOo0r1VT4FbNPiiuJZOPlTv7JZO4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597079934; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=/eKDAppMzHly2kSxSsBozLIEil9XqJkWiigiUyZJgOg=; b=NQfQXsfDQZz28cBvB/WGpkV3Axv8tCZ1NFC5s6yl0QrOpfYd6yvP+CS2GVaYBgZ7gOpMRK5v0Av67Fsu6oRmHoyYzqEQqmXW01KS5lq+HHTPBFlEjQgIxQy64zAAnjj0gTzEdKyUC/KEB9FGN/YEPCDbf7WodwSqKEByGMktUgk= 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 1597079934331744.1542032323028; Mon, 10 Aug 2020 10:18:54 -0700 (PDT) Received: from localhost ([::1]:40662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BRl-0005S6-3x for importer@patchew.org; Mon, 10 Aug 2020 13:18:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJ1-0006I2-7W for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:51 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:46895 helo=us-smtp-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 1k5BIz-0002ll-BA for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:50 -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-423-YtuHCoBSMYOXNxY6oEtG0Q-1; Mon, 10 Aug 2020 13:09:46 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EB51919057A0 for ; Mon, 10 Aug 2020 17:09:45 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D0925F1E9 for ; Mon, 10 Aug 2020 17:09:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=/eKDAppMzHly2kSxSsBozLIEil9XqJkWiigiUyZJgOg=; b=MVr0btPJrL0ZSrBZlPJC4bLOowYe4Y8H0NJf0nu31wRza6b5JDTBXdKPo8cc4Mxg9ysl8y NDMOSI30xJ0/9ICQguJUlcIrmJ1p6FyaPj8tlJIW4tm42lv7gPm7ZmcZ/0j1nFRBO6tJR8 saMaQtOL6JN7qQcTJWo9NPOj5UG6c1M= X-MC-Unique: YtuHCoBSMYOXNxY6oEtG0Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 022/147] meson: add sparse support Date: Mon, 10 Aug 2020 19:07:00 +0200 Message-Id: <1597079345-42801-23-git-send-email-pbonzini@redhat.com> In-Reply-To: <1597079345-42801-1-git-send-email-pbonzini@redhat.com> References: <1597079345-42801-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Do not use cgcc; instead, extract compilation commands from compile_command= s.json and invoke sparse directly. Signed-off-by: Paolo Bonzini --- Makefile | 1 + configure | 8 ++------ meson.build | 7 +++++++ scripts/check_sparse.py | 25 +++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 scripts/check_sparse.py diff --git a/Makefile b/Makefile index 1da5927..12c68a2 100644 --- a/Makefile +++ b/Makefile @@ -1245,6 +1245,7 @@ endif $(call print-help,install,Install QEMU, documentation and tools) $(call print-help,ctags/TAGS,Generate tags file for editors) $(call print-help,cscope,Generate cscope index) + $(call print-help,sparse,Run sparse on the QEMU source) @echo '' @$(if $(TARGET_DIRS), \ echo 'Architecture specific targets:'; \ diff --git a/configure b/configure index 94cf0a3..53527f6 100755 --- a/configure +++ b/configure @@ -2991,7 +2991,7 @@ fi ########################################## # Sparse probe if test "$sparse" !=3D "no" ; then - if has cgcc; then + if has sparse; then sparse=3Dyes else if test "$sparse" =3D "yes" ; then @@ -7782,11 +7782,7 @@ echo "QEMU_CFLAGS=3D$QEMU_CFLAGS" >> $config_host_mak echo "QEMU_CXXFLAGS=3D$QEMU_CXXFLAGS" >> $config_host_mak echo "QEMU_INCLUDES=3D$QEMU_INCLUDES" >> $config_host_mak if test "$sparse" =3D "yes" ; then - echo "CC :=3D REAL_CC=3D\"\$(CC)\" cgcc" >> $config_host= _mak - echo "CPP :=3D REAL_CC=3D\"\$(CPP)\" cgcc" >> $config_host= _mak - echo "CXX :=3D REAL_CC=3D\"\$(CXX)\" cgcc" >> $config_host= _mak - echo "HOST_CC :=3D REAL_CC=3D\"\$(HOST_CC)\" cgcc" >> $config_host= _mak - echo "QEMU_CFLAGS +=3D -Wbitwise -Wno-transparent-union -Wno-old-initia= lizer -Wno-non-pointer-null" >> $config_host_mak + echo "SPARSE_CFLAGS =3D -Wbitwise -Wno-transparent-union -Wno-old-initia= lizer -Wno-non-pointer-null" >> $config_host_mak fi echo "QEMU_LDFLAGS=3D$QEMU_LDFLAGS" >> $config_host_mak echo "LDFLAGS_NOPIE=3D$LDFLAGS_NOPIE" >> $config_host_mak diff --git a/meson.build b/meson.build index b368929..e227b43 100644 --- a/meson.build +++ b/meson.build @@ -17,6 +17,13 @@ add_project_arguments(config_host['QEMU_INCLUDES'].split= (), =20 python =3D import('python').find_installation(config_host['PYTHON'].split(= )[0]) =20 +if 'SPARSE_CFLAGS' in config_host + run_target('sparse', + command: [find_program('scripts/check_sparse.py'), + config_host['SPARSE_CFLAGS'].split(), + 'compile_commands.json']) +endif + if host_machine.system() =3D=3D 'darwin' add_languages('objc', required: false) endif diff --git a/scripts/check_sparse.py b/scripts/check_sparse.py new file mode 100644 index 0000000..0de7aa5 --- /dev/null +++ b/scripts/check_sparse.py @@ -0,0 +1,25 @@ +#! /usr/bin/env python3 + +# Invoke sparse based on the contents of compile_commands.json + +import json +import subprocess +import sys +import shlex + +def extract_cflags(shcmd): + cflags =3D shlex.split(shcmd) + return [x for x in cflags + if x.startswith('-D') or x.startswith('-I') or x.startswith('-= W') + or x.startswith('-std=3D')] + +cflags =3D sys.argv[1:-1] +with open(sys.argv[-1], 'r') as fd: + compile_commands =3D json.load(fd) + +for cmd in compile_commands: + cmd =3D ['sparse'] + cflags + extract_cflags(cmd['command']) + [cmd['f= ile']] + print(' '.join((shlex.quote(x) for x in cmd))) + r =3D subprocess.run(cmd) + if r.returncode !=3D 0: + sys.exit(r.returncode) --=20 1.8.3.1