From nobody Wed May 1 00:58:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1554825800; cv=none; d=zoho.com; s=zohoarc; b=nms9wEA6ia6jJF5j3qQdnbU34Hkp7fMKQ/BYfnS/bhDUeSrHVeBsmSX07iBDVXlCd+zxT5cEFaszjY3Z/qeLW9WfRi3IB+7VjeIvjjKSAcU2Qh7xyJ44i5MYtQXtd2tJ1hnO4Ea9lxisq1Fl4uiuTm/1z/GjjitOdG1pMv6A0Eo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554825800; h=Content-Type:Content-Transfer-Encoding:Cc: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:ARC-Authentication-Results; bh=GhKLXN4x2Bh28KK1khKEa4UYDz15n5B2iNQEOKiXWDU=; b=FxdFzFsQmIYaGFhpDHXUUtqdQVs7GIjiwvlLeTUpjJJ5r6L1sjA7NoEtrRKIxr8E2//J3082fe+PhepdpJTv8k1zsN+DB7TqdoGvb01RwW/3lJcQU2XQReUPRwcAF0FnAIyNS11D71uvpAGoZ2ehy7QzFis1Xf/IJrbwMIUl4kU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1554825800588562.879411515856; Tue, 9 Apr 2019 09:03:20 -0700 (PDT) Received: from localhost ([127.0.0.1]:45294 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDtDJ-0005AQ-PF for importer@patchew.org; Tue, 09 Apr 2019 12:03:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51442) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDt5u-00085V-GB for qemu-devel@nongnu.org; Tue, 09 Apr 2019 11:55:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDt5t-0004h5-5l for qemu-devel@nongnu.org; Tue, 09 Apr 2019 11:55:30 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:54454) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDt5s-0004Yt-OZ for qemu-devel@nongnu.org; Tue, 09 Apr 2019 11:55:29 -0400 Received: by mail-wm1-x343.google.com with SMTP id c1so2754825wml.4 for ; Tue, 09 Apr 2019 08:55:20 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id g84sm23117586wmf.25.2019.04.09.08.55.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 08:55:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GhKLXN4x2Bh28KK1khKEa4UYDz15n5B2iNQEOKiXWDU=; b=cKWoLD40bDwygYPNvWRBvY3qZSsxFEhVr8mEw0aqsYbO/2XBcwjPyYlEiRfhaknMhg 3Ytt06vf7abySROspb2mKhtA/+gXBlywU6eW/mkpawFNbplJdZ+raOMwR7p2WYh0hUGY yWqWYNjzIpI0r56ZzqB6CEEg2bThvgPHkIwhdXw9idbLZLPgTe+JqULeoVFDPuJNMw/+ uFFSpTJH5Kbja7Hm4mFLZhv1j4JV5eroC+vU8/rgLmsKmrqoFFC+SoPrC7oxp1imWaCZ +jFWhbFscP6kRtNYeBAAbCSpiTsWOjstyudyb5Mzcuamw7g3gyK8rS8yTa6Ropm7xpKS OnYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GhKLXN4x2Bh28KK1khKEa4UYDz15n5B2iNQEOKiXWDU=; b=E7D2lL8MBQYDEN3Ikf3GhkFF2eZXVaYXNpU+WjcZqG4mc3WivDLD2sTj6m7pY7HbEl d0xUD0ha2nbOLApaaKwUZlllFjidB3umOoq1ofpf68l8Qi15g+lk9HBEHU/Ctpg7hOdu 4TtydmiFovr+tcNi8pEat8wE2N1KZ/mth6SZsu6BNra9Jd1x0780fXD/j0ENvc/uy1wS cU/c2FO5026j+GyqPX0vuePrmnreumPheqLaV7r6HQahFinKFr3jbBbChCN+LgJmMgy4 Wz0zOPKZmr0i+WAI627k2eitgEuDk2lPXw1M4wf40QbCo2Wt+AjziCqFIeNPrVAqXSsU pLAQ== X-Gm-Message-State: APjAAAVlMwhK+mJuHbFq/9yBA06ia7AyMlyVtHjoN1hLlGSatoRwdhxZ gP4n2pRb4/Gp8gB0tiCuXcYqcaNT X-Google-Smtp-Source: APXvYqytC9j4er2lGii0cKFz5V5jD7BDBwqhBO91bKHMXoVcQqtKWGhairomXfOoLK2JLKg4D93r5Q== X-Received: by 2002:a1c:808c:: with SMTP id b134mr21818519wmd.16.1554825318737; Tue, 09 Apr 2019 08:55:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 9 Apr 2019 17:55:12 +0200 Message-Id: <1554825316-33288-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1554825316-33288-1-git-send-email-pbonzini@redhat.com> References: <1554825316-33288-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PULL 1/5] roms: Rename the EFIROM variable to avoid clashing with iPXE X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The iPXE's 'veryclean' recipe removes $(EFIROM) even if the EFIROM macro originates from elsewhere: $ git checkout f590a812c21~ $ make -C roms clean EFIROM=3D$(type -P EfiRom) make: Entering directory '/source/qemu/roms' [...] make -C ipxe/src veryclean make[1]: Entering directory '/source/qemu/roms/ipxe/src' rm -f bin{,-*}/*.* bin{,-*}/.certificate.* bin{,-*}/.certificates.* bin{,= -*}/.private_key.* bin{,-*}/errors bin{,-*}/NIC ./util/zbin ./util/elf2efi3= 2 ./util/elf2efi64 /usr/bin/EfiRom ./util/efifatbin ./util/iccfix ./util/ei= nfo TAGS bin{,-*}/symtab rm: cannot remove '/usr/bin/EfiRom': Permission denied make[1]: *** [Makefile.housekeeping:1564: clean] Error 1 make[1]: Leaving directory '/source/qemu/roms/ipxe/src' make: *** [Makefile:152: clean] Error 2 make: Leaving directory '/source/qemu/roms' Before f590a812c21 this variable could be overridden or unset, and the 'veryclean' Makefile rule would not complain. Commit f590a812c21 enforces this variable to the Intel EfiRom tool provided by the EDK2 project. To avoid the name clash and make the difference between the projects obvious, rename the variable used by the EDK2 project as EDK2_EFIROM. Fixes: f590a812c21074e82228de3e1dfb57b75fc02b62 Reported-by: Olaf Hering Reviewed-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190409134536.15548-2-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- roms/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roms/Makefile b/roms/Makefile index 78d5dd1..d28252d 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -47,7 +47,7 @@ SEABIOS_EXTRAVERSION=3D"-prebuilt.qemu.org" # We need that to combine multiple images (legacy bios, # efi ia32, efi x64) into a single rom binary. # -EFIROM =3D edk2/BaseTools/Source/C/bin/EfiRom +EDK2_EFIROM =3D edk2/BaseTools/Source/C/bin/EfiRom =20 default: @echo "nothing is build by default" @@ -102,8 +102,8 @@ pxe-rom-%: build-pxe-roms =20 efirom: $(patsubst %,efi-rom-%,$(pxerom_variants)) =20 -efi-rom-%: build-pxe-roms build-efi-roms $(EFIROM) - $(EFIROM) -f "0x$(VID)" -i "0x$(DID)" -l 0x02 \ +efi-rom-%: build-pxe-roms build-efi-roms $(EDK2_EFIROM) + $(EDK2_EFIROM) -f "0x$(VID)" -i "0x$(DID)" -l 0x02 \ -b ipxe/src/bin/$(VID)$(DID).rom \ -ec ipxe/src/bin-i386-efi/$(VID)$(DID).efidrv \ -ec ipxe/src/bin-x86_64-efi/$(VID)$(DID).efidrv \ @@ -120,7 +120,7 @@ build-efi-roms: build-pxe-roms $(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \ $(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets)) =20 -$(EFIROM): +$(EDK2_EFIROM): $(MAKE) -C edk2/BaseTools =20 slof: --=20 1.8.3.1 From nobody Wed May 1 00:58:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1554825452; cv=none; d=zoho.com; s=zohoarc; b=iITTK//UBxJl6FH+ETan2ol6Yj3Ti2Nst2AppNi4RnI254ArRp05vQPKIX66PADjV/rYEdKBXwqCV3dAx7qIXmvFMAIon9L0EqU9LhFxC8liU8LutZlieM+Tx5JyeBQCsTpmCNhWpb1FccMlrx5hP+O1pAN03g2LZUWUp9MFFPM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554825452; h=Content-Type:Content-Transfer-Encoding:Cc: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:ARC-Authentication-Results; bh=J/oX2Py0fTzs8jjZVuYDRStPJAK1DgZHWNwrWKfTCFU=; b=XguOlg/DxnIlGtdEUeSZqFZXvnuQtWuO0fAm7Ot0OJpCiNbre+AMHkIM9SE8Yw5ibLX+mgJNsyrGa24rCnZcCV1ekOLfDaS7hHkHzJPvApEVJwL281l39eIxGr1Zm7VI3mK5tzwK5TUQHD8hTSB4Od37vW7ia7/f2w/E4gfbLP0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1554825452979354.95130093443095; Tue, 9 Apr 2019 08:57:32 -0700 (PDT) Received: from localhost ([127.0.0.1]:45133 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDt7l-0000fU-0Q for importer@patchew.org; Tue, 09 Apr 2019 11:57:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51460) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDt5u-00085w-Uz for qemu-devel@nongnu.org; Tue, 09 Apr 2019 11:55:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDt5t-0004hn-If for qemu-devel@nongnu.org; Tue, 09 Apr 2019 11:55:30 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:37164) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDt5t-0004ZC-4p for qemu-devel@nongnu.org; Tue, 09 Apr 2019 11:55:29 -0400 Received: by mail-wm1-x332.google.com with SMTP id v14so3942836wmf.2 for ; Tue, 09 Apr 2019 08:55:20 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id g84sm23117586wmf.25.2019.04.09.08.55.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 08:55:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J/oX2Py0fTzs8jjZVuYDRStPJAK1DgZHWNwrWKfTCFU=; b=FvXF1QTDpU6TaBFbNUGnUlewy8t6GaaDqjenPSQheCRGIPFOtDvprpCzD07LR15mZe xfToRJpQnMWOmB9JxMPNPO2D9564WwPDbDBX82FxL14sf4wn9hFQXfkVHQt+EvldiuOF el/OnuNtQnrSCqGDU4CwBAITNf38Kx/PIOB6EjwFJUVYruMTHbW/XIHDVAqvG+pSQiJk j5TKU5fMd9vt9rpxLGi08Sg/Jdc9U8QkIuVywjxKV0aAwas59OjpmUDJEJn74ZW1AH44 agc0vqCq+uiWjDqR8U9tZ3N+4ysQ0fHzSErdDn2JPGoP4uiZmyUDR4s9sizIiDBSfO47 9lxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=J/oX2Py0fTzs8jjZVuYDRStPJAK1DgZHWNwrWKfTCFU=; b=cBkAQy1qVfJx9kQ2qBIOK9AtV3EbGZFQI7oWNg6FPXdQPBwSiYdhQkDiyszawVWFb1 dn2qYfKXG1YdbATeHFsNJyaeL8pJjvtfE0UV40JkheKw1zufrr6lEP/9ChdWbdzZAp6T 0HcitU8NUxgOqFF6/VoIysTpkg5H5qb9c9naA3XuXDkpAU9Mg17nBNSws/VVX9k6LFye wnkPlH3/GNeg3xxVRluituYNp7e0wGckejlWZvdyBBZikQOOX35yXZV5S+rFASSC+2Oj CcQv7nzA/nAj/dP9trFq9ALV/NxqSykcQ4via+12PiW9wyxBM9k75U83tWAiOXTsKnFf esXw== X-Gm-Message-State: APjAAAWbGA6+FOoCItkpqANpk0B9CegQQQQQ7NAySa8JjcLen50fQGZr L0cx2aNqpZK+7UKoc5GdmGbpcf9n X-Google-Smtp-Source: APXvYqxSx4q2pTGiQ92UGGrX1JNMoptBKT4UXnPFsJt7uHKBuPePvkxnZAooMObkgPky7ptg+sV89g== X-Received: by 2002:a1c:c287:: with SMTP id s129mr23509899wmf.63.1554825319658; Tue, 09 Apr 2019 08:55:19 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 9 Apr 2019 17:55:13 +0200 Message-Id: <1554825316-33288-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1554825316-33288-1-git-send-email-pbonzini@redhat.com> References: <1554825316-33288-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::332 Subject: [Qemu-devel] [PULL 2/5] roms: Allow passing configure options to the EDK2 build tools X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Since commit f590a812c210 we build the EDK2 EfiRom utility unconditionally. Some distributions require to use extra compiler/linker flags, i.e. SUSE which enforces the PIE protection (see [*]). EDK2 build tools already provide a set of variables for that, use them to allow the caller to easily inject compiler/linker options.. Now build scripts can pass extra options, example: $ make -C roms \ EDK2_BASETOOLS_OPTFLAGS=3D'-fPIE' \ efirom [*] https://lists.opensuse.org/opensuse-factory/2017-06/msg00403.html Reported-by: Olaf Hering Suggested-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190409134536.15548-3-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- roms/Makefile | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/roms/Makefile b/roms/Makefile index d28252d..1ff78b6 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -120,8 +120,21 @@ build-efi-roms: build-pxe-roms $(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \ $(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets)) =20 +# Build scripts can pass compiler/linker flags to the EDK2 build tools +# via the EDK2_BASETOOLS_OPTFLAGS (CPPFLAGS and CFLAGS) and +# EDK2_BASETOOLS_LDFLAGS (LDFLAGS) environment variables. +# +# Example: +# +# make -C roms \ +# EDK2_BASETOOLS_OPTFLAGS=3D'...' \ +# EDK2_BASETOOLS_LDFLAGS=3D'...' \ +# efirom +# $(EDK2_EFIROM): - $(MAKE) -C edk2/BaseTools + $(MAKE) -C edk2/BaseTools \ + EXTRA_OPTFLAGS=3D'$(EDK2_BASETOOLS_OPTFLAGS)' \ + EXTRA_LDFLAGS=3D'$(EDK2_BASETOOLS_LDFLAGS)' =20 slof: $(MAKE) -C SLOF CROSS=3D$(powerpc64_cross_prefix) qemu --=20 1.8.3.1 From nobody Wed May 1 00:58:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1554825597; cv=none; d=zoho.com; s=zohoarc; b=Mf/5Be7e0d7uah1RADcFYOa9xJcb69JnbyOQlDUzXyPlY1zaz+nwoku0eU3EI+3e4bllCJh190Z59I+PMCJWV0x8mRbpp8Vzk5UT8Z+9nLdnVujt+wZlG35zroqGA4eroMlfa9xr6GbEFliTnIh3N3iYo8iYCA3aPvfLUTq0tRg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554825597; h=Content-Type:Content-Transfer-Encoding:Cc: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:ARC-Authentication-Results; bh=Nts/WXslIMz+rtQxBycO4tlKgkT4fO9y2InuBgzzg+4=; b=TbdK7O6w625OFZkL0BCDHb7LmWaXhEEFFHC8bNuKmAJsBAs1L/03CnbizXMTvOAac8T+wSNU3YvViwQML5Vx4LSeYBfrTvFEzSjTMCzzJopo9YWgV8pmVGxQL8MIIDPcsHZliZVClOwdMUd1TaHI/VCuf+hfUXSOVTzbv7RE+aQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1554825597206993.5722447311191; Tue, 9 Apr 2019 08:59:57 -0700 (PDT) Received: from localhost ([127.0.0.1]:45151 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDtA7-0002lM-5r for importer@patchew.org; Tue, 09 Apr 2019 11:59:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51426) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDt5u-00084v-3u for qemu-devel@nongnu.org; Tue, 09 Apr 2019 11:55:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDt5s-0004gc-PN for qemu-devel@nongnu.org; Tue, 09 Apr 2019 11:55:30 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:38305) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDt5q-0004Zf-QM for qemu-devel@nongnu.org; Tue, 09 Apr 2019 11:55:27 -0400 Received: by mail-wr1-x441.google.com with SMTP id k11so21614638wro.5 for ; Tue, 09 Apr 2019 08:55:21 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id g84sm23117586wmf.25.2019.04.09.08.55.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 08:55:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Nts/WXslIMz+rtQxBycO4tlKgkT4fO9y2InuBgzzg+4=; b=u/DDeoO5dpRRkonqL/LkuBI9+y/aRA853yrotuF+IfO1aROH6KMVEf2pkIZMsEzbHm Fh92Sq6Du3jACRKl8RLiDzpPLpWxHbJRvHrSiFxiOn34MWayO+jEUqQpkwqbG5UEN6Hp AgzCpi69ZjI4L0unS9aW6nn+byxNeZ2QcUXbmWPf7g1Nc+26TvafN0vXZ9Zg5vMHLKWJ dNRydWYBKdlwei3v7D5nFTXxC5evXipJ1jMyKMKzT3XH9x/lArwmt38kFrxIhRunxm5y cshfdF2WIB0XVcCIET3PfUZ7t7W5RlTlKMIBhN+TGth9M+5apzPbNDmykrccpA6V6RK4 boPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Nts/WXslIMz+rtQxBycO4tlKgkT4fO9y2InuBgzzg+4=; b=FzZ2JkjO1fH42x155YJQYWtE/8NPwnmSBFKg0hOmSFUZgQ4608cNMeYc4fe/gituQZ gTs26EcP2jSd71N0JCKIY48gzFTKXp5f3p3NxmMbuloEq3HLwTtSv6hLxgMMVQpffqfN ihpuMgURhhj/wyEmzrkBBGXxCdI0E0x6c5uHcZQ0EgBtic81peL+iJnub50Tv3gcrMcV 0u6SiOQTdXKT/UCqjsuAgO+7d5VcKe3huz5xt+R5HahCT/84wAemhxxjwqc38OuUmC9l tXM0WXYWT/8S3eqpTPq+UkYOAutQlvc8IIW0XAdzGJt9QThPmE0KB9uM0EPeQOudyrTI mupg== X-Gm-Message-State: APjAAAWfFwXH6cXp9nESw61jFNacD7ADOJSq4vctqCaiTDyaoGzeeUlP VRF/61QzApmbEHMpefuXWW0Fi00T X-Google-Smtp-Source: APXvYqybAC7eW4DXdeXy+V3I/SV+jBZPs38njOPyTDyif+VvTjRECjI7sOHdyCjE9YOieNcVdReQZQ== X-Received: by 2002:adf:ef91:: with SMTP id d17mr22866739wro.78.1554825320639; Tue, 09 Apr 2019 08:55:20 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 9 Apr 2019 17:55:14 +0200 Message-Id: <1554825316-33288-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1554825316-33288-1-git-send-email-pbonzini@redhat.com> References: <1554825316-33288-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PULL 3/5] include/qemu/bswap.h: Use __builtin_memcpy() in accessor functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Peter Maydell In the accessor functions ld*_he_p() and st*_he_p() we use memcpy() to perform a load or store to a pointer which might not be aligned for the size of the type. We rely on the compiler to optimize this memcpy() into an efficient load or store instruction where possible. This is required for good performance, but at the moment it is also required for correct operation, because some users of these functions require that the access is atomic if the pointer is aligned, which will only be the case if the compiler has optimized out the memcpy(). (The particular example where we discovered this is the virtio vring_avail_idx() which calls virtio_lduw_phys_cached() which eventually ends up calling lduw_he_p().) Unfortunately some compile environments, such as the fortify-source setup used in Alpine Linux, define memcpy() to a wrapper function in a way that inhibits this compiler optimization. The correct long-term fix here is to add a set of functions for doing atomic accesses into AddressSpaces (and to other relevant families of accessor functions like the virtio_*_phys_cached() ones), and make sure that callsites which want atomic behaviour use the correct functions. In the meantime, switch to using __builtin_memcpy() in the bswap.h accessor functions. This will make us robust against things like this fortify library in the short term. In the longer term it will mean that we don't end up with these functions being really badly-performing even if the semantics of the out-of-line memcpy() are correct. Reported-by: Fernando Casas Sch=C3=B6ssow Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-Id: <20190318112938.8298-1-peter.maydell@linaro.org> --- include/qemu/bswap.h | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index 5a70f78..2a9f3fe 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -316,51 +316,57 @@ static inline void stb_p(void *ptr, uint8_t v) *(uint8_t *)ptr =3D v; } =20 -/* Any compiler worth its salt will turn these memcpy into native unaligned - operations. Thus we don't need to play games with packed attributes, or - inline byte-by-byte stores. */ +/* + * Any compiler worth its salt will turn these memcpy into native unaligned + * operations. Thus we don't need to play games with packed attributes, or + * inline byte-by-byte stores. + * Some compilation environments (eg some fortify-source implementations) + * may intercept memcpy() in a way that defeats the compiler optimization, + * though, so we use __builtin_memcpy() to give ourselves the best chance + * of good performance. + */ =20 static inline int lduw_he_p(const void *ptr) { uint16_t r; - memcpy(&r, ptr, sizeof(r)); + __builtin_memcpy(&r, ptr, sizeof(r)); return r; } =20 static inline int ldsw_he_p(const void *ptr) { int16_t r; - memcpy(&r, ptr, sizeof(r)); + __builtin_memcpy(&r, ptr, sizeof(r)); return r; } =20 static inline void stw_he_p(void *ptr, uint16_t v) { - memcpy(ptr, &v, sizeof(v)); + __builtin_memcpy(ptr, &v, sizeof(v)); } =20 static inline int ldl_he_p(const void *ptr) { int32_t r; - memcpy(&r, ptr, sizeof(r)); + __builtin_memcpy(&r, ptr, sizeof(r)); return r; } =20 static inline void stl_he_p(void *ptr, uint32_t v) { - memcpy(ptr, &v, sizeof(v)); + __builtin_memcpy(ptr, &v, sizeof(v)); } =20 static inline uint64_t ldq_he_p(const void *ptr) { uint64_t r; - memcpy(&r, ptr, sizeof(r)); + __builtin_memcpy(&r, ptr, sizeof(r)); return r; } =20 static inline void stq_he_p(void *ptr, uint64_t v) { - memcpy(ptr, &v, sizeof(v)); + __builtin_memcpy(ptr, &v, sizeof(v)); } =20 static inline int lduw_le_p(const void *ptr) --=20 1.8.3.1 From nobody Wed May 1 00:58:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1554825458; cv=none; d=zoho.com; s=zohoarc; b=hNbp7HJH5X7+ih7CSSM4Zg9m7MbsUXx94LJr012TMjSurHbsQioZ06GsV0oZbTJ6FZlnAsOxiD2evRbX2qNfP19GDlPPTmpHhVXnDtNg6ZL7uHSXp/rLoJkghQjyozLDNc+Z05SMRe0NRbpkaGUkZQHXC5bdk8900vPZshnUzqc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554825458; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=LysOdumLJ0HHNb4iRzo747jgyjnNQN4WQpGaMoS1fmY=; b=Y4PF8DiqALWQdUS6IepqM37E4FXnnJCYhxpXYZsTBMf1q1K53l2m6FKrLUfZQMp8Wwi/odAgRK0twGSQM/LJL0LVzSu79+0RT0Uoy0n2ap86r2hy+i3trF65WsJNKP40ODHRLzuJki86upMKp6p5BpJlA3QMCPu9oUg93JosEuw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554825458124149.09401297255215; Tue, 9 Apr 2019 08:57:38 -0700 (PDT) Received: from localhost ([127.0.0.1]:45131 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDt7j-0000fB-S3 for importer@patchew.org; Tue, 09 Apr 2019 11:57:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDt5u-00085o-Qc for qemu-devel@nongnu.org; Tue, 09 Apr 2019 11:55:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDt5t-0004ht-JG for qemu-devel@nongnu.org; Tue, 09 Apr 2019 11:55:30 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:45225) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDt5t-0004a3-2t for qemu-devel@nongnu.org; Tue, 09 Apr 2019 11:55:29 -0400 Received: by mail-wr1-x436.google.com with SMTP id s15so21535056wra.12 for ; Tue, 09 Apr 2019 08:55:23 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id g84sm23117586wmf.25.2019.04.09.08.55.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 08:55:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=LysOdumLJ0HHNb4iRzo747jgyjnNQN4WQpGaMoS1fmY=; b=GXnKWIxu9MJslfKJSFgXTpkjwz5zAsOMi79hJIl6nt6vWs4veb8HmsBvvoHL2bmB4p sMksGTSxO3lCyC/dBqveQ/3weSa9VrOHwRvJhZPVeKoFEUpXzOXpIrNQOJ5dobzyoZLp 5i1EHstLQB8uzHbUZaEvv/NFnbMksYvz3CHf/huD//DstnfrCKICZGV/QbxGM1I3MfQ7 sGVUxDdbo8ncZ+GLoibjtR0VQza6pT0b1yo71s8z+I4epk9K6aSLm8tvNgJ1wQepz1Ui NTmg1ad/1NzJ/L1ifc4murDf+7OMBGPQm7KztZb1Sk3MT3t6ee4x3LuO6kwbBP71VUlX Vluw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=LysOdumLJ0HHNb4iRzo747jgyjnNQN4WQpGaMoS1fmY=; b=GEolJ+6jIZ5VuzMAKuGVtv1o43G5BMpf2w+PhkVwdMgvCBkKlj6nOIxUjVCqxzhl1b 1yigB+7Qp8lVc1ZxI6hZHerpTWJX2LUI2dgxUmmQ1px/Y5m5sH2t5PUKvQm4qPIY3URa VEpkMeMdhxLlOOBUUdGUyLfJs1R+g7CNWrXZ+3cBP1Y6gTQnFiqToLmniXrJSMThBcI4 iJWpj5w6LpFxoAKHAV+llhW3Sduiv+Ko6NohRQTof8x7ptU4xDa7i1TtRf2s/B0rnRAI iBEHyGX78tJuSkVC5GwK7KqlVQzmW6QuY/mpAtjUEay6TajhYX5yuDzIECLxcyt4Gv7k 1r7g== X-Gm-Message-State: APjAAAXnkJmGBeKoYr5ryMXZSw+GGnUAK816oj6rFXAUUBdw9Psdsoq6 xM4FLT5QdUzKJoGhKeTwt21TK2P5 X-Google-Smtp-Source: APXvYqxvF1Buzu5MU5jy92nkbGus1cMJf8rRm1gBrzApByqphlc9aggvxKYtTm0l3eNpc0TYOJFQeg== X-Received: by 2002:adf:ffc2:: with SMTP id x2mr24381513wrs.86.1554825321861; Tue, 09 Apr 2019 08:55:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 9 Apr 2019 17:55:15 +0200 Message-Id: <1554825316-33288-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1554825316-33288-1-git-send-email-pbonzini@redhat.com> References: <1554825316-33288-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::436 Subject: [Qemu-devel] [PULL 4/5] hw/i386/pc: Fix crash when hot-plugging nvdimm on older machine types X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth QEMU currently crashes when you try to hot-plug an "nvdimm" device on older machine types: $ qemu-system-x86_64 -monitor stdio -M pc-1.1 QEMU 3.1.92 monitor - type 'help' for more information (qemu) device_add nvdimm,id=3Dnvdimmn1 qemu-system-x86_64: /home/thuth/devel/qemu/util/error.c:57: error_setv: Assertion `*errp =3D=3D ((void *)0)' failed. Aborted (core dumped) The call to hotplug_handler_pre_plug() in pc_memory_pre_plug() has been added recently before the check whether nvdimm is enabled. It should be done after the check. And while we're at it, also check the errp after the hotplug_handler_pre_plug(), otherwise errors are silently ignored here. Fixes: 9040e6dfa8c3fed87695a3de555d2c775727bb51 Signed-off-by: Thomas Huth Message-Id: <20190407092314.11066-1-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- hw/i386/pc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 6077d27..f2c15bf 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2078,6 +2078,7 @@ static void pc_memory_pre_plug(HotplugHandler *hotplu= g_dev, DeviceState *dev, const MachineState *ms =3D MACHINE(hotplug_dev); const bool is_nvdimm =3D object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); const uint64_t legacy_align =3D TARGET_PAGE_SIZE; + Error *local_err =3D NULL; =20 /* * When -no-acpi is used with Q35 machine type, no ACPI is built, @@ -2090,13 +2091,17 @@ static void pc_memory_pre_plug(HotplugHandler *hotp= lug_dev, DeviceState *dev, return; } =20 - hotplug_handler_pre_plug(pcms->acpi_dev, dev, errp); - if (is_nvdimm && !ms->nvdimms_state->is_enabled) { error_setg(errp, "nvdimm is not enabled: missing 'nvdimm' in '-M'"= ); return; } =20 + hotplug_handler_pre_plug(pcms->acpi_dev, dev, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), pcmc->enforce_aligned_dimm ? NULL : &legacy_align, er= rp); } --=20 1.8.3.1 From nobody Wed May 1 00:58:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1554825452; cv=none; d=zoho.com; s=zohoarc; b=UMPGVzEBMnF5XE0tDDKkZwDEXftdbgvJz07nZGerC5Jj26Xw1839KJ8j+h7xl3w9aDTmlVT9h1hZAvg0327zeDJeQAorGsHYweRdD0zQniVd9gd3io/DybiPVca+cRe56N6hVDHc1T7wZpUm9sSBY3HmwUYD1NESv+qrZRgriug= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554825452; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=rDCyQEV68QiNrEEjUa3/5MOv4E0APgi3UE7jUK7dh9w=; b=QOLW8XNF0gEGV1qgMNDZfF+P0MXmO1+gwxoTgnTjGOktEKFeteroZ2VcgfpP77cIEt1cgkmg+SIHqnMmnZyTO7d2hY87KRBeFNrKFMmOdnf+XgDCGAFyiljHcCW5+mS4JjPbKtp1fWo+rQQPFgcM1M4Wsk/VXJI0vCw8A+z6jOc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554825452901826.0886745944221; Tue, 9 Apr 2019 08:57:32 -0700 (PDT) Received: from localhost ([127.0.0.1]:45129 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDt7e-0000cW-6N for importer@patchew.org; Tue, 09 Apr 2019 11:57:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51436) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDt5u-00085S-Di for qemu-devel@nongnu.org; Tue, 09 Apr 2019 11:55:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDt5t-0004hC-86 for qemu-devel@nongnu.org; Tue, 09 Apr 2019 11:55:30 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:39999) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDt5s-0004bc-Ts for qemu-devel@nongnu.org; Tue, 09 Apr 2019 11:55:29 -0400 Received: by mail-wr1-x434.google.com with SMTP id h4so21584283wre.7 for ; Tue, 09 Apr 2019 08:55:23 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id g84sm23117586wmf.25.2019.04.09.08.55.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 08:55:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=rDCyQEV68QiNrEEjUa3/5MOv4E0APgi3UE7jUK7dh9w=; b=QXYoMufpXyP6aea4NrTIs2gkRl+RFCRAg9A6CONgkUL2qiU7R3RF2L/0nNX6RzCarp md+d97qA2DHVEY7jXdHVr6XJOFIxQPa4WGKX//aPV7KNsbJpLz8s7iTTm1kCg0OVBadr W1K8nR706B3wRO5T4wsw+t7U5PfVBGNquMGaQCCol7fFtUWe7K17YAGRFEpa+iBVs2uO ZEuBgtQL3P/AuUxwgmJpjaCRO0ttAmGuEZIq5+ngwG1qz+i7y/D2saBVAkAbENpte5Q+ 7H1sBIcljAr9XmyPirDInGj2lsAvMSFQAoMqD1yX0UQMzVh7IRxvyeIN4yRyvTGHb3sB 6WHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=rDCyQEV68QiNrEEjUa3/5MOv4E0APgi3UE7jUK7dh9w=; b=TDk7jFxYr+LHKkhLac5CQRDD84o1XUxoDS4H263hIYO4OMPuhh3Gn7SPjf0AM1/Esq lXvK070qNfWc52sloRqv83NaZNtcCBx9Xw3Pm+vJgGcVqfJGRobqBcPOGQZxChk9eXde Xw8cr2+56RG9PElXRbCTd/NF7TkPFVdXQx6HL25SH2OnKoE0N/AVRHpVkEjyCxWLCwWE mgYw8nUnPOu+4cgvpqRfw6K2ler+1FaxZ9I8QcpqiFFoXL3iYTtjBJ9zVJKl03Wsuio/ h9tY1EQCiOA3R1yzJzfZN3Cl0WjCAqCJekevpcxWiIyM0sGTBegDpisIUTHGxf9UllG5 AeeQ== X-Gm-Message-State: APjAAAX/RZvHhH51kxwcRI75e9enkxd2HwP2dR5Z6V4Sy5f9e7GDyY4v vwxAKJqJBlK9PqYfdGKmqbxqPqpC X-Google-Smtp-Source: APXvYqzzFdcvReecMVCOcu3Mv5RKoRGsC9MJPqCbnKpUWCn1QkCUb3lxDhcvFOKPivEL9/aFeJuYcg== X-Received: by 2002:adf:f8c1:: with SMTP id f1mr15675455wrq.151.1554825322691; Tue, 09 Apr 2019 08:55:22 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 9 Apr 2019 17:55:16 +0200 Message-Id: <1554825316-33288-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1554825316-33288-1-git-send-email-pbonzini@redhat.com> References: <1554825316-33288-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 Subject: [Qemu-devel] [PULL 5/5] tests: Make check-block a phony target X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Markus Armbruster Fixes: b93b63f574c "test makefile overhaul" Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-Id: <20190319072104.32591-1-armbru@redhat.com> Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 6b904d7..36fc73f 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -1164,7 +1164,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) =20 # Consolidated targets =20 -.PHONY: check-qapi-schema check-qtest check-unit check check-clean +.PHONY: check-block check-qapi-schema check-qtest check-unit check check-c= lean check-qapi-schema: $(patsubst %,check-%, $(check-qapi-schema-y)) check-tes= ts/qapi-schema/doc-good.texi check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS)) check-block: $(patsubst %,check-%, $(check-block-y)) --=20 1.8.3.1